протащены градиенты в мета файлах

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

DesktopEditor/raster/Metafile/Common/MetaFileObjects.h

@@ -33,6 +33,7 @@ namespace MetaFile
 		virtual unsigned int GetStyleEx()		= 0;
 		virtual unsigned int GetHatch()			= 0;
 		virtual unsigned int GetAlpha()			= 0;
+		virtual unsigned int GetAlpha2()		= 0;
 		virtual std::wstring GetDibPatterPath() = 0;
 		virtual void GetBounds(double& left, double& top, double& width, double& height) = 0;
 	};

DesktopEditor/raster/Metafile/Common/MetaFileRenderer.h

@@ -565,24 +565,46 @@ namespace MetaFile
 				m_pRenderer->put_BrushColor1(oFgColor.ToInt());
 			}
 			else if (	BS_LINEARGRADIENT	== unBrushStyle ||
-						BS_RADIALGRADIENT	== unBrushStyle ||
-						BS_AXIALGRADIENT	== unBrushStyle ||
 						BS_RECTGRADIENT		== unBrushStyle ||
 						BS_PATHGRADIENT		== unBrushStyle
 					)
 			{
-				m_pRenderer->put_BrushType(c_BrushTypeCenter);
+				m_pRenderer->put_BrushType(c_BrushTypePathGradient1);
 
 				m_pRenderer->put_BrushColor1(pBrush->GetColor());
 				m_pRenderer->put_BrushColor2(pBrush->GetColor2());
 				m_pRenderer->put_BrushAlpha1(pBrush->GetAlpha());
+				m_pRenderer->put_BrushAlpha2(pBrush->GetAlpha2());
 
 				m_pRenderer->put_BrushLinearAngle(pBrush->GetStyleEx());
-				double l=0, t=0, w=0, h=0;
-				pBrush->GetBounds(l,t,w,h);
-				m_pRenderer->BrushBounds(l,t,w,h);
 
+				long Colors[2];
+				Colors[0] = (pBrush->GetColor()<<8) + pBrush->GetAlpha();
+				Colors[1] = (pBrush->GetColor2()<<8) + pBrush->GetAlpha2();
+				double Position[2] = {0, 1};
+
+				m_pRenderer->put_BrushGradientColors(Colors,Position,2);
+
+			}
+			else if (	BS_RADIALGRADIENT	== unBrushStyle ||
+						BS_AXIALGRADIENT	== unBrushStyle 
+					)
+			{
+				m_pRenderer->put_BrushType(c_BrushTypePathGradient2);
+
+				m_pRenderer->put_BrushColor1(pBrush->GetColor());
+				m_pRenderer->put_BrushColor2(pBrush->GetColor2());
+				m_pRenderer->put_BrushAlpha1(pBrush->GetAlpha());
+				m_pRenderer->put_BrushAlpha2(pBrush->GetAlpha2());
+
+				long Colors[2];
+				Colors[0] = (pBrush->GetColor()<<8) + pBrush->GetAlpha();
+				Colors[1] = (pBrush->GetColor2()<<8) + pBrush->GetAlpha2();
+				double Position[2] = {0, 1};
+				
+				m_pRenderer->put_BrushGradientColors(Colors,Position,2);
 			}
