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

[leonardo at ghostscript.com]

Author: leonardo
Date: 2007-04-02 11:25:44 -0700 (Mon, 02 Apr 2007)
New Revision: 7816

Modified:
   trunk/gs/src/gdevpdtc.c
Log:
Fix (pdfwrite) : a composite font with a Type 3 descendent and FMapType 2 (continued).

DETAILS :

Patch from SaGS with minor improvements.
Bug 688639 " pdfwrite: a composite font with a Type 3 descendent and FMapType 2".
The last patch deosn't correctly accommodate the code from SaGS.

EXPECTED DIFFERENCES :

None.


Modified: trunk/gs/src/gdevpdtc.c
===================================================================
--- trunk/gs/src/gdevpdtc.c	2007-04-01 21:46:50 UTC (rev 7815)
+++ trunk/gs/src/gdevpdtc.c	2007-04-02 18:25:44 UTC (rev 7816)
@@ -140,7 +140,6 @@
 	    if (code < 0)
 		return code;
 	    curr.xy_index = out.xy_index; /* pdf_encode_process_string advanced it. */
-	    pte->xy_index = out.xy_index;
 	    if (out.index < str.size) {
 		gs_glyph glyph;
 
@@ -149,9 +148,11 @@
 		while (out.index--)
 		    pte->orig_font->procs.next_char_glyph(pte, &chr, &glyph);
 		font_code = 2; /* force exiting the loop */
-	    } else
+	    } else {
 		/* advance *pte past the current substring */
 		gs_text_enum_copy_dynamic(pte, (gs_text_enum_t *)&prev, true);
+	    }
+	    pte->xy_index = out.xy_index;
 	    if (return_width) {
 		pte->returned.total_width.x = total_width.x +=
 		    out.returned.total_width.x;