mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

workaround for emf+ files with broken dataSize of Image object record

Browse Source 
Change-Id: I5005961e1b618af949dc978a7ac560fc9eca3e65
This commit is contained in:
Radek Doulik
2013-02-25 15:05:19 +01:00
parent 804f47a893
commit 41cfd0fd9d
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cppcanvas/source/inc/implrenderer.hxx
View File

@@ -259,7 +259,7 @@ static float GetSwapFloat( SvStream& rSt )
ActionVector::const_iterator& o_rRangeBegin, ActionVector::const_iterator& o_rRangeBegin,
ActionVector::const_iterator& o_rRangeEnd ) const; ActionVector::const_iterator& o_rRangeEnd ) const;
void processObjectRecord(SvMemoryStream& rObjectStream, sal_uInt16 flags, sal_Bool bUseWholeStream = sal_False); void processObjectRecord(SvMemoryStream& rObjectStream, sal_uInt16 flags, sal_uInt32 dataSize, sal_Bool bUseWholeStream = sal_False);
/* EMF+ */ /* EMF+ */
void processEMFPlus( MetaCommentAction* pAct, const ActionFactoryParameters& rFactoryParms, OutDevState& rState, const CanvasSharedPtr& rCanvas ); void processEMFPlus( MetaCommentAction* pAct, const ActionFactoryParameters& rFactoryParms, OutDevState& rState, const CanvasSharedPtr& rCanvas );

14
cppcanvas/source/mtfrenderer/emfplus.cxx
View File

@@ -714,7 +714,7 @@ namespace cppcanvas
Graphic graphic; Graphic graphic;
void Read (SvMemoryStream &s, sal_Bool bUseWholeStream) void Read (SvMemoryStream &s, sal_uInt32 dataSize, sal_Bool bUseWholeStream)
{ {
sal_uInt32 header, unknown; sal_uInt32 header, unknown;
@@ -736,11 +736,11 @@ namespace cppcanvas
sal_Int32 mfType, mfSize; sal_Int32 mfType, mfSize;
s >> mfType >> mfSize; s >> mfType >> mfSize;
EMFP_DEBUG (printf ("EMF+\tmetafile type: %d dataSize: %d\n", mfType, mfSize)); EMFP_DEBUG (printf ("EMF+\tmetafile type: %d dataSize: %d real size calculated from record dataSize: %d\n", mfType, mfSize, dataSize - 16));
GraphicFilter filter; GraphicFilter filter;
// workaround buggy metafiles, which have wrong mfSize set (n#705956 for example) // workaround buggy metafiles, which have wrong mfSize set (n#705956 for example)
SvMemoryStream mfStream (((char *)s.GetData()) + s.Tell(), bUseWholeStream ? s.remainingSize() : mfSize, STREAM_READ); SvMemoryStream mfStream (((char *)s.GetData()) + s.Tell(), bUseWholeStream ? s.remainingSize() : dataSize - 16, STREAM_READ);
filter.ImportGraphic (graphic, String (), mfStream); filter.ImportGraphic (graphic, String (), mfStream);
@@ -1090,7 +1090,7 @@ namespace cppcanvas
} }
} }
void ImplRenderer::processObjectRecord(SvMemoryStream& rObjectStream, sal_uInt16 flags, sal_Bool bUseWholeStream) void ImplRenderer::processObjectRecord(SvMemoryStream& rObjectStream, sal_uInt16 flags, sal_uInt32 dataSize, sal_Bool bUseWholeStream)
{ {
sal_uInt32 index; sal_uInt32 index;
@@ -1145,7 +1145,7 @@ namespace cppcanvas
{ {
EMFPImage *image; EMFPImage *image;
aObjects [index] = image = new EMFPImage (); aObjects [index] = image = new EMFPImage ();
image->Read (rObjectStream, bUseWholeStream); image->Read (rObjectStream, dataSize, bUseWholeStream);
break; break;
} }
@@ -1211,7 +1211,7 @@ namespace cppcanvas
if (mbMultipart) { if (mbMultipart) {
EMFP_DEBUG (printf ("EMF+ multipart record flags: %04hx\n", mMFlags)); EMFP_DEBUG (printf ("EMF+ multipart record flags: %04hx\n", mMFlags));
mMStream.Seek (0); mMStream.Seek (0);
processObjectRecord (mMStream, mMFlags, sal_True); processObjectRecord (mMStream, mMFlags, dataSize, sal_True);
} }
mbMultipart = false; mbMultipart = false;
} }
@@ -1235,7 +1235,7 @@ namespace cppcanvas
EMFP_DEBUG (printf ("EMF+\talready used in svtools wmf/emf filter parser\n")); EMFP_DEBUG (printf ("EMF+\talready used in svtools wmf/emf filter parser\n"));
break; break;
case EmfPlusRecordTypeObject: case EmfPlusRecordTypeObject:
processObjectRecord (rMF, flags); processObjectRecord (rMF, flags, dataSize);
break; break;
case EmfPlusRecordTypeFillPie: case EmfPlusRecordTypeFillPie:
{ {