+
 			else //if (BS_SOLID == unBrushStyle)
 			{
 				m_pRenderer->put_BrushType(c_BrushTypeSolid);

DesktopEditor/raster/Metafile/Emf/EmfObjects.h

@@ -62,6 +62,10 @@ namespace MetaFile
 		{
 			return BrushAlpha;
 		}
+		unsigned int GetAlpha2()
+		{
+			return 0Xff;
+		}
 		std::wstring GetDibPatterPath()
 		{
 			return DibPatternPath;

DesktopEditor/raster/Metafile/MetaFile.cpp

@@ -193,7 +193,13 @@ namespace MetaFile
 		if (!pBgraData)
 			return;
 
-		memset(pBgraData, 0xff, nWidth * nHeight * 4);
+		DWORD alfa = 0xffffff;
+		//    ,    
+		//memset(pBgraData, 0xff, nWidth * nHeight * 4);
+		for (int i = 0; i < nWidth * nHeight; i++)
+		{
+			((DWORD*)pBgraData)[i] = alfa;
+		}
 		CBgraFrame oFrame;
 		oFrame.put_Data(pBgraData);
 		oFrame.put_Width(nWidth);

DesktopEditor/raster/Metafile/StarView/SvmFile.cpp

@@ -97,8 +97,8 @@ void CSvmFile::PlayMetaFile()
 	if (m_pOutput)
 	{
 		m_pOutput->Begin();
-		// + прозрачную заливку ???
 	}
+
 	for (unsigned int action = 0; action < m_oHeader.actionCount; ++action)
 	{
         unsigned short  actionType;
@@ -122,6 +122,8 @@ void CSvmFile::PlayMetaFile()
 			case META_TEXTARRAY_ACTION:			Read_META_ARRAYTEXT();		break;
 			case META_TEXTALIGN_ACTION:			Read_META_TEXTALIGN();		break;
 			case META_TEXTRECT_ACTION:			Read_META_TEXTRECT();		break;
+			case META_TEXTFILLCOLOR_ACTION:		Read_META_SETTEXTFILLCOLOR();	break;
+			case META_TEXTCOLOR_ACTION:			Read_META_SETTEXTCOLOR();		break;
 			case META_TEXTLANGUAGE_ACTION:
 			case META_STRETCHTEXT_ACTION:
 			case META_TEXTLINECOLOR_ACTION:
@@ -135,8 +137,6 @@ void CSvmFile::PlayMetaFile()
 
 			case META_LINECOLOR_ACTION:			Read_META_SETLINECOLOR();		break;
 			case META_FILLCOLOR_ACTION:			Read_META_SETFILLCOLOR();		break;
-			case META_TEXTFILLCOLOR_ACTION:		Read_META_SETTEXTFILLCOLOR();	break;
-			case META_TEXTCOLOR_ACTION:			Read_META_SETTEXTCOLOR();		break;
 			case META_GRADIENT_ACTION:			Read_META_GRADIENT();			break;
 			case META_GRADIENTEX_ACTION:		Read_META_GRADIENTEX();			break;
 			case META_HATCH_ACTION:
@@ -177,44 +177,22 @@ void CSvmFile::PlayMetaFile()
 
 			case META_NULL_ACTION:
 			default:
-#ifdef _DEBUG
-			if (actionType != 512 && m_unRecordSize > 0 && m_pOutput)
-			{
-				std::wstring name;
-				if (actionType == 0)
-					name = actionNames[0].actionName;
-				else if (actionType == 512)
-					name = L"META_COMMENT_ACTION";            
-				else if (100 <= actionType && actionType <= META_LAST_ACTION)
-					name = actionNames[actionType - 99].actionName;
-				else
-					name = L"(out of bounds)";
-
-				std::wcout << name << L"\t(" << actionType << L") " << L"\tversion = " << m_currentActionVersion << L"\t; totalSize = " << m_unRecordSize << L"\n";
-			}		
-#endif
 			break;
         }
-#ifdef _DEBUG
-/*		if (actionType != 512 && m_unRecordSize > 0 && !m_pOutput)
-		{
-			std::wstring name;
-			if (actionType == 0)
-				name = actionNames[0].actionName;
-			else if (actionType == 512)
-				name = L"META_COMMENT_ACTION";            
-			else if (100 <= actionType && actionType <= META_LAST_ACTION)
-				name = actionNames[actionType - 99].actionName;
-			else
-				name = L"(out of bounds)";
 
-			std::wcout << name << L"\t(" << actionType << L") " << L"\tversion = " << m_currentActionVersion << L"\t; totalSize = " << m_unRecordSize << L"\n";
-		}*/			
-#endif
 		m_currentActionType = actionType;
 
 		int need_skip = m_unRecordSize - (m_oStream.Tell() - m_unRecordPos);
 		m_oStream.Skip(need_skip);
+
+#ifdef _DEBUG
+		if (100 <= actionType && actionType <= META_LAST_ACTION && need_skip > 0 && !m_pOutput)
+		{
+			std::wstring name = actionNames[actionType - 99].actionName;
+
+			std::wcout << name << L"\t\t" << actionType << L"\t(version = " << m_currentActionVersion << L")\t; skiped = " << need_skip << L"\n";
+		}			
+#endif   
  }
 	if (m_pOutput)
 		m_pOutput->End();
@@ -264,13 +242,6 @@ void CSvmFile::Read_SVM_HEADER()
 {
 	m_oStream >> m_oHeader;
 
-
-	m_pDC->SetWindowExt (	m_oHeader.boundRect.nRight	- m_oHeader.boundRect.nLeft,
-							m_oHeader.boundRect.nBottom - m_oHeader.boundRect.nTop);
-
-	m_pDC->SetWindowScale(	(double)m_oHeader.mapMode.scaleX.numerator/m_oHeader.mapMode.scaleX.denominator, 
-							(double)m_oHeader.mapMode.scaleY.numerator/m_oHeader.mapMode.scaleY.denominator);
-
 	m_pDC->SetMapMode(m_oHeader.mapMode, true);
 	
 	m_oBoundingBox			= m_oHeader.boundRect;
@@ -574,6 +545,8 @@ void CSvmFile::Read_META_SETFILLCOLOR()
 	if (m_currentActionType == META_GRADIENT_ACTION ||
 		m_currentActionType == META_GRADIENTEX_ACTION)
 	{
+		//поменять основной цвет??
+		m_oStream.Skip(m_unRecordSize);
 		return;
 	}
 
@@ -622,23 +595,24 @@ void CSvmFile::Read_META_GRADIENTEX()
 	CSvmBrush* pBrush = new CSvmBrush();
 	if (!pBrush)
 		return SetError();
-	pBrush->BrushStyle	= BS_LINEARGRADIENT;//BS_PATHGRADIENT; 
 
-	unsigned short nTmp16;
+	TSvmGradient gradient;
+	m_oStream >> gradient;
 
-    m_oStream >> nTmp16; 
-	ESvmGradientStyle gradientStyle = (ESvmGradientStyle) nTmp16;
+	switch((ESvmGradientStyle)gradient.style)
+	{
+	case GRADIENT_LINEAR:		pBrush->BrushStyle	= BS_LINEARGRADIENT;	break;
+	case GRADIENT_AXIAL:		pBrush->BrushStyle	= BS_AXIALGRADIENT;		break;
+	case GRADIENT_RADIAL:		pBrush->BrushStyle	= BS_RADIALGRADIENT;	break;
+	case GRADIENT_ELLIPTICAL:	pBrush->BrushStyle	= BS_RADIALGRADIENT;	break;
+	case GRADIENT_SQUARE:		pBrush->BrushStyle	= BS_LINEARGRADIENT;	break;
+	case GRADIENT_RECT:			pBrush->BrushStyle	= BS_RECTGRADIENT;		break;
+	}
 	
-	m_oStream >> pBrush->Color;
-	m_oStream >> pBrush->Color2;
+	pBrush->Color.Set(gradient.color1.r>>8, gradient.color1.g>>8, gradient.color1.b>>8);
+	pBrush->Color2.Set(gradient.color2.r>>8, gradient.color2.g>>8, gradient.color2.b>>8);
 
-	m_oStream >> pBrush->BrushStyleEx;
-    m_oStream >> nTmp16; //Border 
-    m_oStream >> nTmp16; //OfsX 
-    m_oStream >> nTmp16; //OfsY 
-	m_oStream >> nTmp16; //IntensityStart 
-    m_oStream >> nTmp16; //IntensityEnd 
-    m_oStream >> nTmp16; //StepCount;	
+	pBrush->BrushStyleEx = 90 + gradient.angle % 3600; //проверить на разных
 
 	m_oPlayer.RegisterObject((CSvmObjectBase*)pBrush);
 }
@@ -720,24 +694,26 @@ void CSvmFile::Read_META_FLOATTRANSPARENT()
 	CSvmBrush* pBrush = new CSvmBrush();
 	if (!pBrush)
 		return SetError();
-	pBrush->BrushStyle	= BS_LINEARGRADIENT; 
 
 	m_oStream >> pBrush->BrushBounds;
 	
-	unsigned short nTmp16;
-    m_oStream >> nTmp16; 
-	ESvmGradientStyle gradientStyle = (ESvmGradientStyle) nTmp16;
+	TSvmGradient gradient;
+	m_oStream >> gradient;
 
-	m_oStream >> pBrush->Color;
-	m_oStream >> pBrush->Color2;
+	switch((ESvmGradientStyle)gradient.style)
+	{
+	case GRADIENT_LINEAR:		pBrush->BrushStyle	= BS_LINEARGRADIENT;	break;
+	case GRADIENT_AXIAL:		pBrush->BrushStyle	= BS_AXIALGRADIENT;		break;
+	case GRADIENT_RADIAL:		pBrush->BrushStyle	= BS_RADIALGRADIENT;	break;
+	case GRADIENT_ELLIPTICAL:	pBrush->BrushStyle	= BS_RADIALGRADIENT;	break;
+	case GRADIENT_SQUARE:		pBrush->BrushStyle	= BS_LINEARGRADIENT;	break;
+	case GRADIENT_RECT:			pBrush->BrushStyle	= BS_RECTGRADIENT;		break;
+	}
+	
+	pBrush->Color.Set(gradient.color1.r>>8, gradient.color1.g>>8, gradient.color1.b>>8);
+	pBrush->Color2.Set(gradient.color2.r>>8, gradient.color2.g>>8, gradient.color2.b>>8);
 
-	m_oStream >> pBrush->BrushStyleEx;
-    m_oStream >> nTmp16; //Border 
-    m_oStream >> nTmp16; //OfsX 
-    m_oStream >> nTmp16; //OfsY 
-	m_oStream >> nTmp16; //IntensityStart 
-    m_oStream >> nTmp16; //IntensityEnd 
-    m_oStream >> nTmp16; //StepCount;	
+	pBrush->BrushStyleEx = 90 + gradient.angle % 3600; //проверить на разных
 
 	m_oPlayer.RegisterObject((CSvmObjectBase*)pBrush);
 }
