ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

Remove code duplication in GraphicDescriptor for EPS

Browse Source 
GraphicFormatDetector and GraphicDescriptor have duplicate format
detection code so now GraphicDescriptor uses GraphicFormatDetector
functions instead to detect the format for EPS files

Change-Id: I108aefc56a0e9215eaeef3ae2a7b4d884f0a5373
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138208
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
This commit is contained in:
offtkp
2022-08-19 10:26:33 +02:00
committed by Tomaž Vajngerl
parent 416168c010
commit e956091ad8
1 changed files with 5 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
vcl/source/filter/graphicfilter2.cxx
+5 -17
View File
@@ -918,24 +918,12 @@ bool GraphicDescriptor::ImpDetectPSD( SvStream& rStm, bool bExtendedInfo )
bool GraphicDescriptor::ImpDetectEPS( SvStream& rStm, bool )
{
// check the EPS preview and the file extension
sal_uInt32 nFirstLong = 0;
sal_uInt8 nFirstBytes[20] = {};
bool bRet = false;
sal_Int32 nStmPos = rStm.Tell();
rStm.SetEndian( SvStreamEndian::BIG );
rStm.ReadUInt32( nFirstLong );
rStm.SeekRel( -4 );
rStm.ReadBytes( &nFirstBytes, 20 );
if ( ( nFirstLong == 0xC5D0D3C6 ) || aPathExt.startsWith( "eps" ) ||
( ImplSearchEntry( nFirstBytes, reinterpret_cast<sal_uInt8 const *>("%!PS-Adobe"), 10, 10 )
&& ImplSearchEntry( &nFirstBytes[15], reinterpret_cast<sal_uInt8 const *>("EPS"), 3, 3 ) ) )
{
aMetadata.mnFormat = GraphicFileFormat::EPS;
bRet = true;
}
vcl::GraphicFormatDetector aDetector( rStm, aPathExt, false /*bExtendedInfo*/ );
bool bRet = aDetector.detect();
bRet &= aDetector.checkEPS();
if ( bRet )
aMetadata = aDetector.getMetadata();
rStm.Seek( nStmPos );
return bRet;
}