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

List:       xfree-fonts
Subject:    [Fonts] Fix mkfontscale crash (please include in 4.3)
From:       Juliusz Chroboczek <jch () pps ! jussieu ! fr>
Date:       2003-01-22 22:25:05
[Download RAW message or body]

Two extra guards in mkfontscale:

- prevents mkfontscale from looking at bitmap fonts;
- ensures mkfontscale doesn't crash if a font happens to have no head.

Please apply for 4.3.

                                        Juliusz


[Attachment #3 (text/x-patch)]

? xc/programs/mkfontscale/Makefile
? xc/programs/mkfontscale/fonts.scale
? xc/programs/mkfontscale/mkfontscale
? xc/programs/mkfontscale/mkfontscale.1x.html
? xc/programs/mkfontscale/mkfontscale._man
Index: xc/programs/mkfontscale/mkfontscale.c
===================================================================
RCS file: /cvs/xc/programs/mkfontscale/mkfontscale.c,v
retrieving revision 1.2
diff -c -r1.2 mkfontscale.c
*** xc/programs/mkfontscale/mkfontscale.c	2002/09/27 01:55:06	1.2
--- xc/programs/mkfontscale/mkfontscale.c	2003/01/22 22:21:26
***************
*** 349,354 ****
--- 349,358 ----
          ftrc = FT_New_Face(ft_library, filename, 0, &face);
          if(ftrc)
              continue;
+ 
+         if((face->face_flags & FT_FACE_FLAG_SCALABLE) == 0)
+             continue;
+ 
          found = 0;
  
          foundry = NULL;
***************
*** 435,440 ****
--- 439,454 ----
                  slant = head->Mac_Style & 2 ? "i" : "r";
              if(!weight)
                  weight = head->Mac_Style & 1 ? "bold" : "medium";
+         }
+ 
+         if(!slant) {
+             fprintf(stderr, "Couldn't determine slant for %s\n", filename);
+             slant = "r";
+         }
+ 
+         if(!weight) {
+             fprintf(stderr, "Couldn't determine weight for %s\n", filename);
+             weight = "medium";
          }
  
          if(!foundry) {

_______________________________________________
Fonts mailing list
Fonts@XFree86.Org
http://XFree86.Org/mailman/listinfo/fonts

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