@@ -747,27 +723,28 @@ void CSvmFile::Read_META_GRADIENT()
 	CSvmBrush* pBrush = new CSvmBrush();
 	if (!pBrush)
 		return SetError(); 
-	pBrush->BrushStyle	= BS_LINEARGRADIENT; 
 
 	m_oStream >> pBrush->BrushBounds;
 
-	unsigned short nTmp16;
-    m_oStream >> nTmp16; 
-	ESvmGradientStyle gradientStyle = (ESvmGradientStyle) nTmp16;
+	TSvmGradient gradient;
+	m_oStream >> gradient;
 
-	m_oStream >> pBrush->Color;
-	m_oStream >> pBrush->Color2;
+	switch((ESvmGradientStyle)gradient.style)
+	{
+	case GRADIENT_LINEAR:		pBrush->BrushStyle	= BS_LINEARGRADIENT;	break;
+	case GRADIENT_AXIAL:		pBrush->BrushStyle	= BS_AXIALGRADIENT;		break;
+	case GRADIENT_RADIAL:		pBrush->BrushStyle	= BS_RADIALGRADIENT;	break;
+	case GRADIENT_ELLIPTICAL:	pBrush->BrushStyle	= BS_RADIALGRADIENT;	break;
+	case GRADIENT_SQUARE:		pBrush->BrushStyle	= BS_LINEARGRADIENT;	break;
+	case GRADIENT_RECT:			pBrush->BrushStyle	= BS_RECTGRADIENT;		break;
+	}
 	
