[gs-cvs] rev 7042 - trunk/gs/src

[leonardo at ghostscript.com]

Author: leonardo
Date: 2006-09-13 10:23:29 -0700 (Wed, 13 Sep 2006)
New Revision: 7042

Modified:
   trunk/gs/src/gdevpdtf.c
   trunk/gs/src/gdevpdtt.c
Log:
Fix (pdfwrite) : CIDFontType2 must not embed into PDF 1.2 .

DETAILS :

Bug 688889 "pdfwrite : CIDFontType2 must not embed with CompatibilityLevel=1.2".

The last patch fixed it incorrectly : it skips the font embedding 
rather than converts the font into a non-CID.
This patch does convert the font into a Type 3 bitmap font.

EXPECTED DIFFERENCES :

None.


Modified: trunk/gs/src/gdevpdtf.c
===================================================================
--- trunk/gs/src/gdevpdtf.c	2006-09-13 11:59:10 UTC (rev 7041)
+++ trunk/gs/src/gdevpdtf.c	2006-09-13 17:23:29 UTC (rev 7042)
@@ -681,8 +681,6 @@
     if (pdev->PDFX || pdev->PDFA)
 	return FONT_EMBED_YES;
     if (pdev->CompatibilityLevel < 1.3) {
-	if (font->FontType == 11)
-	    return FONT_EMBED_NO;
 	if (index >= 0 && 
 	    (embed_as_standard_called = true,
 		do_embed_as_standard = embed_as_standard(pdev, font, index, pairs, num_glyphs))) {

Modified: trunk/gs/src/gdevpdtt.c
===================================================================
--- trunk/gs/src/gdevpdtt.c	2006-09-13 11:59:10 UTC (rev 7041)
+++ trunk/gs/src/gdevpdtt.c	2006-09-13 17:23:29 UTC (rev 7042)
@@ -1100,6 +1100,9 @@
 	    return_error(gs_error_undefined);
     }
     embed = pdf_font_embed_status(pdev, base_font, &index, cgp->s, cgp->num_all_chars);
+    if (pdev->CompatibilityLevel < 1.3)
+	if (embed != FONT_EMBED_NO && font->FontType == ft_CID_TrueType)
+	    return_error(gs_error_rangecheck);
     if (embed == FONT_EMBED_STANDARD) {
 	pdf_standard_font_t *psf = &psfa[index];