[prev in list] [next in list] [prev in thread] [next in thread] 

List:       wine-patches
Subject:    Minor logging improvements to freetype.c
From:       Mike Hearn <mh () codeweavers ! com>
Date:       2004-05-31 20:47:35
Message-ID: 200405312047.i4VKlZkT015747 () smtphost1 ! dur ! ac ! uk
[Download RAW message or body]

Mike Hearn <mh@codeweavers.com>
Change some TRACEs into WARNs, WARN on skipping font due to wrong format.

Index: dlls/gdi/freetype.c
===================================================================
RCS file: /home/wine/wine/dlls/gdi/freetype.c,v
retrieving revision 1.60
diff -u -r1.60 freetype.c
--- dlls/gdi/freetype.c	20 Apr 2004 01:12:18 -0000	1.60
+++ dlls/gdi/freetype.c	31 May 2004 20:47:29 -0000
@@ -316,20 +316,21 @@
 	}
 
 	if(!FT_IS_SFNT(ft_face)) { /* for now we'll skip everything but TT/OT */
+            WARN("skipping font file %s, not TrueType/OpenType font\n", \
debugstr_a(file));  pFT_Done_Face(ft_face);
 	    return FALSE;
 	}
 	if(!pFT_Get_Sfnt_Table(ft_face, ft_sfnt_os2) ||
 	   !pFT_Get_Sfnt_Table(ft_face, ft_sfnt_hhea) ||
            !(pHeader = pFT_Get_Sfnt_Table(ft_face, ft_sfnt_head))) {
-	    TRACE("Font file %s lacks either an OS2, HHEA or HEAD table.\n"
+	    WARN("Font file %s lacks either an OS2, HHEA or HEAD table.\n"
 		  "Skipping this font.\n", debugstr_a(file));
 	    pFT_Done_Face(ft_face);
 	    return FALSE;
 	}
 
         if(!ft_face->family_name || !ft_face->style_name) {
-            TRACE("Font file %s lacks either a family or style name\n", \
debugstr_a(file)); +            WARN("Font file %s lacks either a family or style \
name\n", debugstr_a(file));  pFT_Done_Face(ft_face);
             return FALSE;
         }
@@ -369,13 +370,13 @@
                       (*insertface)->font_version,  pHeader->Font_Revision);
 
                 if(fake_family) {
-                    TRACE("This font is a replacement but the original really \
exists, so we'll skip the replacement\n"); +                    WARN("This font is a \
replacement but the original really exists, so we'll skip the replacement\n");  \
HeapFree(GetProcessHeap(), 0, StyleW);  pFT_Done_Face(ft_face);
                     return FALSE;
                 }
                 if(pHeader->Font_Revision <= (*insertface)->font_version) {
-                    TRACE("Original font is newer so skipping this one\n");
+                    WARN("Original font is newer so skipping this one\n");
                     HeapFree(GetProcessHeap(), 0, StyleW);
                     pFT_Done_Face(ft_face);
                     return FALSE;


[prev in list] [next in list] [prev in thread] [next in thread]