PATCH: dlls/wineps/type42.c

Gerald Pfeifer gerald at pfeifer.com
Tue Nov 11 01:18:14 CST 2003


I wonder, how our Type42 support ever could have worked given the
following:

  type42.c: In function `T42_download_header':
  type42.c:269: warning: int format, DWORD arg (arg 3)
  type42.c:269: warning: int format, DWORD arg (arg 4)
  type42.c: In function `T42_download_glyph':
  type42.c:364: warning: int format, DWORD arg (arg 4)
  type42.c:364: warning: int format, DWORD arg (arg 6)

The patch below avoid this warnings, and in fact probably is even needed
to make this work correctly.

Gerald

ChangeLog:
Fix format strings in T42_download_header() and T42_download_glyph().
Index: type42.c
===================================================================
RCS file: /home/wine/wine/dlls/wineps/type42.c,v
retrieving revision 1.6
diff -u -3 -p -r1.6 type42.c
--- type42.c	11 Nov 2003 00:30:42 -0000	1.6
+++ type42.c	11 Nov 2003 07:15:00 -0000
@@ -158,7 +158,7 @@ TYPE42 *T42_download_header(PSDRV_PDEVIC
     const char storage[] ="]\nhavetype42gdir{pop}{{string} forall}ifelse\n";
     const char end[] = "] def\n"
       "havetype42gdir{/GlyphDirectory 256 dict def\n"
-      " sfnts 0 get dup %d (x) putinterval %d (x) putinterval}if\n"
+      " sfnts 0 get dup %ld (x) putinterval %ld (x) putinterval}if\n"
       "currentdict end dup /FontName get exch definefont pop\n";


@@ -287,12 +287,12 @@ BOOL T42_download_glyph(PSDRV_PDEVICE *p
     const char glyph_def[] =
       "/%s findfont exch 1 index\n"
       "havetype42gdir\n"
-      "{/GlyphDirectory get begin %d exch def end}\n"
+      "{/GlyphDirectory get begin %ld exch def end}\n"
       "{/sfnts get 4 index get 3 index 2 index putinterval pop}\n"
       "ifelse\n"
       "/CharStrings get\n"
       "begin\n"
-      " /%s %d def\n"
+      " /%s %ld def\n"
       "end\n"
       "pop pop\n";




More information about the wine-patches mailing list