bgraframe не цепляет cximage

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59340 954022d7-b5bf-4e40-9824-e11837661b57

DesktopEditor/agg-2.4/include/agg_span_gradient.h

@@ -30,15 +30,15 @@
 #define min(a,b)            (((a) < (b)) ? (a) : (b))
 #endif
 
-#ifndef WIN32
+namespace agg
+{
+#if !defined(_LINUX) && !defined(WIN32)
     double _hypot(double x, double y)
     {
         return sqrt(x*x + y*y);
     }
-
+    
 #endif
-namespace agg
-{
 
     enum gradient_subpixel_scale_e
     {

DesktopEditor/fontengine/GlyphString.cpp

 #include "GlyphString.h"
+#include <stdlib.h>
 
 #ifndef max
 #define max(a,b)            (((a) > (b)) ? (a) : (b))

DesktopEditor/raster/BgraFrame.cpp

 #include "BgraFrame.h"
 #include "../common/File.h"
+#include "../cximage/CxImage/ximage.h"
 
 bool CBgraFrame::OpenFile(const std::wstring& strFileName)
 {
@@ -16,7 +17,7 @@ bool CBgraFrame::OpenFile(const std::wstring& strFileName)
 	return true;
 }
 
-bool CBgraFrame::SaveFile(const std::wstring& strFileName, uint32_t nFileType)
+bool CBgraFrame::SaveFile(const std::wstring& strFileName, unsigned int nFileType)
 {
 	NSFile::CFileBinary oFile;
 	if (!oFile.CreateFileW(strFileName))

DesktopEditor/raster/BgraFrame.h

@@ -3,8 +3,8 @@
 
 #include <string>
 #include "../common/Types.h"
-#include "../cximage/CxImage/ximage.h"
 
+class CxImage;
 class CBgraFrame
 {
 private:
@@ -80,7 +80,7 @@ public:
 
 public:
 	bool OpenFile(const std::wstring& strFileName);
-	bool SaveFile(const std::wstring& strFileName, uint32_t nFileType);
+	bool SaveFile(const std::wstring& strFileName, unsigned int nFileType);
 	bool Resize(const long& nNewWidth, const long& nNewHeight);
 private: