[freetype2] parthw-cleaned d83a664 3/3: [gf] Minor Fixes.

[Parth Wazurkar]

branch: parthw-cleaned
commit d83a664a32e8cd9fb277527bb98a761ef050dbaa
Author: Parth Wazurkar <address@hidden>
Commit: Parth Wazurkar <address@hidden>

    [gf] Minor Fixes.
---
 include/freetype/config/ftmodule.h | 1 +
 include/freetype/config/ftoption.h | 4 ++--
 src/gf/gf.h                        | 1 +
 src/gf/gfdrivr.h                   | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/include/freetype/config/ftmodule.h 
b/include/freetype/config/ftmodule.h
index 820c11c..c9adfb6 100644
--- a/include/freetype/config/ftmodule.h
+++ b/include/freetype/config/ftmodule.h
@@ -28,5 +28,6 @@ FT_USE_MODULE( FT_Renderer_Class, ft_smooth_renderer_class )
 FT_USE_MODULE( FT_Renderer_Class, ft_smooth_lcd_renderer_class )
 FT_USE_MODULE( FT_Renderer_Class, ft_smooth_lcdv_renderer_class )
 FT_USE_MODULE( FT_Driver_ClassRec, bdf_driver_class )
+FT_USE_MODULE( FT_Driver_ClassRec, gf_driver_class )
 
 /* EOF */
diff --git a/include/freetype/config/ftoption.h 
b/include/freetype/config/ftoption.h
index a5d883f..e3448b2 100644
--- a/include/freetype/config/ftoption.h
+++ b/include/freetype/config/ftoption.h
@@ -413,8 +413,8 @@ FT_BEGIN_HEADER
    *   Do not #undef these macros here since the build system might define
    *   them for certain configurations only.
    */
-/* #define FT_DEBUG_LEVEL_ERROR */
-/* #define FT_DEBUG_LEVEL_TRACE */
+#define FT_DEBUG_LEVEL_ERROR
+#define FT_DEBUG_LEVEL_TRACE
 
 
   /**************************************************************************
diff --git a/src/gf/gf.h b/src/gf/gf.h
index e624b95..54d066e 100644
--- a/src/gf/gf.h
+++ b/src/gf/gf.h
@@ -59,6 +59,7 @@ FT_BEGIN_HEADER
 #define  GF_YYY          243
 #define  GF_NO_OP        244
 
+#define toint(x)  (int)(((x)>0)?(x+0.5):(x-0.5))
 
 typedef  char           INT1;
 typedef  unsigned char  UINT1;
diff --git a/src/gf/gfdrivr.h b/src/gf/gfdrivr.h
index f32b3b0..da8f97d 100644
--- a/src/gf/gfdrivr.h
+++ b/src/gf/gfdrivr.h
@@ -43,7 +43,7 @@ FT_BEGIN_HEADER
   {
     FT_UInt         code_min, code_max;
     GF_Bitmap       bm_table;
-    double          ds, hppp, vppp;
+    FT_UInt         ds, hppp, vppp;
     FT_UInt         font_bbx_w, font_bbx_h;
     FT_UInt         font_bbx_xoff, font_bbx_yoff;