-	m_oStream >> pBrush->BrushStyleEx;
-    m_oStream >> nTmp16; //Border 
-    m_oStream >> nTmp16; //OfsX 
-    m_oStream >> nTmp16; //OfsY 
-	m_oStream >> nTmp16; //IntensityStart 
-    m_oStream >> nTmp16; //IntensityEnd 
-    m_oStream >> nTmp16; //StepCount;	
+	pBrush->Color.Set(gradient.color1.r>>8, gradient.color1.g>>8, gradient.color1.b>>8);
+	pBrush->Color2.Set(gradient.color2.r>>8, gradient.color2.g>>8, gradient.color2.b>>8);
 
-	m_oPlayer.RegisterObject((CSvmObjectBase*)pBrush);
+	pBrush->BrushStyleEx = 90 + gradient.angle % 3600; //проверить на разных
 
+	m_oPlayer.RegisterObject((CSvmObjectBase*)pBrush);
 }
  
 void CSvmFile::Read_META_FONT()
@@ -916,8 +893,10 @@ void CSvmFile::Read_META_BMPSCALE()
 		m_oStream.Skip(bitmap_info.nSizeImage);
 		delete Header;
 	}
+	//иногда наверху неверно вычисляется оригинальный размер - если внутри одиночная картинка
+
 	if (bitmap_info.nHeight >  m_oBoundingBox.nBottom &&
-			bitmap_info.nWidth > m_oBoundingBox.nRight)
+			bitmap_info.nWidth > m_oBoundingBox.nRight && !m_pOutput)
 	{
 		m_oBoundingBox.nRight = bitmap_info.nWidth;
 		m_oBoundingBox.nBottom = bitmap_info.nHeight;
@@ -930,34 +909,17 @@ void CSvmFile::Read_META_BMPSCALE()
 	m_oStream >> size.cx;
 	m_oStream >> size.cy;
 
-	TSvmMapMode aMapMode_new, aMapMode_old;
-	//
-	aMapMode_old = m_pDC->m_oMapMode;	
-	aMapMode_new.unit = MAP_RELATIVE;
-
-	m_pDC->SetMapMode(aMapMode_new);
-
-	if (pBgraBuffer && m_pOutput)
+	if (pBgraBuffer)
 	{
-		double dX = point.x, dY = point.y, dX1 = point.x + size.cx, dY1 = point.y + size.cy;
-		
-
-		TranslatePoint(dX, dY, dX, dY);
-		TranslatePoint(dX + dX1, dY + dY1, dX1, dY1);
-		
-		dX1 = dX1-dX;
-		dY1 = dY1-dY;
-
-		if (m_pOutput)
+		if ( m_pOutput)
 		{
-			m_pOutput->DrawBitmap( dX, dY, dX1, dY1, pBgraBuffer, bitmap_info.nWidth, bitmap_info.nHeight);
+			m_pOutput->DrawBitmap( point.x, point.y, size.cx, size.cy, pBgraBuffer, bitmap_info.nWidth, bitmap_info.nHeight);
 		}
+
 		delete []pBgraBuffer;
 		
 		UpdateOutputDC();
 	}
-	m_pDC->SetMapMode(aMapMode_old);
-
 
 }
 } // namespace MetaFile

