[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[freetype2] parthw-cleaned b76b34e: [gf, pk] Modify `attach_file' functi
From: |
Parth Wazurkar |
Subject: |
[freetype2] parthw-cleaned b76b34e: [gf, pk] Modify `attach_file' function. |
Date: |
Wed, 8 Aug 2018 01:09:14 -0400 (EDT) |
branch: parthw-cleaned
commit b76b34ef5d77b7b67f497d671dd15763bc6ced6f
Author: Parth Wazurkar <address@hidden>
Commit: Parth Wazurkar <address@hidden>
[gf, pk] Modify `attach_file' function.
* src/gf/gfdrivr.c(TFM_Read_Metrics): Modify to accomodate changes
in the `tfm' module.
* src/pk/pkdrivr.c(TFM_Read_Metrics): Ditto.
---
src/gf/gfdrivr.c | 58 ++++++++++++++++++++++++++++++--------------------------
src/pk/pkdrivr.c | 57 +++++++++++++++++++++++++++++--------------------------
2 files changed, 61 insertions(+), 54 deletions(-)
diff --git a/src/gf/gfdrivr.c b/src/gf/gfdrivr.c
index 13a5717..acd7f40 100644
--- a/src/gf/gfdrivr.c
+++ b/src/gf/gfdrivr.c
@@ -481,40 +481,44 @@
FT_TRACE4(( "TFM_Read_Metrics: Invoking TFM_Service.\n" ));
tfm = (TFM_Service)face->tfm;
-
- /* Initialise TFM Service */
- error = tfm->init( &parser,
- memory,
- stream );
-
- if ( !error )
+ if ( tfm->tfm_parser_funcs )
{
- FT_TRACE4(( "TFM_Read_Metrics: Initialised tfm metric data.\n" ));
- parser.FontInfo = fi;
- parser.user_data = gf_glyph;
-
- error = tfm->parse_metrics( &parser );
- if( !error )
- FT_TRACE4(( "TFM_Read_Metrics: parsing TFM metric information done.\n"
));
-
- FT_TRACE6(( "TFM_Read_Metrics: TFM Metric Information:\n"
- " Check Sum : %ld\n"
- " Design Size: %ld\n"
- " Begin Char : %d\n"
- " End Char : %d\n"
- " font_bbx_w : %d\n"
- " font_bbx_h : %d\n"
- " slant : %d\n", parser.FontInfo->cs,
parser.FontInfo->design_size, parser.FontInfo->begin_char,
-
parser.FontInfo->end_char, parser.FontInfo->font_bbx_w,
-
parser.FontInfo->font_bbx_h, parser.FontInfo->slant ));
- tfm->done( &parser );
+ /* Initialise TFM Service */
+ error = tfm->tfm_parser_funcs->init( &parser,
+ memory,
+ stream );
+
+ if ( !error )
+ {
+ FT_TRACE4(( "TFM_Read_Metrics: Initialised tfm metric data.\n" ));
+ parser.FontInfo = fi;
+ parser.user_data = gf_glyph;
+
+ error = tfm->tfm_parser_funcs->parse_metrics( &parser );
+ if( !error )
+ FT_TRACE4(( "TFM_Read_Metrics: parsing TFM metric information
done.\n" ));
+
+ FT_TRACE6(( "TFM_Read_Metrics: TFM Metric Information:\n"
+ " Check Sum : %ld\n"
+ " Design Size: %ld\n"
+ " Begin Char : %d\n"
+ " End Char : %d\n"
+ " font_bbx_w : %d\n"
+ " font_bbx_h : %d\n"
+ " slant : %d\n",
parser.FontInfo->cs, parser.FontInfo->design_size, parser.FontInfo->begin_char,
+
parser.FontInfo->end_char, parser.FontInfo->font_bbx_w,
+
parser.FontInfo->font_bbx_h, parser.FontInfo->slant ));
+ tfm->tfm_parser_funcs->done( &parser );
+ }
}
if ( !error )
{
+ printf("Hi I reached here\n");
/* Modify GF_Glyph data according to TFM metric values */
- /*face->gf_glyph->font_bbx_w = fi->font_bbx_w;
+ /*
+ face->gf_glyph->font_bbx_w = fi->font_bbx_w;
face->gf_glyph->font_bbx_h = fi->font_bbx_h;
*/
diff --git a/src/pk/pkdrivr.c b/src/pk/pkdrivr.c
index a5bc639..386bbf1 100644
--- a/src/pk/pkdrivr.c
+++ b/src/pk/pkdrivr.c
@@ -481,40 +481,43 @@
FT_TRACE4(( "TFM_Read_Metrics: Invoking TFM_Service.\n" ));
tfm = (TFM_Service)face->tfm;
-
- /* Initialise TFM Service */
- error = tfm->init( &parser,
- memory,
- stream );
-
- if ( !error )
+ if ( tfm->tfm_parser_funcs )
{
- FT_TRACE4(( "TFM_Read_Metrics: Initialised tfm metric data.\n" ));
- parser.FontInfo = fi;
- parser.user_data = pk_glyph;
-
- error = tfm->parse_metrics( &parser );
- if( !error )
- FT_TRACE4(( "TFM_Read_Metrics: parsing TFM metric information done.\n"
));
-
- FT_TRACE6(( "TFM_Read_Metrics: TFM Metric Information:\n"
- " Check Sum : %ld\n"
- " Design Size: %ld\n"
- " Begin Char : %d\n"
- " End Char : %d\n"
- " font_bbx_w : %d\n"
- " font_bbx_h : %d\n"
- " slant : %d\n", parser.FontInfo->cs,
parser.FontInfo->design_size, parser.FontInfo->begin_char,
-
parser.FontInfo->end_char, parser.FontInfo->font_bbx_w,
-
parser.FontInfo->font_bbx_h, parser.FontInfo->slant ));
- tfm->done( &parser );
+ /* Initialise TFM Service */
+ error = tfm->tfm_parser_funcs->init( &parser,
+ memory,
+ stream );
+
+ if ( !error )
+ {
+ FT_TRACE4(( "TFM_Read_Metrics: Initialised tfm metric data.\n" ));
+ parser.FontInfo = fi;
+ parser.user_data = pk_glyph;
+
+ error = tfm->tfm_parser_funcs->parse_metrics( &parser );
+ if( !error )
+ FT_TRACE4(( "TFM_Read_Metrics: parsing TFM metric information
done.\n" ));
+
+ FT_TRACE6(( "TFM_Read_Metrics: TFM Metric Information:\n"
+ " Check Sum : %ld\n"
+ " Design Size: %ld\n"
+ " Begin Char : %d\n"
+ " End Char : %d\n"
+ " font_bbx_w : %d\n"
+ " font_bbx_h : %d\n"
+ " slant : %d\n",
parser.FontInfo->cs, parser.FontInfo->design_size, parser.FontInfo->begin_char,
+
parser.FontInfo->end_char, parser.FontInfo->font_bbx_w,
+
parser.FontInfo->font_bbx_h, parser.FontInfo->slant ));
+ tfm->tfm_parser_funcs->done( &parser );
+ }
}
if ( !error )
{
/* Modify PK_Glyph data according to TFM metric values */
- /*face->pk_glyph->font_bbx_w = fi->font_bbx_w;
+ /*
+ face->pk_glyph->font_bbx_w = fi->font_bbx_w;
face->pk_glyph->font_bbx_h = fi->font_bbx_h;
*/
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [freetype2] parthw-cleaned b76b34e: [gf, pk] Modify `attach_file' function.,
Parth Wazurkar <=