ref: eb17a92a78645ca232eb2a85aded9b358a589fdc
parent: 3c7f11a9b71bb339dec75f8b349ba223a1adc30e
author: Werner Lemberg <[email protected]>
date: Fri Jun 20 03:33:20 EDT 2003
* src/psnames/psmodule.c (ps_unicode_value): Add support to recognize `uXXXX[X[X]]' glyph names. Don't handle glyph names starting with `uni' which have more than four digits.
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-06-18 Werner Lemberg <[email protected]>
+
+ * src/psnames/psmodule.c (ps_unicode_value): Add support to
+ recognize `uXXXX[X[X]]' glyph names.
+ Don't handle glyph names starting with `uni' which have more than
+ four digits.
+
2003-06-16 Werner Lemberg <[email protected]>
* include/freetype/freetype.h (FT_Open_Flags): Replaced with
--- a/include/freetype/freetype.h
+++ b/include/freetype/freetype.h
@@ -213,7 +213,7 @@
/* An extremely simple structure used to model the size of a bitmap */
/* strike (i.e., a bitmap instance of the font for a given */
/* resolution) in a fixed-size font face. This is used for the */
- /* `available_sizes' field of the FT_Face_Properties structure. */
+ /* `available_sizes' field of the @FT_FaceRec structure. */
/* */
/* <Fields> */
/* height :: The character height in pixels. */
@@ -1026,8 +1026,8 @@
/* */
/* @description: */
/* A macro that returns true whenever a face object contains some */
- /* embedded bitmaps. See the `fixed_sizes' field of the @FT_FaceRec */
- /* structure. */
+ /* embedded bitmaps. See the `available_sizes' field of the */
+ /* @FT_FaceRec structure. */
/* */
#define FT_HAS_FIXED_SIZES( face ) \
( face->face_flags & FT_FACE_FLAG_FIXED_SIZES )
--- a/src/cff/cffload.c
+++ b/src/cff/cffload.c
@@ -1679,7 +1679,6 @@
}
-
static void
cff_encoding_done( CFF_Encoding encoding )
{@@ -1687,7 +1686,6 @@
encoding->offset = 0;
encoding->count = 0;
}
-
static FT_Error
--- a/src/cff/cffobjs.c
+++ b/src/cff/cffobjs.c
@@ -523,7 +523,6 @@
FT_CMap_New( clazz, NULL, &cmaprec, NULL );
}
-
}
}
--- a/src/psnames/psmodule.c
+++ b/src/psnames/psmodule.c
@@ -44,7 +44,7 @@
char temp[64];
- /* if the name begins with `uni', then the glyph name may be a */
+ /* If the name begins with `uni', then the glyph name may be a */
/* hard-coded unicode character code. */
if ( glyph_name[0] == 'u' &&
glyph_name[1] == 'n' &&
@@ -83,7 +83,44 @@
value = ( value << 4 ) + d;
}
- if ( count == 0 )
+
+ /* there must be exactly four hex digits */
+ if ( *p == '\0' && count == 0 )
+ return value;
+ }
+
+ /* If the name begins with `u', followed by four to six uppercase */
+ /* hexadicimal digits, it is a hard-coded unicode character code. */
+ if ( glyph_name[0] == 'u' )
+ {+ FT_Int count;
+ FT_ULong value = 0;
+ const char* p = glyph_name + 1;
+
+
+ for ( count = 6; count > 0; count--, p++ )
+ {+ char c = *p;
+ unsigned int d;
+
+
+ d = (unsigned char)c - '0';
+ if ( d >= 10 )
+ {+ d = (unsigned char)c - 'A';
+ if ( d >= 6 )
+ d = 16;
+ else
+ d += 10;
+ }
+
+ if ( d >= 16 )
+ break;
+
+ value = ( value << 4 ) + d;
+ }
+
+ if ( *p == '\0' && count <= 2 )
return value;
}
--- a/src/winfonts/winfnt.c
+++ b/src/winfonts/winfnt.c
@@ -133,7 +133,7 @@
/* first of all, read the FNT header */
- if ( FT_STREAM_SEEK( font->offset ) ||
+ if ( FT_STREAM_SEEK( font->offset ) ||
FT_STREAM_READ_FIELDS( winfnt_header_fields, header ) )
goto Exit;
@@ -208,7 +208,7 @@
face->num_fonts = 0;
/* does it begin with a MZ header? */
- if ( FT_STREAM_SEEK( 0 ) ||
+ if ( FT_STREAM_SEEK( 0 ) ||
FT_STREAM_READ_FIELDS( winmz_header_fields, &mz_header ) )
goto Exit;
@@ -219,7 +219,7 @@
WinNE_HeaderRec ne_header;
- if ( FT_STREAM_SEEK( mz_header.lfanew ) ||
+ if ( FT_STREAM_SEEK( mz_header.lfanew ) ||
FT_STREAM_READ_FIELDS( winne_header_fields, &ne_header ) )
goto Exit;
@@ -320,7 +320,6 @@
Exit:
return error;
}
-
typedef struct FNT_CMapRec_