[freetype2] parthw-wip 39e48cf 2/2: [gf] Add printf flags for debugging.

[Parth Wazurkar]

branch: parthw-wip
commit 39e48cf54739cd483affc16cbc010c51cb9770d3
Author: Parth Wazurkar <address@hidden>
Commit: Parth Wazurkar <address@hidden>

    [gf] Add printf flags for debugging.
---
 src/cache/ftcmanag.c |   4 +-
 src/cache/ftcmru.c   |  22 ++++----
 src/cache/ftcmru.h   |   4 +-
 src/gf/gf.c          |   2 +-
 src/gf/gfdrivr.c     | 148 +++++++++++++++++++++++++++++++--------------------
 src/gf/gflib.c       |  26 ++++-----
 6 files changed, 120 insertions(+), 86 deletions(-)

diff --git a/src/cache/ftcmanag.c b/src/cache/ftcmanag.c
index d4a7242..e89b386 100644
--- a/src/cache/ftcmanag.c
+++ b/src/cache/ftcmanag.c
@@ -40,7 +40,7 @@
     FT_Size   size = NULL;
     FT_Error  error;
 
-
+printf("Hi I am here in ftc_scaler_lookup_size 1\n");
     error = FTC_Manager_LookupFace( manager, scaler->face_id, &face );
     if ( error )
       goto Exit;
@@ -122,7 +122,7 @@
     FTC_SizeNode  node    = (FTC_SizeNode)ftcnode;
     FTC_Scaler    scaler  = (FTC_Scaler)ftcscaler;
     FTC_Manager   manager = (FTC_Manager)ftcmanager;
-
+printf("Hi I am here in ftc_size_node_init 1\n");
 
     node->scaler = scaler[0];
 
diff --git a/src/cache/ftcmru.c b/src/cache/ftcmru.c
index a7d9d8d..170708d 100644
--- a/src/cache/ftcmru.c
+++ b/src/cache/ftcmru.c
@@ -240,39 +240,39 @@ printf("Hi I am here in FTC_MruNode_Up 1\n");
     FT_Error     error;
     FTC_MruNode  node   = NULL;
     FT_Memory    memory = list->memory;
-
+printf("Hi I am here in FTC_MruList_New 0\n");
 
     if ( list->num_nodes >= list->max_nodes && list->max_nodes > 0 )
     {
       node = list->nodes->prev;
 
       FT_ASSERT( node );
-
+printf("Hi I am here in FTC_MruList_New 1\n");
       if ( list->clazz.node_reset )
-      {
+      {printf("Hi I am here in FTC_MruList_New 2\n");
         FTC_MruNode_Up( &list->nodes, node );
-
-        error = list->clazz.node_reset( node, key, list->data );
+printf("Hi I am here in FTC_MruList_New 3\n");
+        error = list->clazz.node_reset( node, key, list->data );printf("Hi I 
am here in FTC_MruList_New 4\n");
         if ( !error )
           goto Exit;
       }
-
+printf("Hi I am here in FTC_MruList_New 5\n");
       FTC_MruNode_Remove( &list->nodes, node );
       list->num_nodes--;
-
+printf("Hi I am here in FTC_MruList_New 6\n");
       if ( list->clazz.node_done )
         list->clazz.node_done( node, list->data );
     }
     else if ( FT_ALLOC( node, list->clazz.node_size ) )
       goto Exit;
-
-    error = list->clazz.node_init( node, key, list->data );
+printf("Hi I am here in FTC_MruList_New 7\n");
+    error = list->clazz.node_init( node, key, list->data );printf("Hi I am 
here in FTC_MruList_New 7.1\n");
     if ( error )
       goto Fail;
-
+printf("Hi I am here in FTC_MruList_New 8\n");
     FTC_MruNode_Prepend( &list->nodes, node );
     list->num_nodes++;
-
+printf("Hi I am here in FTC_MruList_New 9\n");
   Exit:
     *anode = node;
     return error;
diff --git a/src/cache/ftcmru.h b/src/cache/ftcmru.h
index 436250c..493cd64 100644
--- a/src/cache/ftcmru.h
+++ b/src/cache/ftcmru.h
@@ -189,8 +189,8 @@ FT_BEGIN_HEADER
                       printf("Hi I am here in FTC_MRULIST_LOOKUP_CMP 2\n");    
                                                  \
       } while ( _node != _first);                                           \
     }                                                                       \
-                                                                            \
-    error = FTC_MruList_New( (list), (key), (FTC_MruNode*)(void*)&(node) ); 
printf("Hi I am here in FTC_MRULIST_LOOKUP_CMP 3\n");\
+                         printf("Hi I am here in FTC_MRULIST_LOOKUP_CMP 3\n"); 
                                                  \
+    error = FTC_MruList_New( (list), (key), (FTC_MruNode*)(void*)&(node) ); 
printf("Hi I am here in FTC_MRULIST_LOOKUP_CMP 4\n");\
   MruOk_:                                                                   \
     ;                                                                       \
   FT_END_STMNT
diff --git a/src/gf/gf.c b/src/gf/gf.c
index 8010d8e..a41ec26 100644
--- a/src/gf/gf.c
+++ b/src/gf/gf.c
@@ -20,7 +20,7 @@
 
 #include <ft2build.h>
 
-#include "gflibfp.c"
+#include "gflib.c"
 #include "gfdrivr.c"
 
 
diff --git a/src/gf/gfdrivr.c b/src/gf/gfdrivr.c
index 1f0eaed..05c832b 100644
--- a/src/gf/gfdrivr.c
+++ b/src/gf/gfdrivr.c
@@ -23,6 +23,7 @@
 #include FT_TRUETYPE_IDS_H
 #include FT_SERVICE_FONT_FORMAT_H
 
+
 #include "gf.h"
 #include "gfdrivr.h"
 #include "gferror.h"
@@ -51,10 +52,11 @@
                  FT_Pointer  init_data )
   {
     GF_CMap  cmap = (GF_CMap)gfcmap;
+    GF_Face  face = (GF_Face)FT_CMAP_FACE( cmap );
     FT_UNUSED( init_data );
 
-    cmap->bc     = 0;
-    cmap->ec     = 255;
+    cmap->bc     = face->gf_glyph->code_min;
+    cmap->ec     = face->gf_glyph->code_max;
 
     return FT_Err_Ok;
   }
