Commit 106eaf1dbb23223e4e72d27a81e7e035268a3a87
2007-05-03T07:07:47
* src/base/ftobjs.c (FT_Set_Char_Size): Simplify code. * include/freetype/freetype.h (FT_Set_Char_Size): Update documentation.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57
diff --git a/ChangeLog b/ChangeLog
index 1cb255f..0b65e89 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-05-03 Werner Lemberg <wl@gnu.org>
+
+ * 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 <victor.stinner@inl.fr>
* 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 46ef833..68bceb3 100644
--- a/include/freetype/freetype.h
+++ b/include/freetype/freetype.h
@@ -2111,9 +2111,16 @@ FT_BEGIN_HEADER
/* FreeType error code. 0 means success. */
/* */
/* <Note> */
+ /* 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 */
- /* to a default value of 72dpi. */
+ /* 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 f9eceb7..19c64be 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 );
}