* 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'.
This commit is contained in:
parent
4a80d05e51
commit
2cefb52fc8
12
ChangeLog
12
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>
|
2005-03-26 Detlef Würkner <TetiSoft@apg.lahn.de>
|
||||||
|
|
||||||
Update of the Amiga port.
|
Update of the Amiga port.
|
||||||
|
|
|
@ -218,7 +218,7 @@
|
||||||
AF_ScriptMetrics *ametrics )
|
AF_ScriptMetrics *ametrics )
|
||||||
{
|
{
|
||||||
AF_ScriptMetrics metrics = NULL;
|
AF_ScriptMetrics metrics = NULL;
|
||||||
FT_UInt index;
|
FT_UInt gidx;
|
||||||
AF_ScriptClass clazz;
|
AF_ScriptClass clazz;
|
||||||
FT_Error error = AF_Err_Ok;
|
FT_Error error = AF_Err_Ok;
|
||||||
|
|
||||||
|
@ -229,8 +229,8 @@
|
||||||
goto Exit;
|
goto Exit;
|
||||||
}
|
}
|
||||||
|
|
||||||
index = globals->glyph_scripts[gindex];
|
gidx = globals->glyph_scripts[gindex];
|
||||||
clazz = af_script_classes[index];
|
clazz = af_script_classes[gidx];
|
||||||
metrics = globals->metrics[clazz->script];
|
metrics = globals->metrics[clazz->script];
|
||||||
if ( metrics == NULL )
|
if ( metrics == NULL )
|
||||||
{
|
{
|
||||||
|
|
|
@ -28,6 +28,7 @@ SFNT_COMPILE := $(FT_COMPILE) $I$(subst /,$(COMPILER_SEP),$(SFNT_DIR))
|
||||||
SFNT_DRV_SRC := $(SFNT_DIR)/ttload.c \
|
SFNT_DRV_SRC := $(SFNT_DIR)/ttload.c \
|
||||||
$(SFNT_DIR)/ttcmap.c \
|
$(SFNT_DIR)/ttcmap.c \
|
||||||
$(SFNT_DIR)/ttsbit.c \
|
$(SFNT_DIR)/ttsbit.c \
|
||||||
|
$(SFNT_DIR)/ttsbit0.c \
|
||||||
$(SFNT_DIR)/ttpost.c \
|
$(SFNT_DIR)/ttpost.c \
|
||||||
$(SFNT_DIR)/ttkern.c \
|
$(SFNT_DIR)/ttkern.c \
|
||||||
$(SFNT_DIR)/sfobjs.c \
|
$(SFNT_DIR)/sfobjs.c \
|
||||||
|
|
|
@ -772,7 +772,7 @@
|
||||||
FT_Byte* p_limit = decoder->eblc_limit;
|
FT_Byte* p_limit = decoder->eblc_limit;
|
||||||
FT_ULong num_ranges = decoder->strike_index_count;
|
FT_ULong num_ranges = decoder->strike_index_count;
|
||||||
FT_UInt start, end, index_format, image_format;
|
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 )
|
if ( p + 8 * num_ranges > p_limit )
|
||||||
|
|
|
@ -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.
|
||||||
|
*
|
||||||
|
*/
|
Loading…
Reference in New Issue