[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[freetype2] parthw-pk-vf 2f4885f 3/3: [vf] Minor.
From: |
Parth Wazurkar |
Subject: |
[freetype2] parthw-pk-vf 2f4885f 3/3: [vf] Minor. |
Date: |
Wed, 5 Dec 2018 13:42:41 -0500 (EST) |
branch: parthw-pk-vf
commit 2f4885f8a6e7e15f14d55a8c9c8b4b4a0a311918
Author: atharvaw <address@hidden>
Commit: atharvaw <address@hidden>
[vf] Minor.
---
src/vf/vfdrivr.c | 8 +++---
src/vf/vfdrivr.h | 86 ++++++++++++++++++++++++++++----------------------------
2 files changed, 47 insertions(+), 47 deletions(-)
diff --git a/src/vf/vfdrivr.c b/src/vf/vfdrivr.c
index 2a41e94..56ab9b3 100644
--- a/src/vf/vfdrivr.c
+++ b/src/vf/vfdrivr.c
@@ -55,8 +55,8 @@
VF_Face face = (VF_Face)FT_CMAP_FACE( cmap );
FT_UNUSED( init_data );
- cmap->bc = ;
- cmap->ec = ;
+ cmap->bc = 0;
+ cmap->ec = 255;/* TO-DO */
return FT_Err_Ok;
}
@@ -185,11 +185,11 @@
0x10000L,
0x20000L,
- NULL,
/* module-specific interface */
+ NULL, /* module-specific interface */
NULL, /* FT_Module_Constructor module_init */
NULL, /* FT_Module_Destructor module_done */
- NULL
/* FT_Module_Requester get_interface */
+ NULL /* FT_Module_Requester get_interface */
},
sizeof ( VF_FaceRec ),
diff --git a/src/vf/vfdrivr.h b/src/vf/vfdrivr.h
index 35e4926..78b318c 100644
--- a/src/vf/vfdrivr.h
+++ b/src/vf/vfdrivr.h
@@ -37,74 +37,74 @@ FT_BEGIN_HEADER
} VF_BitmapRec, *VF_Bitmap;
+
+ typedef struct TFM_Rec_
+ {
+ /* Font Info */
+ FT_ULong cs;
+ /* Metrics */
+ FT_ULong ds;
+ FT_ULong design_size;
+ FT_ULong slant;
+ unsigned int begin_char, end_char;
+ FT_Long *width, *height, *depth;
+ /* Font bounding box */
+ FT_ULong font_bbx_w, font_bbx_h;
+ FT_ULong font_bbx_xoff, font_bbx_yoff;
+
+ } TFM_Rec, *TFM;
+
typedef struct VF_Rec_
{
- char *vf_path;
- UINT4 cs;
- UINT4 ds;
- double design_size;
- double point_size;
- double dpi_x, dpi_y;
- double mag_x, mag_y;
+ FT_Char *vf_path;
+ FT_ULong cs;
+ FT_ULong ds;
+ FT_ULong design_size;
+ FT_ULong point_size;
+ FT_ULong dpi_x, dpi_y;
+ FT_ULong mag_x, mag_y;
/* TFM */
- char *tfm_path;
- TFM tfm;
+ FT_Char *tfm_path;
+ TFM tfm;
/* subfotns */
struct s_vf_subfont *subfonts;
- int subfonts_opened;
- int default_subfont;
+ FT_Int subfonts_opened;
+ FT_Int default_subfont;
/* file offset to character packets (offset in vf file) */
- long offs_char_packet;
+ FT_Long offs_char_packet;
}VF_Rec, *VF;
typedef struct s_vf_char_packet
{
- UINT4 pl;
- UINT4 cc;
- UINT4 tfm;
- unsigned char *dvi;
- }s_vf_char_packet *VF_CHAR_PACKET;
+ FT_ULong pl;
+ FT_ULong cc;
+ FT_ULong tfm;
+ FT_Byte *dvi;
+ }s_vf_char_packet, *VF_CHAR_PACKET;
typedef struct s_vf_char_packet_tbl
{
int npackets;
VF_CHAR_PACKET packets;
- }s_vf_char_packet_tbl *VF_CHAR_PACKET_TBL;
+ }s_vf_char_packet_tbl, *VF_CHAR_PACKET_TBL;
typedef struct s_vf_subfont
{
- UINT4 k;
- UINT4 s;
- UINT4 d;
- UINT4 a;
- UINT4 l;
- char *n;
- int font_id; /* font id in VFlib */
+ FT_ULong k;
+ FT_ULong s;
+ FT_ULong d;
+ FT_ULong a;
+ FT_ULong l;
+ char *n;
struct s_vf_subfont *next;
- }s_vf_subfont *VF_SUBFONT;
+ }s_vf_subfont, *VF_SUBFONT;
- typedef struct TFM_Rec_
- {
- /* Font Info */
- int type_aux; /* METRIC_TYPE_AUX_xxx */
- UINT4 cs;
- /* Metrics */
- UINT4 ds;
- double design_size;
- double slant;
- unsigned int begin_char, end_char;
- INT4 *width, *height, *depth;
- /* Font bounding box */
- double font_bbx_w, font_bbx_h;
- double font_bbx_xoff, font_bbx_yoff;
-
- } TFM_Rec, *TFM;
struct s_vf_dvi_stack
{
long h, v, w, x, y, z;
int f;
- int font_id;
+ int font_id;
struct s_vf_dvi_stack *next;
};
typedef struct s_vf_dvi_stack *VF_DVI_STACK;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [freetype2] parthw-pk-vf 2f4885f 3/3: [vf] Minor.,
Parth Wazurkar <=