diff options
| author | Werner Lemberg <wl@gnu.org> | 2005-03-26 10:27:09 +0000 |
|---|---|---|
| committer | Werner Lemberg <wl@gnu.org> | 2005-03-26 10:27:09 +0000 |
| commit | a407abf65f38163358874c1e8c21409cd1199381 (patch) | |
| tree | c639aa1d3917be1a5d190aaea1810030714e46e4 | |
| parent | fd091038db5bfa9c04304bf6bf6d1cfe208b069d (diff) | |
| download | freetype2-a407abf65f38163358874c1e8c21409cd1199381.tar.gz | |
* 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'.
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | src/autofit/afglobal.c | 6 | ||||
| -rw-r--r-- | src/sfnt/rules.mk | 1 | ||||
| -rw-r--r-- | src/sfnt/ttsbit0.c | 2 | ||||
| -rw-r--r-- | src/sfnt/ttsbit0.h | 7 |
5 files changed, 24 insertions, 4 deletions
@@ -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 640cf7929..e28673bb7 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 e15681b21..f2f1c4a1f 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 81ec937e3..599945983 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 000000000..396ddc555 --- /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. + * + */ |