You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by hd...@apache.org on 2012/06/14 11:32:39 UTC

svn commit: r1350163 - /incubator/ooo/trunk/main/vcl/source/fontsubset/cff.cxx

Author: hdu
Date: Thu Jun 14 09:32:39 2012
New Revision: 1350163

URL: http://svn.apache.org/viewvc?rev=1350163&view=rev
Log:
#c705441# handle invalid FDSelect entry while emitting Type1

Modified:
    incubator/ooo/trunk/main/vcl/source/fontsubset/cff.cxx

Modified: incubator/ooo/trunk/main/vcl/source/fontsubset/cff.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/vcl/source/fontsubset/cff.cxx?rev=1350163&r1=1350162&r2=1350163&view=diff
==============================================================================
--- incubator/ooo/trunk/main/vcl/source/fontsubset/cff.cxx (original)
+++ incubator/ooo/trunk/main/vcl/source/fontsubset/cff.cxx Thu Jun 14 09:32:39 2012
@@ -2317,6 +2317,8 @@ bool CffSubsetterContext::emitAsType1( T
 		assert( (nGlyphId >= 0) && (nGlyphId < mnCharStrCount));
 		// get privdict context matching to the glyph
 		const int nFDSelect = getFDSelect( nGlyphId);
+		if( nFDSelect < 0)
+			continue;
 		mpCffLocal = &maCffLocal[ nFDSelect];
 		// convert the Type2op charstring to its Type1op counterpart
 		const int nT2Len = seekIndexData( mnCharStrBase, nGlyphId);