DesktopEditor/raster/Metafile/StarView/SvmObjects.cpp

@@ -156,7 +156,7 @@ CDataStream& operator>>(CDataStream &stream, TSvmPoint &p)
 	return stream;
 }
 
-CSvmBrush::CSvmBrush() : Color(255, 255, 255)
+CSvmBrush::CSvmBrush() : Color(255, 255, 255), Color2(255, 255, 255)
 {
 	BrushStyle = BS_SOLID;
 	BrushHatch = HS_HORIZONTAL;
@@ -165,7 +165,10 @@ CSvmBrush::CSvmBrush(CSvmBrush& oBrush)
 {
 	BrushStyle = oBrush.BrushStyle;
 	Color = oBrush.Color;
+	Color2 = oBrush.Color2;
 	BrushHatch = oBrush.BrushHatch;
+	BrushStyleEx = oBrush.BrushStyleEx;
+	BrushBounds = oBrush.BrushBounds;
 }
 
 int CSvmBrush::GetColor()
@@ -192,6 +195,10 @@ unsigned int CSvmBrush::GetAlpha()
 {
 	return 0xff-Color.a;
 }
+unsigned int CSvmBrush::GetAlpha2()
+{
+	return 0xff-Color2.a;
+}
 void CSvmBrush::GetBounds(double& left, double& top, double& width, double& height)
 {
 	left	= BrushBounds.l;
@@ -238,9 +245,6 @@ CDataStream& operator>>(CDataStream &stream, TSvmPolygon &p)
 
 CDataStream& operator>>(CDataStream &stream, TSvmColor &c)
 {
-	char s;
-    unsigned short  a, r, g, b, p;
-    
     stream >> c.b;
     stream >> c.g;
     stream >> c.r;
@@ -250,6 +254,23 @@ CDataStream& operator>>(CDataStream &stream, TSvmColor &c)
 
 	return stream;
 }
+CDataStream& operator>>(CDataStream &stream, TSvmColorEx &c)
+{
+	stream >> c.name;
+	if ( c.name & 0x8000 )
+	{
+		//if(compression_mode) 
+		stream >> c.r;
+		stream >> c.g;
+		stream >> c.b;
+	}
+	else
+	{
+		//из таблички
+	}
+
+	return stream;
+}
 CDataStream& operator>>(CDataStream &stream, TSvmLineInfo &i)
 {
 	VersionCompat version;
@@ -419,5 +440,24 @@ CDataStream& operator>>(CDataStream &stream, TSvmBitmap &b)
 	
 	return stream;
 }
+CDataStream& operator>>(CDataStream &stream, TSvmGradient &g)
+{
+	stream >> g.version;	
+	stream >> g.style;
+
+	stream >> g.color1;
+	stream >> g.color2;
+
+	stream >> g.angle;
+
+    stream >> g.border;
+    stream >> g.offX;
+    stream >> g.offY;
+	stream >> g.intensityStart;
+    stream >> g.intensityEnd;
+    stream >> g.stepCount;	
+
+	return stream;
+}
 }
 

DesktopEditor/raster/Metafile/StarView/SvmObjects.h

@@ -149,6 +149,33 @@ struct TSvmPolygon
 	std::vector<TSvmPoint>	points;
 };
 
