A bug on TTC loading.

[Yamano-uchi, Hidetoshi]

Hello,

I tested FreeType2 from anon-CVS, but I have some troubles.

1) While opening TTF is ok, opening TTC is failed.
2) The test program, ftview, does not any sbit image.

I fixed the bug 1.  I changed two file 'tttags.h', but they are
identical and it should delete src/truetype/ttags.h.

On the other hand, the bug 2 have not fixed.  It seems the
sbit driver does not works well.

P.S.1
Also, ttDump.py does not work on (any??) TTC files.  

P.S.2
I wrote some (prototype) codes on FT2 for dump 'OS/2 version2' and 'pclt'.

------ Yamano-uchi, Hidetoshi

diff -ur /usr/local/work/freetype/freetype2/src/shared/tttags.h 
src/shared/tttags.h
--- /usr/local/work/freetype/freetype2/src/shared/tttags.h      Fri Jan  7 
23:07:21 2000
+++ src/shared/tttags.h Sat Mar 18 23:51:06 2000
@@ -52,6 +52,7 @@
 #define TTAG_VDMX  FT_MAKE_TAG( 'V', 'D', 'M', 'X' )
 #define TTAG_vhea  FT_MAKE_TAG( 'v', 'h', 'e', 'a' )
 #define TTAG_vmtx  FT_MAKE_TAG( 'v', 'm', 't', 'x' )
+#define TTAG_BASE  FT_MAKE_TAG( 'B', 'A', 'S', 'E' )
 
 
 #endif /* TTAGS_H */
diff -ur /usr/local/work/freetype/freetype2/src/truetype/ttobjs.c 
src/truetype/ttobjs.c
--- /usr/local/work/freetype/freetype2/src/truetype/ttobjs.c    Tue Mar 14 
02:01:55 2000
+++ src/truetype/ttobjs.c       Sat Mar 18 23:46:11 2000
@@ -203,7 +203,8 @@
     
     /* We must also be able to accept Mac/GX fonts, as well as OT ones */
     if ( format_tag != 0x00010000 &&    /* MS fonts  */
-         format_tag != TTAG_true  )     /* Mac fonts */
+         format_tag != TTAG_true  &&    /* Mac fonts */
+         format_tag != TTAG_BASE )      /* MS TrueType collection */
     {
       FT_TRACE2(( "[not a valid TTF font]" ));
       error = TT_Err_Invalid_File_Format;
diff -ur /usr/local/work/freetype/freetype2/src/truetype/tttags.h 
src/truetype/tttags.h
--- /usr/local/work/freetype/freetype2/src/truetype/tttags.h    Fri Dec 17 
08:11:37 1999
+++ src/truetype/tttags.h       Sat Mar 18 23:45:18 2000
@@ -52,6 +52,7 @@
 #define TTAG_VDMX  FT_MAKE_TAG( 'V', 'D', 'M', 'X' )
 #define TTAG_vhea  FT_MAKE_TAG( 'v', 'h', 'e', 'a' )
 #define TTAG_vmtx  FT_MAKE_TAG( 'v', 'm', 't', 'x' )
+#define TTAG_BASE  FT_MAKE_TAG( 'B', 'A', 'S', 'E' )
 
 
 #endif /* TTAGS_H */