From a407abf65f38163358874c1e8c21409cd1199381 Mon Sep 17 00:00:00 2001
From: Werner Lemberg <wl@gnu.org>
Date: Sat, 26 Mar 2005 10:27:09 +0000
Subject: [PATCH] * 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'.
---
 ChangeLog              | 12 ++++++++++++
 src/autofit/afglobal.c |  6 +++---
 src/sfnt/rules.mk      |  1 +
 src/sfnt/ttsbit0.c     |  2 +-
 src/sfnt/ttsbit0.h     |  7 +++++++
 5 files changed, 24 insertions(+), 4 deletions(-)
 create mode 100644 src/sfnt/ttsbit0.h

diff --git a/ChangeLog b/ChangeLog
index 8e751b558..64b7d335c 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 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.
+ *
+ */