added missing const keywords

[swftools.git] / lib / modules / swffont.c

diff --git a/lib/modules/swffont.c b/lib/modules/swffont.c
index 63ccc4f..e7ad1df 100644 (file)
--- a/lib/modules/swffont.c
+++ b/lib/modules/swffont.c
@@ -59,7 +59,7 @@ void swf_SetLoadFontParameters(int _scale, int _skip_unused, int _full_unicode)
 #define FT_SCALE 1
 #define FT_SUBPIXELS 64
 
-static int ft_move_to(FT_Vector* _to, void* user) 
+static int ft_move_to(const FT_Vector* _to, void* user) 
 {
     drawer_t* draw = (drawer_t*)user;
     FPOINT to;
@@ -68,7 +68,7 @@ static int ft_move_to(FT_Vector* _to, void* user)
     draw->moveTo(draw, &to);
     return 0;
 }
-static int ft_line_to(FT_Vector* _to, void* user) 
+static int ft_line_to(const FT_Vector* _to, void* user) 
 {
     drawer_t* draw = (drawer_t*)user;
     FPOINT to;
@@ -77,28 +77,28 @@ static int ft_line_to(FT_Vector* _to, void* user)
     draw->lineTo(draw, &to);
     return 0;
 }
-static int ft_cubic_to(FT_Vector* _c1, FT_Vector* _c2, FT_Vector* _to, void* user)
+static int ft_conic_to(const FT_Vector* _c, const FT_Vector* _to, void* user) 
 {
     drawer_t* draw = (drawer_t*)user;
-    FPOINT c1,c2,to;
+    FPOINT c,to;
     to.x = _to->x*FT_SCALE/(float)FT_SUBPIXELS;
     to.y = -_to->y*FT_SCALE/(float)FT_SUBPIXELS;
-    c1.x = _c1->x*FT_SCALE/(float)FT_SUBPIXELS;
-    c1.y = -_c1->y*FT_SCALE/(float)FT_SUBPIXELS;
-    c2.x = _c2->x*FT_SCALE/(float)FT_SUBPIXELS;
-    c2.y = -_c2->y*FT_SCALE/(float)FT_SUBPIXELS;
-    draw_cubicTo(draw, &c1, &c2, &to);
+    c.x = _c->x*FT_SCALE/(float)FT_SUBPIXELS;
+    c.y = -_c->y*FT_SCALE/(float)FT_SUBPIXELS;
+    draw_conicTo(draw, &c, &to);
     return 0;
 }
-static int ft_conic_to(FT_Vector* _c, FT_Vector* _to, void* user) 
+static int ft_cubic_to(const FT_Vector* _c1, const FT_Vector* _c2, const FT_Vector* _to, void* user)
 {
     drawer_t* draw = (drawer_t*)user;
-    FPOINT c,to;
+    FPOINT c1,c2,to;
     to.x = _to->x*FT_SCALE/(float)FT_SUBPIXELS;
     to.y = -_to->y*FT_SCALE/(float)FT_SUBPIXELS;
-    c.x = _c->x*FT_SCALE/(float)FT_SUBPIXELS;
-    c.y = -_c->y*FT_SCALE/(float)FT_SUBPIXELS;
-    draw_conicTo(draw, &c, &to);
+    c1.x = _c1->x*FT_SCALE/(float)FT_SUBPIXELS;
+    c1.y = -_c1->y*FT_SCALE/(float)FT_SUBPIXELS;
+    c2.x = _c2->x*FT_SCALE/(float)FT_SUBPIXELS;
+    c2.y = -_c2->y*FT_SCALE/(float)FT_SUBPIXELS;
+    draw_cubicTo(draw, &c1, &c2, &to);
     return 0;
 }
 static FT_Outline_Funcs outline_functions =
@@ -125,7 +125,7 @@ SWFFONT* swf_LoadTrueTypeFont(char*filename)
     FT_Size size;
     int max_unicode = 0;
     int charmap = -1;
