commit 8c16ed361caf08cf4614378c3a0bf53a0b53ee4e
author David Turner <david@freetype.org> Thu Jan 19 13:10:49 2006 +0000
committer David Turner <david@freetype.org> Thu Jan 19 13:10:49 2006 +0000
tree 06ab7d46359d4dac7f4f53bf0d131dee75f08b7a
parent 8b560632d7434a18dcc2639e3173fa653a4c0e6b

    * src/sfnt/ttsbit0.c (tt_face_load_strike_metrics): fixed small
    bug that prevented compilation when FT_OPTIMIZE_MEMORY is defined

ChangeLog

diff --git a/ChangeLog b/ChangeLog
index bae1a2a..e77a3f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-19  David Turner  <david@freetype.org>
+
+    * src/sfnt/ttsbit0.c (tt_face_load_strike_metrics): fixed small
+    bug that prevented compilation when FT_OPTIMIZE_MEMORY is defined
+
 2006-01-19  Brian Weed  <bw@imaginengine.com>
 
 	* builds/win32/visualc/freetype.dsp: Updated.

src/sfnt/ttsbit0.c

diff --git a/src/sfnt/ttsbit0.c b/src/sfnt/ttsbit0.c
index 8645f37..78b55c8 100644
--- a/src/sfnt/ttsbit0.c
+++ b/src/sfnt/ttsbit0.c
@@ -221,9 +221,13 @@
   {
     FT_Byte*  strike;
     
-
+#ifdef FT_OPTIMIZE_MEMORY
+    if ( strike_index >= (FT_ULong)face->sbit_num_strikes )
+      return SFNT_Err_Invalid_Argument;
+#else
     if ( strike_index >= (FT_ULong)face->num_sbit_strikes )
       return SFNT_Err_Invalid_Argument;
+#endif
 
     strike = face->sbit_table + 8 + strike_index * 48;