Commit 2cefb52fc883921c73780ab9b638dfaa4c37d08a
2005-03-26T10:27:09
* src/autofit/afglobal.c (af_face_globals_get_metrics): s/index/gidx/. * src/sfnt/ttsbit0.c (tt_sbit_decoder_load_image): Fix compiler warnings. * src/sfnt/rules.mk (SFNT_DRV_SRC): Add ttsbit0.c. * src/sfnt/ttsbit0.h: Dummy file for build with `make'.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82
diff --git a/ChangeLog b/ChangeLog
index 8e751b5..64b7d33 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2005-03-26 Werner Lemberg <wl@gnu.org>
+
+ * src/autofit/afglobal.c (af_face_globals_get_metrics):
+ s/index/gidx/.
+
+ * src/sfnt/ttsbit0.c (tt_sbit_decoder_load_image): Fix compiler
+ warnings.
+
+ * src/sfnt/rules.mk (SFNT_DRV_SRC): Add ttsbit0.c.
+
+ * src/sfnt/ttsbit0.h: Dummy file for build with `make'.
+
2005-03-26 Detlef Würkner <TetiSoft@apg.lahn.de>
Update of the Amiga port.
diff --git a/src/autofit/afglobal.c b/src/autofit/afglobal.c
index 640cf79..e28673b 100644
--- a/src/autofit/afglobal.c
+++ b/src/autofit/afglobal.c
@@ -218,7 +218,7 @@
AF_ScriptMetrics *ametrics )
{
AF_ScriptMetrics metrics = NULL;
- FT_UInt index;
+ FT_UInt gidx;
AF_ScriptClass clazz;
FT_Error error = AF_Err_Ok;
@@ -229,8 +229,8 @@
goto Exit;
}
- index = globals->glyph_scripts[gindex];
- clazz = af_script_classes[index];
+ gidx = globals->glyph_scripts[gindex];
+ clazz = af_script_classes[gidx];
metrics = globals->metrics[clazz->script];
if ( metrics == NULL )
{
diff --git a/src/sfnt/rules.mk b/src/sfnt/rules.mk
index e15681b..f2f1c4a 100644
--- a/src/sfnt/rules.mk
+++ b/src/sfnt/rules.mk
@@ -28,6 +28,7 @@ SFNT_COMPILE := $(FT_COMPILE) $I$(subst /,$(COMPILER_SEP),$(SFNT_DIR))
SFNT_DRV_SRC := $(SFNT_DIR)/ttload.c \
$(SFNT_DIR)/ttcmap.c \
$(SFNT_DIR)/ttsbit.c \
+ $(SFNT_DIR)/ttsbit0.c \
$(SFNT_DIR)/ttpost.c \
$(SFNT_DIR)/ttkern.c \
$(SFNT_DIR)/sfobjs.c \
diff --git a/src/sfnt/ttsbit0.c b/src/sfnt/ttsbit0.c
index 81ec937..5999459 100644
--- a/src/sfnt/ttsbit0.c
+++ b/src/sfnt/ttsbit0.c
@@ -772,7 +772,7 @@
FT_Byte* p_limit = decoder->eblc_limit;
FT_ULong num_ranges = decoder->strike_index_count;
FT_UInt start, end, index_format, image_format;
- FT_ULong image_start, image_end, image_offset;
+ FT_ULong image_start = 0, image_end = 0, image_offset;
if ( p + 8 * num_ranges > p_limit )
diff --git a/src/sfnt/ttsbit0.h b/src/sfnt/ttsbit0.h
new file mode 100644
index 0000000..396ddc5
--- /dev/null
+++ b/src/sfnt/ttsbit0.h
@@ -0,0 +1,7 @@
+/*
+ * ttsbit0.h
+ *
+ * This is a dummy file, used to please the build system. It is never
+ * included by the sfnt sources.
+ *
+ */