-   
+
     if(ftlibrary == 0) {
        if(FT_Init_FreeType(&ftlibrary)) {
            fprintf(stderr, "Couldn't init freetype library!\n");
@@ -133,12 +133,14 @@ SWFFONT* swf_LoadTrueTypeFont(char*filename)
        }
     }
     error = FT_New_Face(ftlibrary, filename, 0, &face);
-    FT_Set_Pixel_Sizes (face, 16*loadfont_scale, 16*loadfont_scale);
 
-    if(error) {
+    if(error || !face) {
        fprintf(stderr, "Couldn't load file %s- not a TTF file?\n", filename);
        return 0;
     }
+    
+    FT_Set_Pixel_Sizes (face, 16*loadfont_scale, 16*loadfont_scale);
+
     if(face->num_glyphs <= 0) {
        fprintf(stderr, "File %s contains %d glyphs\n", face->num_glyphs);
        return 0;
@@ -255,16 +257,26 @@ SWFFONT* swf_LoadTrueTypeFont(char*filename)
        }
        error = FT_Load_Glyph(face, t, FT_LOAD_NO_BITMAP);
        if(error) {
-           fprintf(stderr, "Couldn't load glyph %d, error:%d\n", t, error);
-           continue;
-       }
-       error = FT_Get_Glyph(face->glyph, &glyph);
-       if(error) {
-           fprintf(stderr, "Couldn't get glyph %d, error:%d\n", t, error);
-           continue;
+           //tends to happen with some pdfs
+           fprintf(stderr, "Warning: Glyph %d has return code %d\n", t, error);
+           glyph=0;
+           if(skip_unused) 
+               continue;
+       } else {
+           error = FT_Get_Glyph(face->glyph, &glyph);
+           if(error) {
+               fprintf(stderr, "Couldn't get glyph %d, error:%d\n", t, error);
+               glyph=0;
+               if(skip_unused) 
+                   continue;
+           }
        }
 
-       FT_Glyph_Get_CBox(glyph, ft_glyph_bbox_unscaled, &bbox);
+       if(glyph)
+           FT_Glyph_Get_CBox(glyph, ft_glyph_bbox_unscaled, &bbox);
+       else
+           memset(&bbox, 0, sizeof(bbox));
+
        bbox.yMin = -bbox.yMin;
        bbox.yMax = -bbox.yMax;
        if(bbox.xMax < bbox.xMin) {
@@ -283,7 +295,10 @@ SWFFONT* swf_LoadTrueTypeFont(char*filename)
        swf_Shape01DrawerInit(&draw, 0);
 
        //error = FT_Outline_Decompose(&face->glyph->outline, &outline_functions, &draw);
-       error = FT_Outline_Decompose(&face->glyph->outline, &outline_functions, &draw);
+       if(glyph)
+           error = FT_Outline_Decompose(&face->glyph->outline, &outline_functions, &draw);
+       else
+           error = 0;
        draw.finish(&draw);
        
        if(error) {
@@ -299,7 +314,10 @@ SWFFONT* swf_LoadTrueTypeFont(char*filename)
            font->glyph[font->numchars].advance = ((bbox.xMax - bbox.xMin)*20*FT_SCALE)/FT_SUBPIXELS;
        }
 #else
-       font->glyph[font->numchars].advance = glyph->advance.x*20/65536;
+       if(glyph)
+           font->glyph[font->numchars].advance = glyph->advance.x*20/65536;
+       else
+           font->glyph[font->numchars].advance = 0;
 #endif
        
        font->glyph[font->numchars].shape = swf_ShapeDrawerToShape(&draw);
@@ -311,7 +329,8 @@ SWFFONT* swf_LoadTrueTypeFont(char*filename)
 
        draw.dealloc(&draw);
 
-       FT_Done_Glyph(glyph);
+       if(glyph)
+           FT_Done_Glyph(glyph);
        font->glyph2ascii[font->numchars] = font->glyph2ascii[t];
        glyph2glyph[t] = font->numchars;
        font->numchars++;
@@ -476,9 +495,7 @@ SWFFONT* swf_LoadT1Font(char*filename)
            }
            last = pos;
            outline = outline->link;
-           printf("t1lib: (%f,%f) ", pos.x, pos.y);
        }
-       printf("\n");
        
        draw.finish(&draw);