@@ -133,7 +135,7 @@
   GF_Face_Done( FT_Face        gfface )         /* GF_Face */
   {
     GF_Face    face = (GF_Face)gfface;
-    FT_Memory  memory= FT_FACE_MEMORY( gfface );
+    FT_Memory  memory;
 
 
     if ( !face )
@@ -142,6 +144,8 @@
     memory = FT_FACE_MEMORY( face );
 
     gf_free_font( face->gf_glyph, memory );
+
+    /* FT_FREE(  ); */
   }
 
 
@@ -156,6 +160,7 @@
     FT_Error    error;
     FT_Memory   memory = FT_FACE_MEMORY( face );
     GF_Glyph    go;
+    int i,count;
 
     face->gf_glyph = &go ;
     FT_UNUSED( num_params );
@@ -165,59 +170,91 @@
 
     /* load font */
     error = gf_load_font( stream, memory, &go );
+
     if ( error )
       goto Exit;
 
-    /* we now need to fill the root FT_Face fields */
-    /* with relevant information                   */
+    /* we have a gf font: let's construct the face object */
 
-    gfface->num_faces       = 1;
-    gfface->face_index      = 0;
-    gfface->face_flags     |= FT_FACE_FLAG_FIXED_SIZES | 
FT_FACE_FLAG_HORIZONTAL ;
-    gfface->family_name     = NULL;
-    gfface->num_glyphs      = (FT_Long)(go->code_max - go->code_min + 1 );
-    gfface->num_fixed_sizes = 1;
+    /* GF cannot have multiple faces in a single font file.
+     * XXX: non-zero face_index is already invalid argument, but
+     *      Type1, Type42 driver has a convention to return
+     *      an invalid argument error when the font could be
+     *      opened by the specified driver.
+     */
+   /* if ( face_index > 0 && ( face_index & 0xFFFF ) > 0 )
+    {
+      FT_ERROR(( "GF_Face_Init: invalid face index\n" ));
+      GF_Face_Done( gfface );
+      return FT_THROW( Invalid_Argument );
+    }
+  */
+    gfface->num_faces  = 1;
+    gfface->face_index = 0;
+    gfface->face_flags |= FT_FACE_FLAG_FIXED_SIZES |
+                             FT_FACE_FLAG_HORIZONTAL ;
+    /*
+     * XXX: TO-DO: gfface->face_flags |= FT_FACE_FLAG_FIXED_WIDTH;
+     * XXX: I have to check for this.
+     */
+printf("Hi I am here2\n");
+    gfface->family_name = NULL;
+
+    count=0;
+    for (i = 0; i < 256; i++)
+    {
+      if(go->bm_table[i].bitmap != NULL)
+        count++;
+    }
+    printf("count is %d",count);
+    gfface->num_glyphs      = (FT_Long)count;
 
