new version

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

DesktopEditor/graphics/IRenderer.h

@@ -234,8 +234,8 @@ public:
 		if ((dWidth <= 1) || (dHeight <= 1))
 			lFlags = 0;
 
-		BOOL bFlipX = (0 != (c_nParamFlipX & lFlags));
-		BOOL bFlipY = (0 != (c_nParamFlipY & lFlags));
+		INT bFlipX = (0 != (c_nParamFlipX & lFlags));
+		INT bFlipY = (0 != (c_nParamFlipY & lFlags));
 
 		REAL m11 = bFlipX ? -1.0f : 1.0f;
 		REAL m22 = bFlipY ? -1.0f : 1.0f;

DesktopEditor/graphics/Image.cpp

@@ -54,12 +54,12 @@ namespace Aggplus
 		m_Status = Ok;
 	}
 
-	bool CImage::SaveFile(const std::wstring& strFileName, unsigned __int32 nFileType)
+	bool CImage::SaveFile(const std::wstring& strFileName, uint32_t nFileType)
 	{
-		CBgraFrame oBgraFrame;
-		oBgraFrame.put_Width(m_dwWidth);
-		oBgraFrame.put_Height(m_dwHeight);
-		oBgraFrame.put_Stride(m_nStride);
+		CBgraFrame oBgraFrame;
+		oBgraFrame.put_Width(m_dwWidth);
+		oBgraFrame.put_Height(m_dwHeight);
+		oBgraFrame.put_Stride(m_nStride);
 		oBgraFrame.put_Data(m_pImgData);
 		bool bRes = oBgraFrame.SaveFile(strFileName, nFileType);
 		//чтобы не удалялся на destructor

DesktopEditor/graphics/Image.h

@@ -28,7 +28,7 @@ public:
 
 	void Create(const std::wstring& filename);
 	void Create(BYTE* pImgData, const DWORD& dwWidth, const DWORD& dwHeight, const long& nStride);
-	bool SaveFile(const std::wstring& strFileName, unsigned __int32 nFileType);
+	bool SaveFile(const std::wstring& strFileName, uint32_t nFileType);
 	void Destroy();
 
 public: