[ft-cvs] ft2demos ChangeLog src/ftcommon.c

[Werner LEMBERG]

CVSROOT:        /cvsroot/freetype
Module name:    ft2demos
Changes by:     Werner LEMBERG <wl>     06/06/09 08:20:52

Modified files:
        .              : ChangeLog 
        src            : ftcommon.c 

Log message:
        * src/ftcommon.c (FTDemo_Install_Font): Fix index range for MS
        Symbol.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ft2demos/ChangeLog?cvsroot=freetype&r1=1.163&r2=1.164
http://cvs.savannah.gnu.org/viewcvs/ft2demos/src/ftcommon.c?cvsroot=freetype&r1=1.16&r2=1.17

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/freetype/ft2demos/ChangeLog,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -b -r1.163 -r1.164
--- ChangeLog   8 Jun 2006 07:38:06 -0000       1.163
+++ ChangeLog   9 Jun 2006 08:20:51 -0000       1.164
@@ -1,3 +1,8 @@
+2006-06-09  Werner Lemberg  <address@hidden>
+
+       * src/ftcommon.c (FTDemo_Install_Font): Fix index range for MS
+       Symbol.
+
 2006-06-07  Werner Lemberg  <address@hidden>
 
        * src/ftcommon.c (FTDemo_Display_Done, FTDemo_Done): Protect against

Index: src/ftcommon.c
===================================================================
RCS file: /cvsroot/freetype/ft2demos/src/ftcommon.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- src/ftcommon.c      8 Jun 2006 07:38:06 -0000       1.16
+++ src/ftcommon.c      9 Jun 2006 08:20:51 -0000       1.17
@@ -472,7 +472,6 @@
         font->num_indices = 0x110000L;
         break;
 
-      case FT_ENCODING_MS_SYMBOL:
       case FT_ENCODING_ADOBE_LATIN_1:
       case FT_ENCODING_ADOBE_STANDARD:
       case FT_ENCODING_ADOBE_EXPERT:
@@ -481,6 +480,10 @@
         font->num_indices = 0x100L;
         break;
 
+        /* some fonts use range 0x00-0x100, others have 0xF000-0xF0FF */
+      case FT_ENCODING_MS_SYMBOL:
+        font->num_indices = 0x10000L;
+
       default:
         font->num_indices = 0x10000L;
       }