+    gfface->num_fixed_sizes = 1;
+printf("Hi I am here3\n");
     if ( FT_NEW_ARRAY( gfface->available_sizes, 1 ) )
       goto Exit;
-
-      {
-        FT_Bitmap_Size*  bsize = gfface->available_sizes;
-        FT_UShort        x_res, y_res;
-
-        bsize->width  = (FT_Short) face->gf_glyph->font_bbx_w ;
-        bsize->height = (FT_Short) face->gf_glyph->font_bbx_h ;
-        bsize->size   = (FT_Short) face->gf_glyph->ds ; /* Preliminary to be 
checked for 26.6 fractional points*/
-
-        /*x_res =  ;  To be Checked for x_resolution and y_resolution
-        y_res =  ;*/
-
-        bsize->y_ppem = face->gf_glyph->font_bbx_yoff ;
-        bsize->x_ppem = face->gf_glyph->font_bbx_xoff ;
-      }
+printf("Hi I am here4\n");
+    {
+      FT_Bitmap_Size*  bsize = gfface->available_sizes;
+      FT_UShort        x_res, y_res;
+
+      FT_ZERO( bsize );
+      bsize->width  = (FT_Short) face->gf_glyph->font_bbx_w    ;
+      bsize->height = (FT_Short) face->gf_glyph->font_bbx_h    ;
+      bsize->size   = (FT_Short) face->gf_glyph->ds            ; /* 
Preliminary to be checked for 26.6 fractional points*/
+
+      /*x_res =  ;  To be Checked for x_resolution and y_resolution
+        y_res =  ;
+      */
+      bsize->y_ppem = face->gf_glyph->font_bbx_yoff ;
+      bsize->x_ppem = face->gf_glyph->font_bbx_xoff ;
+    }
+printf("Hi I am here5\n");
 
       /* Charmaps */
 
-      {
-        FT_CharMapRec  charmap;
+    {
+      FT_CharMapRec  charmap;
 
 
-        charmap.encoding    = FT_ENCODING_NONE;
-        /* initial platform/encoding should indicate unset status? */
-        charmap.platform_id = TT_PLATFORM_APPLE_UNICODE;  /*Preliminary */
-        charmap.encoding_id = TT_APPLE_ID_DEFAULT;
-        charmap.face        = face;
+      charmap.encoding    = FT_ENCODING_NONE;
+      /* initial platform/encoding should indicate unset status? */
+      charmap.platform_id = TT_PLATFORM_APPLE_UNICODE;  /*Preliminary */
+      charmap.encoding_id = TT_APPLE_ID_DEFAULT;
+      charmap.face        = face;
 
-        error = FT_CMap_New( &gf_cmap_class, NULL, &charmap, NULL );
-
-        if ( error )
-          goto Fail;
-      }
+      error = FT_CMap_New( &gf_cmap_class, NULL, &charmap, NULL );
 
+      if ( error )
+        goto Fail;
+            printf("Hi I am here completed GF_Face_Init1\n");
+    }
+printf("Hi I am here6\n");
   Fail:
-    GF_Face_Done( gfface );
+  /*  GF_Face_Done( gfface ); */
 
   Exit:
+   printf("Hi I am here completed GF_Face_Init2 %ld\n",gfface->num_glyphs);
     return error;
   }
 