+struct TSvmColorEx
+{
+	unsigned short name;
+
+	unsigned short r;
+	unsigned short g;
+	unsigned short b;
+};
+
+struct TSvmGradient
+{
+	VersionCompat version;
+	
+	unsigned short style;
+	
+	TSvmColorEx color1;
+	TSvmColorEx color2;
+
+	unsigned short angle;
+    unsigned short border;
+    unsigned short offX;
+    unsigned short offY;
+	unsigned short intensityStart;
+    unsigned short intensityEnd;
+    unsigned short stepCount;	
+};
+
 struct TSvmColor
 {
 	unsigned char r;
@@ -160,15 +187,15 @@ struct TSvmColor
 
 	TSvmColor()
 	{
-		r = 0;		g = 0;		b = 0;	
+		r = 0;		g = 0;		b = 0;		a = 0;
 	}
 	TSvmColor(unsigned char _r, unsigned char _g, unsigned char _b)
 	{
 		r = _r;		g = _g;		b = _b;
 	}
-	void Set(unsigned char _r, unsigned char _g, unsigned char _b)
+	void Set(unsigned char _r, unsigned char _g, unsigned char _b, unsigned char _a = 0)
 	{
-		r = _r;		g = _g;		b = _b;
+		r = _r;		g = _g;		b = _b;		a = _a;
 	}
 	void Init()
 	{
@@ -232,6 +259,7 @@ public:
 	unsigned int GetStyle();
 	unsigned int GetHatch();
 	unsigned int GetAlpha();
+	unsigned int GetAlpha2();
 	std::wstring GetDibPatterPath(){ return L""; }
 	void GetBounds(double& left, double& top, double& width, double& height);
 
@@ -380,9 +408,12 @@ CDataStream& operator>>(CDataStream &stream, TSvmPoint &p);
 CDataStream& operator>>(CDataStream &stream, TSvmRect &p);
 CDataStream& operator>>(CDataStream &stream, TSvmPolygon &p);
 CDataStream& operator>>(CDataStream &stream, TSvmColor &c);
+CDataStream& operator>>(CDataStream &stream, TSvmColorEx &c);
 CDataStream& operator>>(CDataStream &stream, TSvmBitmap &b);
 CDataStream& operator>>(CDataStream &stream, CSvmFont *f);
 CDataStream& operator>>(CDataStream &stream, TSvmLineInfo &l);
+CDataStream& operator>>(CDataStream &stream, TSvmGradient &g);
+
 
 }
 

DesktopEditor/raster/Metafile/StarView/SvmPlayer.cpp

@@ -209,7 +209,7 @@ void CSvmPlayer::SetRasterOp(int op)
 }
 void CSvmPlayer::InitStockObjects()
 {
-	InitStockBrush(false, 79, 129, 189); //default OnlyOffice
+	InitStockBrush(false, 0x00, 0x00, 0x00, 0xff); //
 	InitStockPen(false, 0x00, 0x00, 0x00);
 }
 void CSvmPlayer::Pop()
