From bf06b62a09f538f86a3890efaef96d709693aaae Mon Sep 17 00:00:00 2001 From: Huw Davies Date: Wed, 14 Mar 2012 14:44:46 +0100 Subject: [PATCH] [sfnt] Add `name' table compatibility to MS Windows. * src/sfnt/sfobjs.c (tt_name_entry_ascii_from_utf16, tt_name_entry_ascii_from_other): Don't replace `\0' with question marks when converting strings. --- ChangeLog | 8 ++++++++ src/sfnt/sfobjs.c | 6 +++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7bd4307c0..c42508c50 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2012-03-14 Huw Davies + + [sfnt] Add `name' table compatibility to MS Windows. + + * src/sfnt/sfobjs.c (tt_name_entry_ascii_from_utf16, + tt_name_entry_ascii_from_other): Don't replace `\0' with question + marks when converting strings. + 2012-03-14 Werner Lemberg Fix Savannah bug #35833. diff --git a/src/sfnt/sfobjs.c b/src/sfnt/sfobjs.c index d7be631af..3b9fd47f1 100644 --- a/src/sfnt/sfobjs.c +++ b/src/sfnt/sfobjs.c @@ -4,7 +4,7 @@ /* */ /* SFNT object management (base). */ /* */ -/* Copyright 1996-2008, 2010-2011 by */ +/* Copyright 1996-2008, 2010-2012 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -64,7 +64,7 @@ for ( n = 0; n < len; n++ ) { code = FT_NEXT_USHORT( read ); - if ( code < 32 || code > 127 ) + if ( code != 0 && ( code < 32 || code > 127 ) ) code = '?'; string[n] = (char)code; @@ -95,7 +95,7 @@ for ( n = 0; n < len; n++ ) { code = *read++; - if ( code < 32 || code > 127 ) + if ( code != 0 && ( code < 32 || code > 127 ) ) code = '?'; string[n] = (char)code;