@@ -226,15 +263,14 @@
                    FT_ULong  strike_index )
   {
     GF_Face        face   = (GF_Face)size->face;
-
     FT_UNUSED( strike_index );
 
 
     FT_Select_Metrics( size->face, 0 );
 
-    size->metrics.ascender    = face->gf_glyph->font_bbx_xoff    * 64;
-    size->metrics.descender   = face->gf_glyph->font_bbx_yoff    * 64;
-    size->metrics.max_advance = face->gf_glyph->font_bbx_w       * 64;
+    size->metrics.ascender    = face->gf_glyph->font_bbx_xoff    * 64 ;
+    size->metrics.descender   = face->gf_glyph->font_bbx_yoff    * 64 ;
+    size->metrics.max_advance = face->gf_glyph->font_bbx_w       * 64 ;
 
     return FT_Err_Ok;
 
@@ -259,12 +295,10 @@
       if ( height == ( ( bsize->y_ppem + 32 ) >> 6 ) )
         error = FT_Err_Ok;
       break;
-
     case FT_SIZE_REQUEST_TYPE_REAL_DIM:
       if ( height == face->gf_glyph->font_bbx_h )  /* Preliminary */
         error = FT_Err_Ok;
       break;
-
     default:
       error = FT_THROW( Unimplemented_Feature );
       break;
@@ -289,10 +323,11 @@
     FT_Error     error  = FT_Err_Ok;
     FT_Bitmap*   bitmap = &slot->bitmap;
     GF_BitmapRec bm ;
+    GF_Glyph    go;
 
+    go = gf->gf_glyph;
     FT_UNUSED( load_flags );
 
-
     if ( !face )
     {
       error = FT_THROW( Invalid_Face_Handle );
@@ -307,22 +342,21 @@
 
     FT_TRACE1(( "GF_Glyph_Load: glyph index %d\n", glyph_index ));
 
-    #if 0
-    if ( glyph_index > 0 )
-      glyph_index--;
-    else
-      glyph_index = /*  */;
-    #endif
-
     if ( glyph_index < 0 )
       glyph_index = 0;
 
+    if ((glyph_index < go->code_min) || (go->code_max < glyph_index))
+    {
+      error = FT_THROW( Invalid_Argument );
+      goto Exit;
+    }
+
     /* slot, bitmap => freetype, glyph => gflib */
     bm = gf->gf_glyph->bm_table[glyph_index];
 
-    bitmap->rows  = bm.mv_y ; /* Prelimiary */
-    bitmap->width = bm.mv_x ; /* Prelimiary */
-    /* bitmap->pitch =  ; */
+    bitmap->rows  = bm.mv_y   ; /* Prelimiary */
+    bitmap->width = bm.mv_x   ; /* Prelimiary */
+    bitmap->pitch = bm.raster ; /* Prelimiary */
 
     /* note: we don't allocate a new array to hold the bitmap; */
     /*       we can simply point to it                         */
@@ -338,7 +372,7 @@
     slot->metrics.width        = (FT_Pos) ( bitmap->width * 64 )        ; /* 
Prelimiary */
     slot->metrics.height       = (FT_Pos) ( bitmap->rows * 64 )         ; /* 
Prelimiary */
 
-    ft_synthesize_vertical_metrics( &slot->metrics, bm.bbx_height * 64  );
+    ft_synthesize_vertical_metrics( &slot->metrics, bm.bbx_height * 64 );
 
   Exit:
     return error;
diff --git a/src/gf/gflib.c b/src/gf/gflib.c
index c44d518..bb4d17f 100644
--- a/src/gf/gflib.c
+++ b/src/gf/gflib.c
@@ -128,7 +128,6 @@ unsigned char   bit_table[] = {
       min_n = READ_INT4( stream );
       max_n = READ_INT4( stream );
       break;
-
     case GF_BOC1:
       FT_STREAM_SKIP( 1 );
       del_m = (INT4)READ_UINT1( stream );
@@ -138,7 +137,6 @@ unsigned char   bit_table[] = {
       min_m = max_m - del_m;
       min_n = max_n - del_n;
       break;
-
     default:
       return -1;
     }
@@ -447,30 +445,32 @@ unsigned char   bit_table[] = {
       {
         if (go->bm_table != NULL)
         {
-          for (i = 0; i < nchars; i++)
-            FT_FREE(go->bm_table[i].bitmap);
+          for (i = 0; i < nchars; i++){}
+            /* FT_FREE(go->bm_table[i].bitmap); */
         }
-        FT_FREE(go->bm_table);
+        /* FT_FREE(go->bm_table); */
       }
-      FT_FREE(go);
-      return NULL;
+      /* FT_FREE(go); */
   }
 
 
   FT_LOCAL_DEF( void )
-  gf_free_font( GF_Glyph  go, FT_Memory memory )
+  gf_free_font( FT_Face gfface, FT_Memory memory )
   {
-    int i=0, nchars =sizeof(go->bm_table);
+    GF_Face    gf = (GF_Face)gfface;
+    GF_Glyph   go;
+    go = gf->gf_glyph;
+    int i=0, nchars =gfface->num_glyphs;
     if (go != NULL)
     {
       if (go->bm_table != NULL)
       {
-        for (i = 0; i < nchars; i++)
-          FT_FREE(go->bm_table[i].bitmap);
+        for (i = 0; i < nchars; i++){}
+          /* FT_FREE(go->bm_table[i].bitmap); */
       }
-      FT_FREE(go->bm_table);
+      /* FT_FREE(go->bm_table); */
     }
-    FT_FREE(go);
+    /* FT_FREE(go); */
   }