Kaydet (Commit) 79b6406a authored tarafından Jianyuan Li's avatar Jianyuan Li

Fix win7 build bread issue.

Reported by: Andre
Patched by: Jianyuan Li
üst 8d04823a
...@@ -1281,6 +1281,7 @@ sal_Bool EnhWMFReader::ReadEnhWMF() ...@@ -1281,6 +1281,7 @@ sal_Bool EnhWMFReader::ReadEnhWMF()
} }
break; break;
case EMR_CREATEDIBPATTERNBRUSHPT : case EMR_CREATEDIBPATTERNBRUSHPT :
{
sal_uInt32 nTmp32; sal_uInt32 nTmp32;
sal_uInt32 nOffset; sal_uInt32 nOffset;
*pWMF >> nIndex; *pWMF >> nIndex;
...@@ -1317,7 +1318,7 @@ sal_Bool EnhWMFReader::ReadEnhWMF() ...@@ -1317,7 +1318,7 @@ sal_Bool EnhWMFReader::ReadEnhWMF()
} }
Color aColor( (sal_Char)( nRed / nCount ), (sal_Char)( nGreen / nCount ), (sal_Char)( nBlue / nCount ) ); Color aColor( (sal_Char)( nRed / nCount ), (sal_Char)( nGreen / nCount ), (sal_Char)( nBlue / nCount ) );
pOut->CreateObject( nIndex, GDI_BRUSH, new WinMtfFillStyle( aColor, sal_False ) ); pOut->CreateObject( nIndex, GDI_BRUSH, new WinMtfFillStyle( aColor, sal_False ) );
}
break; break;
#ifdef WIN_MTF_ASSERT #ifdef WIN_MTF_ASSERT
...@@ -1338,7 +1339,6 @@ sal_Bool EnhWMFReader::ReadEnhWMF() ...@@ -1338,7 +1339,6 @@ sal_Bool EnhWMFReader::ReadEnhWMF()
case EMR_ANGLEARC : WinMtfAssertHandler( "AngleArc" ); break; case EMR_ANGLEARC : WinMtfAssertHandler( "AngleArc" ); break;
case EMR_SETCOLORADJUSTMENT : WinMtfAssertHandler( "SetColorAdjustment" ); break; case EMR_SETCOLORADJUSTMENT : WinMtfAssertHandler( "SetColorAdjustment" ); break;
case EMR_POLYDRAW16 : WinMtfAssertHandler( "PolyDraw16" ); break; case EMR_POLYDRAW16 : WinMtfAssertHandler( "PolyDraw16" ); break;
case EMR_CREATEDIBPATTERNBRUSHPT : WinMtfAssertHandler( "CreateDibPatternBrushPt" ); break;
case EMR_POLYTEXTOUTA : WinMtfAssertHandler( "PolyTextOutA" ); break; case EMR_POLYTEXTOUTA : WinMtfAssertHandler( "PolyTextOutA" ); break;
case EMR_POLYTEXTOUTW : WinMtfAssertHandler( "PolyTextOutW" ); break; case EMR_POLYTEXTOUTW : WinMtfAssertHandler( "PolyTextOutW" ); break;
case EMR_CREATECOLORSPACE : WinMtfAssertHandler( "CreateColorSpace" ); break; case EMR_CREATECOLORSPACE : WinMtfAssertHandler( "CreateColorSpace" ); break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment