Changeset 20 for trunk/src/kernel/qfontengine_pm.cpp

Timestamp:

Nov 17, 2005, 7:00:27 PM (20 years ago)

Author:

dmik

Message:

Fixed a bunch of compiler warnings

File:

• trunk/src/kernel/qfontengine_pm.cpp (modified) (1 diff)

trunk/src/kernel/qfontengine_pm.cpp

@@ -957 +957 @@
 
 /// @todo (dmik) need this all?
-//#define MAKE_TAG(ch1, ch2, ch3, ch4) (\
-//    (((DWORD)(ch4)) << 24) | \
-//    (((DWORD)(ch3)) << 16) | \
-//    (((DWORD)(ch2)) << 8) | \
-//    ((DWORD)(ch1)) \
-//    )
-//
-//static inline Q_UINT32 getUInt(unsigned char *p)
-//{
-//    Q_UINT32 val;
-//    val = *p++ << 24;
-//    val |= *p++ << 16;
-//    val |= *p++ << 8;
-//    val |= *p;
-//
-//    return val;
-//}
-//
-//static inline Q_UINT16 getUShort(unsigned char *p)
-//{
-//    Q_UINT16 val;
-//    val = *p++ << 8;
-//    val |= *p;
-//
-//    return val;
-//}
-//
-//static inline void tag_to_string( char *string, Q_UINT32 tag )
-//{
-//    string[0] = (tag >> 24)&0xff;
-//    string[1] = (tag >> 16)&0xff;
-//    string[2] = (tag >> 8)&0xff;
-//    string[3] = tag&0xff;
-//    string[4] = 0;
-//}
-//
-//static Q_UINT16 getGlyphIndex( unsigned char *table, unsigned short unicode )
-//{
-//    unsigned short format = getUShort( table );
-//    if ( format == 0 ) {
-//      if ( unicode < 256 )
-//          return (int) *(table+6+unicode);
-//    } else if ( format == 2 ) {
-//      qWarning("format 2 encoding table for Unicode, not implemented!");
-//    } else if ( format == 4 ) {
-//      Q_UINT16 segCountX2 = getUShort( table + 6 );
-//      unsigned char *ends = table + 14;
-//      Q_UINT16 endIndex = 0;
-//      int i = 0;
-//      for ( ; i < segCountX2/2 && (endIndex = getUShort( ends + 2*i )) < unicode; i++ );
-//
-//      unsigned char *idx = ends + segCountX2 + 2 + 2*i;
-//      Q_UINT16 startIndex = getUShort( idx );
-//
-//      if ( startIndex > unicode )
-//          return 0;
-//
-//      idx += segCountX2;
-//      Q_INT16 idDelta = (Q_INT16)getUShort( idx );
-//      idx += segCountX2;
-//      Q_UINT16 idRangeoffset_t = (Q_UINT16)getUShort( idx );
-//
-//      Q_UINT16 glyphIndex;
-//      if ( idRangeoffset_t ) {
-//          Q_UINT16 id = getUShort( idRangeoffset_t + 2*(unicode - startIndex) + idx);
-//          if ( id )
-//              glyphIndex = ( idDelta + id ) % 0x10000;
-//          else
-//              glyphIndex = 0;
-//      } else {
-//          glyphIndex = (idDelta + unicode) % 0x10000;
-//      }
-//      return glyphIndex;
-//    }
-//
-//    return 0;
-//}
-//
-//
-//static unsigned char *getCMap( HDC hdc, bool &symbol )
-//{
-//    const DWORD CMAP = MAKE_TAG( 'c', 'm', 'a', 'p' );
-//
-//    unsigned char header[4];
-//
-//    // get the CMAP header and the number of encoding tables
-//    DWORD bytes =
-//#ifndef Q_OS_TEMP
-//      GetFontData( hdc, CMAP, 0, &header, 4 );
-//#else
-//      0;
-//#endif
-//    if ( bytes == GDI_ERROR )
-//      return 0;
-//    unsigned short version = getUShort( header );
-//    if ( version != 0 )
-//      return 0;
-//
-//    unsigned short numTables = getUShort( header+2);
-//    unsigned char *maps = new unsigned char[8*numTables];
-//
-//    // get the encoding table and look for Unicode
-//#ifndef Q_OS_TEMP
-//    bytes = GetFontData( hdc, CMAP, 4, maps, 8*numTables );
-//#endif
-//    if ( bytes == GDI_ERROR )
-//      return 0;
-//
-//    symbol = TRUE;
-//    unsigned int unicode_table = 0;
-//    for ( int n = 0; n < numTables; n++ ) {
-//      Q_UINT32 version = getUInt( maps + 8*n );
-//      // accept both symbol and Unicode encodings. prefer unicode.
-//      if ( version == 0x00030001 || version == 0x00030000 ) {
-//          unicode_table = getUInt( maps + 8*n + 4 );
-//          if ( version == 0x00030001 ) {
-//              symbol = FALSE;
-//              break;
-//          }
-//      }
-//    }
-//
-//    if ( !unicode_table ) {
-//      // qDebug("no unicode table found" );
-//      return 0;
-//    }
-//
-//    delete [] maps;
-//
-//    // get the header of the unicode table
-//#ifndef Q_OS_TEMP
-//    bytes = GetFontData( hdc, CMAP, unicode_table, &header, 4 );
-//#endif
-//    if ( bytes == GDI_ERROR )
-//      return 0;
-//
-//    unsigned short length = getUShort( header+2 );
-//    unsigned char *unicode_data = new unsigned char[length];
-//
-//    // get the cmap table itself
-//#ifndef Q_OS_TEMP
-//    bytes = GetFontData( hdc, CMAP, unicode_table, unicode_data, length );
-//#endif
-//    if ( bytes == GDI_ERROR ) {
-//      delete [] unicode_data;
-//      return 0;
-//    }
-//    return unicode_data;
-//}
-
-
-
+#if 0
+#define MAKE_TAG(ch1, ch2, ch3, ch4) (\
+    (((DWORD)(ch4)) << 24) | \
+    (((DWORD)(ch3)) << 16) | \
+    (((DWORD)(ch2)) << 8) | \
+    ((DWORD)(ch1)) \
+    )
+
+static inline Q_UINT32 getUInt(unsigned char *p)
+{
+    Q_UINT32 val;
+    val = *p++ << 24;
+    val |= *p++ << 16;
+    val |= *p++ << 8;
+    val |= *p;
+
+    return val;
+}
+
+static inline Q_UINT16 getUShort(unsigned char *p)
+{
+    Q_UINT16 val;
+    val = *p++ << 8;
+    val |= *p;
+
+    return val;
+}
+
+static inline void tag_to_string( char *string, Q_UINT32 tag )
+{
+    string[0] = (tag >> 24)&0xff;
+    string[1] = (tag >> 16)&0xff;
+    string[2] = (tag >> 8)&0xff;
+    string[3] = tag&0xff;
+    string[4] = 0;
+}
+
+static Q_UINT16 getGlyphIndex( unsigned char *table, unsigned short unicode )
+{
+    unsigned short format = getUShort( table );
+    if ( format == 0 ) {
+        if ( unicode < 256 )
+            return (int) *(table+6+unicode);
+    } else if ( format == 2 ) {
+        qWarning("format 2 encoding table for Unicode, not implemented!");
+    } else if ( format == 4 ) {
+        Q_UINT16 segCountX2 = getUShort( table + 6 );
+        unsigned char *ends = table + 14;
+        Q_UINT16 endIndex = 0;
+        int i = 0;
+        for ( ; i < segCountX2/2 && (endIndex = getUShort( ends + 2*i )) < unicode; i++ );
+
+        unsigned char *idx = ends + segCountX2 + 2 + 2*i;
+        Q_UINT16 startIndex = getUShort( idx );
+
+        if ( startIndex > unicode )
+            return 0;
+
+        idx += segCountX2;
+        Q_INT16 idDelta = (Q_INT16)getUShort( idx );
+        idx += segCountX2;
+        Q_UINT16 idRangeoffset_t = (Q_UINT16)getUShort( idx );
+
+        Q_UINT16 glyphIndex;
+        if ( idRangeoffset_t ) {
+            Q_UINT16 id = getUShort( idRangeoffset_t + 2*(unicode - startIndex) + idx);
+            if ( id )
+                glyphIndex = ( idDelta + id ) % 0x10000;
+            else
+                glyphIndex = 0;
+        } else {
+            glyphIndex = (idDelta + unicode) % 0x10000;
+        }
+        return glyphIndex;
+    }
+
+    return 0;
+}
+
+
+static unsigned char *getCMap( HDC hdc, bool &symbol )
+{
+    const DWORD CMAP = MAKE_TAG( 'c', 'm', 'a', 'p' );
+
+    unsigned char header[4];
+
+    // get the CMAP header and the number of encoding tables
+    DWORD bytes =
+#ifndef Q_OS_TEMP
+        GetFontData( hdc, CMAP, 0, &header, 4 );
+#else
+        0;
+#endif
+    if ( bytes == GDI_ERROR )
+        return 0;
+    unsigned short version = getUShort( header );
+    if ( version != 0 )
+        return 0;
+
+    unsigned short numTables = getUShort( header+2);
+    unsigned char *maps = new unsigned char[8*numTables];
+
+    // get the encoding table and look for Unicode
+#ifndef Q_OS_TEMP
+    bytes = GetFontData( hdc, CMAP, 4, maps, 8*numTables );
+#endif
+    if ( bytes == GDI_ERROR )
+        return 0;
+
+    symbol = TRUE;
+    unsigned int unicode_table = 0;
+    for ( int n = 0; n < numTables; n++ ) {
+        Q_UINT32 version = getUInt( maps + 8*n );
+        // accept both symbol and Unicode encodings. prefer unicode.
+        if ( version == 0x00030001 || version == 0x00030000 ) {
+            unicode_table = getUInt( maps + 8*n + 4 );
+            if ( version == 0x00030001 ) {
+                symbol = FALSE;
+                break;
+            }
+        }
+    }
+
+    if ( !unicode_table ) {
+        // qDebug("no unicode table found" );
+        return 0;
+    }
+
+    delete [] maps;
+
+    // get the header of the unicode table
+#ifndef Q_OS_TEMP
+    bytes = GetFontData( hdc, CMAP, unicode_table, &header, 4 );
+#endif
+    if ( bytes == GDI_ERROR )
+        return 0;
+
+    unsigned short length = getUShort( header+2 );
+    unsigned char *unicode_data = new unsigned char[length];
+
+    // get the cmap table itself
+#ifndef Q_OS_TEMP
+    bytes = GetFontData( hdc, CMAP, unicode_table, unicode_data, length );
+#endif
+    if ( bytes == GDI_ERROR ) {
+        delete [] unicode_data;
+        return 0;
+    }
+    return unicode_data;
+}
+#endif // if 0
+
+