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

[leonardo at ghostscript.com]

Author: leonardo
Date: 2007-08-28 09:18:27 -0700 (Tue, 28 Aug 2007)
New Revision: 8212

Modified:
   trunk/gs/src/gdevpsf.h
   trunk/gs/src/gdevpsf2.c
   trunk/gs/src/gdevpsfx.c
Log:
Fix (pdfwrite) : Uninitialized defaultWidthXwhile while converting a Type 1 font into Type 2.

DETAILS :

Bug 689406 "Valgrind: Uninitialised defaultWidthX in psf_convert_type1_to_type2()".

The last patch appears incomplete and doesn't compile. 
Fixing now.

EXPECTED DIFFERENCES :

None.


Modified: trunk/gs/src/gdevpsf.h
===================================================================
--- trunk/gs/src/gdevpsf.h	2007-08-28 16:06:12 UTC (rev 8211)
+++ trunk/gs/src/gdevpsf.h	2007-08-28 16:18:27 UTC (rev 8212)
@@ -226,6 +226,8 @@
 		   const gs_const_string *alt_cmap_name, int font_index_only);
 /* ------ Exported by gdevpsft.c ------ */
 
+extern const long default_defaultWidthX;
+
 /*
  * Write a TrueType (Type 42) font definition.
  * This procedure does not allocate or free any data.

Modified: trunk/gs/src/gdevpsf2.c
===================================================================
--- trunk/gs/src/gdevpsf2.c	2007-08-28 16:06:12 UTC (rev 8211)
+++ trunk/gs/src/gdevpsf2.c	2007-08-28 16:18:27 UTC (rev 8212)
@@ -750,6 +750,8 @@
 #define initialRandomSeed_DEFAULT 0
 } Private_op;
 
+const long default_defaultWidthX = defaultWidthX_DEFAULT; /* For gdevpsfx.c */
+
 private void
 cff_write_Private(cff_writer_t *pcw, uint Subrs_offset,
 		  const gs_font_type1 *pfont)

Modified: trunk/gs/src/gdevpsfx.c
===================================================================
--- trunk/gs/src/gdevpsfx.c	2007-08-28 16:06:12 UTC (rev 8211)
+++ trunk/gs/src/gdevpsfx.c	2007-08-28 16:18:27 UTC (rev 8212)
@@ -646,10 +646,10 @@
 	       defaultWidthX = defaultWidthX_DEFAULT
 	       Use the latter here.
 	     */
-	    if (cis.ostack[0] == defaultWidthX_DEFAULT)
+	    if (cis.ostack[0] == default_defaultWidthX)
 		cis.os_count = 0;
 	    else {
-		cis.ostack[0] -= defaultWidthX_DEFAULT;
+		cis.ostack[0] -= default_defaultWidthX;
 		cis.os_count = 1;
 	    }
 	    if (hstem_hints.count) {