diff options
| -rw-r--r-- | src/gf/gfdrivr.c | 2 | ||||
| -rw-r--r-- | src/gf/gfdrivr.h | 33 |
2 files changed, 18 insertions, 17 deletions
diff --git a/src/gf/gfdrivr.c b/src/gf/gfdrivr.c index c0f4274e6..0c767ac14 100644 --- a/src/gf/gfdrivr.c +++ b/src/gf/gfdrivr.c @@ -134,7 +134,7 @@ FT_Memory memory; - if ( !face ) + if ( !face h ) return; memory = FT_FACE_MEMORY( face ); diff --git a/src/gf/gfdrivr.h b/src/gf/gfdrivr.h index 365084e68..9d8afb788 100644 --- a/src/gf/gfdrivr.h +++ b/src/gf/gfdrivr.h @@ -28,32 +28,33 @@ FT_BEGIN_HEADER /* BitmapRec for GF format specific glyphs */ - typedef struct GF_BitmapRec_ + typedef struct GF_BitmapRec_ { - int bbx_width, bbx_height; - int off_x, off_y; - int mv_x, mv_y; - unsigned char *bitmap; - int raster; + FT_UInt bbx_width, bbx_height; + FT_UInt off_x, off_y; + FT_UInt mv_x, mv_y; + unsigned char *bitmap; + FT_UInt raster; + } GF_BitmapRec, *GF_Bitmap; - - typedef struct GF_Glyph_ + + typedef struct GF_GlyphRec_ { - int code_min, code_max; - GF_BITMAP bm_table; - double ds, hppp, vppp; - int font_bbx_w, font_bbx_h; - int font_bbx_xoff, font_bbx_yoff; - } GF_Glyph, *GF_Glyph; + FT_UInt code_min, code_max; + GF_BITMAP bm_table; + double ds, hppp, vppp; + FT_UInt font_bbx_w, font_bbx_h; + FT_UInt font_bbx_xoff, font_bbx_yoff; + + } GF_GlyphRec, *GF_Glyph; typedef struct GF_FaceRec_ { FT_FaceRec root; GF_Glyph gf_glyph; - GF_BitmapRec gf_bitmap; - + } GF_FaceRec, *GF_Face; |