Убраны все заглушки для линукса, добавлена функция в GraphicsRenderer SetSwapRBG.

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

.gitattributes

@@ -3035,6 +3035,7 @@ DesktopEditor/mac_build/raster/raster.xcodeproj/project.xcworkspace/xcuserdata/a
 DesktopEditor/mac_build/raster/raster.xcodeproj/xcuserdata svnc_tsvn_003alogminsize=5
 DesktopEditor/mac_build/raster/raster.xcodeproj/xcuserdata/alexey.musinov.xcuserdatad svnc_tsvn_003alogminsize=5
 DesktopEditor/mac_build/raster/raster.xcodeproj/xcuserdata/alexey.musinov.xcuserdatad/xcschemes svnc_tsvn_003alogminsize=5
+DesktopEditor/raster svn_global_002dignores=*%0A*.ncb%0A*.user%0A
 DesktopEditor/raster/Metafile svnc_tsvn_003alogminsize=5 svn_global_002dignores
 DesktopEditor/raster/Metafile/Common svnc_tsvn_003alogminsize=5
 DesktopEditor/raster/Metafile/Emf svnc_tsvn_003alogminsize=5

DesktopEditor/graphics/GraphicsRenderer.h

@@ -71,6 +71,7 @@ public:
 
 	void SaveBrush(NSStructures::CBrush& oBrush) { oBrush = m_oBrush; }
 	void RestoreBrush(const NSStructures::CBrush& oBrush) { m_oBrush = oBrush; }
+	void SetSwapRGB(bool bValue){ if (m_pRenderer) m_pRenderer->m_bSwapRGB = bValue; }
 
 public:
 // тип рендерера-----------------------------------------------------------------------------

DesktopEditor/raster/Metafile/Common.cpp

@@ -645,15 +645,9 @@ namespace MetaFile
 						}
 						else
 						{
-#ifdef __linux__
-                            pBgraBuffer[nIndex + 2] = pBuffer[0]; pBuffer++; lBufLen--;
-							pBgraBuffer[nIndex + 1] = pBuffer[0]; pBuffer++; lBufLen--;
-                            pBgraBuffer[nIndex + 0] = pBuffer[0]; pBuffer++; lBufLen--;
-#else
                             pBgraBuffer[nIndex + 0] = pBuffer[0]; pBuffer++; lBufLen--;
                             pBgraBuffer[nIndex + 1] = pBuffer[0]; pBuffer++; lBufLen--;
                             pBgraBuffer[nIndex + 2] = pBuffer[0]; pBuffer++; lBufLen--;
-#endif
 							pBgraBuffer[nIndex + 3] = 255; pBuffer++; lBufLen--; //     ,     
 						}
 					}
@@ -690,15 +684,9 @@ namespace MetaFile
 						}
 						else
 						{
-#ifdef __linux__
-                            pBgraBuffer[nIndex + 2] = pBuffer[0]; pBuffer++; lBufLen--;
-							pBgraBuffer[nIndex + 1] = pBuffer[0]; pBuffer++; lBufLen--;
-                            pBgraBuffer[nIndex + 0] = pBuffer[0]; pBuffer++; lBufLen--;
-#else
                             pBgraBuffer[nIndex + 0] = pBuffer[0]; pBuffer++; lBufLen--;
                             pBgraBuffer[nIndex + 1] = pBuffer[0]; pBuffer++; lBufLen--;
                             pBgraBuffer[nIndex + 2] = pBuffer[0]; pBuffer++; lBufLen--;
-#endif
 							pBgraBuffer[nIndex + 3] = 255; pBuffer++; lBufLen--; //     ,     
 						}
 					}

DesktopEditor/raster/Metafile/Common.h

@@ -210,18 +210,10 @@ namespace MetaFile
 		}
 		CDataStream& operator>>(TEmfColor& oColor)
 		{
-#if __linux__
-            *this >> oColor.b;
-            *this >> oColor.g;
-            *this >> oColor.r;
-            *this >> oColor.a;
-#else
             *this >> oColor.r;
             *this >> oColor.g;
             *this >> oColor.b;
             *this >> oColor.a;
-#endif
-
 
 			return *this;
 		}
@@ -450,15 +442,9 @@ namespace MetaFile
 		}
 		CDataStream& operator>>(TRgbQuad& oRGB)
 		{
-#ifdef __linux__
-            *this >> oRGB.r;
-			*this >> oRGB.g;
-            *this >> oRGB.b;
-#else
             *this >> oRGB.b;
             *this >> oRGB.g;
             *this >> oRGB.r;
-#endif
             Skip(1); // reserved
 
 			return *this;

DesktopEditor/raster/Metafile/MetaFile.cpp

@@ -175,6 +175,7 @@ namespace MetaFile
 		CImageFilesCache oCache;
 
 		CGraphicsRenderer oRenderer;
+		//oRenderer.
 		oRenderer.SetFontManager(pFontManager);
 		oRenderer.SetImageCache(&oCache);
 

DesktopEditor/raster/Metafile/Wmf/WmfFile.h

@@ -510,7 +510,7 @@ namespace MetaFile
 
 			// TODO: Реализовать
 		}
-s
+
 
 	private: