From 2179bf347cb673cca8bb356443a969613407cf68 Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Sun, 18 Aug 2002 07:15:52 +0000 Subject: [PATCH] Adding some comments. --- include/freetype/freetype.h | 8 ++++++++ include/freetype/ftimage.h | 9 +++++++++ include/freetype/fttypes.h | 4 ++++ src/sfnt/ttload.c | 4 ++-- 4 files changed, 23 insertions(+), 2 deletions(-) diff --git a/include/freetype/freetype.h b/include/freetype/freetype.h index fb1448ee4..4804c89dd 100644 --- a/include/freetype/freetype.h +++ b/include/freetype/freetype.h @@ -398,6 +398,14 @@ FT_BEGIN_HEADER /* This macro converts four letter tags into an unsigned long. It is */ /* used to define "encoding" identifiers (see @FT_Encoding). */ /* */ + /* */ + /* Since many 16bit compilers don't like 32bit enumerations, you */ + /* should redefine this macro in case of problems to something like */ + /* this: */ + /* */ + /* #define FT_ENC_TAG( value, _x1, _x2, _x3, _x4 ) (value) */ + /* */ + /* to get a simple enumeration without assigning special numbers. */ /* */ #ifndef FT_ENC_TAG #define FT_ENC_TAG( value, _x1, _x2, _x3, _x4 ) \ diff --git a/include/freetype/ftimage.h b/include/freetype/ftimage.h index 007e2d177..97202183e 100644 --- a/include/freetype/ftimage.h +++ b/include/freetype/ftimage.h @@ -580,6 +580,15 @@ FT_BEGIN_HEADER /* */ /* This macro converts four letter tags into an unsigned long. */ /* */ + /* */ + /* Since many 16bit compilers don't like 32bit enumerations, you */ + /* should redefine this macro in case of problems to something like */ + /* this: */ + /* */ + /* #define FT_IMAGE_TAG( value, _x1, _x2, _x3, _x4 ) (value) */ + /* */ + /* to get a simple enumeration without assigning special numbers. */ + /* */ #ifndef FT_IMAGE_TAG #define FT_IMAGE_TAG( value, _x1, _x2, _x3, _x4 ) \ value = ( ( (unsigned long)_x1 << 24 ) | \ diff --git a/include/freetype/fttypes.h b/include/freetype/fttypes.h index 396a0365a..2782f74d5 100644 --- a/include/freetype/fttypes.h +++ b/include/freetype/fttypes.h @@ -440,6 +440,10 @@ FT_BEGIN_HEADER /* This macro converts four letter tags which are used to label */ /* TrueType tables into an unsigned long to be used within FreeType. */ /* */ + /* */ + /* The produced values *must* be 32bit integers. Don't redefine this */ + /* macro. */ + /* */ #define FT_MAKE_TAG( _x1, _x2, _x3, _x4 ) \ ( ( (FT_ULong)_x1 << 24 ) | \ ( (FT_ULong)_x2 << 16 ) | \ diff --git a/src/sfnt/ttload.c b/src/sfnt/ttload.c index b189b5428..3e39a494d 100644 --- a/src/sfnt/ttload.c +++ b/src/sfnt/ttload.c @@ -159,8 +159,8 @@ FT_Error error; FT_UInt nn, has_head = 0; - const FT_ULong glyx_tag = FT_MAKE_TAG('g','l','y','x'); - const FT_ULong locx_tag = FT_MAKE_TAG('l','o','c','x'); + const FT_ULong glyx_tag = FT_MAKE_TAG( 'g', 'l', 'y', 'x' ); + const FT_ULong locx_tag = FT_MAKE_TAG( 'l', 'o', 'c', 'x' ); static const FT_Frame_Field sfnt_dir_entry_fields[] = {