@@ -354,7 +354,7 @@ void CSvmPlayer::Push(int nFlags) //
 	//		pData->mpRefPoint = NULL;
 	//}
 }
-void  CSvmPlayer::InitStockBrush(bool bNull, unsigned char r, unsigned char g, unsigned char b)
+void  CSvmPlayer::InitStockBrush(bool bNull, unsigned char r, unsigned char g, unsigned char b, unsigned char a)
 {
 	CSvmBrush* pBrush = new CSvmBrush();
 	if (!pBrush)
@@ -365,7 +365,7 @@ void  CSvmPlayer::InitStockBrush(bool bNull, unsigned char r, unsigned char g, u
 	else
 	{
 		pBrush->BrushStyle = BS_SOLID;
-		pBrush->Color.Set(r, g, b);
+		pBrush->Color.Set(r, g, b, a);
 	}
 
 	RegisterObject((CSvmObjectBase*)pBrush);
@@ -403,8 +403,8 @@ CSvmDC::CSvmDC()
 	m_ulMiterLimit  = 0;
 	m_ulFillMode    = WINDING;
 	m_ulStretchMode = 0;
-	m_oWindow.Init();
-	m_oViewport.Init();
+	//m_oWindow.Init();
+	//m_oViewport.Init();
 
 	m_dPixelHeight = m_dPixelHeightPrefered = 1;
 	m_dPixelWidth  = m_dPixelWidthPrefered	= 1;
@@ -443,8 +443,8 @@ CSvmDC*         CSvmDC::Copy()
 	pNewDC->m_dPixelHeightPrefered = m_dPixelHeightPrefered;
 	pNewDC->m_dPixelWidthPrefered = m_dPixelWidthPrefered;
 
-	pNewDC->m_oWindow.Copy(&m_oWindow);
-	pNewDC->m_oViewport.Copy(&m_oViewport);
+	//pNewDC->m_oWindow.Copy(&m_oWindow);
+	//pNewDC->m_oViewport.Copy(&m_oViewport);
 	pNewDC->m_oCurPos = m_oCurPos;
 	//pNewDC->m_oClip = m_oClip;
 	pNewDC->m_unArcDirection = m_unArcDirection;
@@ -531,7 +531,8 @@ void CSvmDC::SetMapMode(TSvmMapMode & mapMode, bool prefered )
 		//
 		break;
 	case MAP_RELATIVE:
-		UpdatePixelMetrics();
+		SetPixelWidth(dPixel);
+		SetPixelHeight(dPixel);
 		break;
 	case MAP_LASTENUMDUMMY:
 		break;
@@ -544,7 +545,6 @@ void CSvmDC::SetMapMode(TSvmMapMode & mapMode, bool prefered )
 
 	}
 
-	UpdatePixelMetrics();
 }
 
 TXForm* CSvmDC::GetTransform()
@@ -672,41 +672,6 @@ void CSvmDC::SetPixelHeight(double dPixelH)
 	m_dPixelHeight = dPixelH;
 }
 
