From 106eaf1dbb23223e4e72d27a81e7e035268a3a87 Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Thu, 3 May 2007 07:07:47 +0000 Subject: [PATCH] * src/base/ftobjs.c (FT_Set_Char_Size): Simplify code. * include/freetype/freetype.h (FT_Set_Char_Size): Update documentation. --- ChangeLog | 6 ++++++ include/freetype/freetype.h | 11 +++++++++-- src/base/ftobjs.c | 7 +++++-- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1cb255f16..0b65e89c4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-05-03 Werner Lemberg + + * src/base/ftobjs.c (FT_Set_Char_Size): Simplify code. + * include/freetype/freetype.h (FT_Set_Char_Size): Update + documentation. + 2007-04-28 Victor Stinner * src/sfnt/sfobjs.c (sfnt_load_face): Check error code after loading diff --git a/include/freetype/freetype.h b/include/freetype/freetype.h index 46ef83386..68bceb3a6 100644 --- a/include/freetype/freetype.h +++ b/include/freetype/freetype.h @@ -2111,9 +2111,16 @@ FT_BEGIN_HEADER /* FreeType error code. 0 means success. */ /* */ /* */ - /* If either the horizontal or vertical resolution is zero, it is set */ - /* to a default value of 72dpi. */ + /* If either the character width or height is zero, it is set equal */ + /* to the other value. */ /* */ + /* If either the horizontal or vertical resolution is zero, it is set */ + /* equal to the other value. */ + /* */ + /* A character width or height smaller than 1pt is set to 1pt; if */ + /* both resolution values are zero, they are set to 72dpi. */ + /* */ + FT_EXPORT( FT_Error ) FT_Set_Char_Size( FT_Face face, FT_F26Dot6 char_width, diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c index f9eceb7fb..19c64be05 100644 --- a/src/base/ftobjs.c +++ b/src/base/ftobjs.c @@ -2435,11 +2435,14 @@ if ( char_height < 1 * 64 ) char_height = 1 * 64; + if ( !horz_resolution ) + horz_resolution = vert_resolution = 72; + req.type = FT_SIZE_REQUEST_TYPE_NOMINAL; req.width = char_width; req.height = char_height; - req.horiResolution = ( horz_resolution ) ? horz_resolution : 72; - req.vertResolution = ( vert_resolution ) ? vert_resolution : 72; + req.horiResolution = horz_resolution; + req.vertResolution = vert_resolution; return FT_Request_Size( face, &req ); }