-TSvmWindow* CSvmDC::GetWindow()
-{
-	return &m_oWindow;
-}
-void CSvmDC::SetViewportOff(int lX, int lY)
-{
-	m_oViewport.lX = lX;
-	m_oViewport.lY = lY;
-
-	UpdatePixelMetrics();
-}
-void CSvmDC::SetViewportExt(int lX, int lY)
-{
-	m_oViewport.ulW = lX;
-	m_oViewport.ulH = lY;
-
-	UpdatePixelMetrics();
-}
-TSvmWindow* CSvmDC::GetViewport()
-{
-	return &m_oViewport;
-}
-bool CSvmDC::UpdatePixelMetrics()
-{
-	if 	(GetMapModeUnit() == MAP_RELATIVE)
-	{
-		double dPixelX = 1;//(double)m_oViewport.ulW / (double)m_oWindow.ulW;
-		double dPixelY = 1;//(double)m_oViewport.ulH / (double)m_oWindow.ulH;
-
-		SetPixelWidth(dPixelX);
-		SetPixelHeight(dPixelY);
-	}
-
-	return true;
-}
 void CSvmDC::SetRop2Mode(unsigned int& nMode)
 {
 	m_ulRop2Mode = nMode;

DesktopEditor/raster/Metafile/StarView/SvmPlayer.h

@@ -36,7 +36,7 @@ public:
 
 private:
 	void InitStockObjects();
-	void InitStockBrush	(bool bNull, unsigned char r, unsigned char g, unsigned char b);
+	void InitStockBrush	(bool bNull, unsigned char r, unsigned char g, unsigned char b , unsigned char a);
 	void InitStockPen	(bool bNull, unsigned char r, unsigned char g, unsigned char b);
 
 	typedef std::map < unsigned int, CSvmObjectBase* > CSvmObjectMap;
@@ -94,8 +94,6 @@ public:
 	CSvmPen*		GetPen();
 	void            SetStretchMode(unsigned int& oMode);
 	unsigned int    GetStretchMode();
-	TSvmWindow*     GetWindow();
-	TSvmWindow*     GetViewport();
 	void            SetRop2Mode(unsigned int& nMode);
 	unsigned int    GetRop2Mode();
 	//void            SetPalette(CSvmLogPalette* pPalette);
@@ -109,28 +107,6 @@ public:
 	void            SetArcDirection(unsigned int unDirection);
 	unsigned int    GetArcDirection();
 
-	void SetViewportOff(int lX, int lY);
-	void SetViewportExt(int lX, int lY);
-	
-	void SetWindowOff(short shX, short shY)
-	{
-		m_oWindow.lX += shX;
-		m_oWindow.lY += shY;
-		UpdatePixelMetrics();
-	}
-	void SetWindowScale(double dX, double dY)
-	{
-		m_oWindow.ulW = (int)(m_oWindow.ulW * dX);
-		m_oWindow.ulH = (int)(m_oWindow.ulH * dY);
-		UpdatePixelMetrics();
-	}
-	void SetWindowExt(short shW, short shH)
-	{
-		m_oWindow.ulW = shW;
-		m_oWindow.ulH = shH;
-		UpdatePixelMetrics();
-	}
-	
 	double          m_dPixelWidth;
 	double          m_dPixelHeight;
 	
@@ -143,7 +119,6 @@ private:
 
 	void	SetPixelWidth(double dPixelW);
 	void	SetPixelHeight(double dPixelH);
-	bool	UpdatePixelMetrics();
 
 	CSvmBrush*		m_pBrush;
 	CSvmPen*		m_pPen;
@@ -162,9 +137,6 @@ private:
 	unsigned int    m_ulStretchMode;
 	unsigned int    m_ulRop2Mode;
 	
-	TSvmWindow      m_oWindow;
-	TSvmWindow      m_oViewport;
-	
 	TSvmPoint		m_oCurPos;
 	//CSvmClip        m_oClip;
 	unsigned int    m_unArcDirection;

DesktopEditor/raster/Metafile/TestMain.cpp

@@ -61,11 +61,11 @@ void ConvertFolder(CMetaFile &oMetaFile, std::wstring wsFolderPath, const int nT
 		wsFilePath.append(vFiles.at(nIndex));
 		if (oMetaFile.LoadFromFile(wsFilePath.c_str()))
 		{
-			std::wstring wsDstFilePath = (wsFilePath.substr(0, wsFilePath.size() - 3)).append(L"bmp");
+			std::wstring wsDstFilePath = (wsFilePath.substr(0, wsFilePath.size() - 3)).append(L"png");
 
 			double w, h, x, y;
 			oMetaFile.GetBounds(&x, &y, &w, &h);
-			oMetaFile.ConvertToRaster(wsDstFilePath.c_str(), 1, w);
+			oMetaFile.ConvertToRaster(wsDstFilePath.c_str(), 4, w);
 			oMetaFile.Close();
 		}
 

DesktopEditor/raster/Metafile/Wmf/WmfObjects.h

@@ -55,6 +55,10 @@ namespace MetaFile
 		}
 		unsigned int GetHatch();
 		unsigned int GetAlpha();
+		unsigned int GetAlpha2()
+		{
+			return 0xff;
+		}
 		std::wstring GetDibPatterPath();
 		void GetBounds(double& left, double& top, double& width, double& height) {}