Commit 3d8eeb8e97009d621e0a3f6b326cbfc4a0cb540f
2006-01-14T07:10:45
Formatting, comment fixes.
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 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83
diff --git a/ChangeLog b/ChangeLog
index c6210ae..cea604d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,7 +5,7 @@
* src/bdf/bdfdrivr.c (BDF_Size_Request, BDF_Size_Select),
src/pcf/pcfdrivr.c (PCF_Size_Request, PCF_Size_Select),
src/winfonts/winfnt.c (FNT_Size_Request, FNT_Size_Select): Do size
- matching for request of type NOMINAL and REAL_DIM.
+ matching for requests of type NOMINAL and REAL_DIM.
* src/winfonts/winfnt.c (FNT_Face_Init): Print trace message when
`pixel_height' is used for nominal height.
diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c
index c2efbe0..e3f4251 100644
--- a/src/base/ftobjs.c
+++ b/src/base/ftobjs.c
@@ -2201,9 +2201,9 @@
if ( clazz->request_size )
error = clazz->request_size( face->size, req );
/*
- * The reason that a driver not having `request_size' defined is
- * either the scaling here suffices or the supported formats
- * are bitmap-only and size matching is not implmented.
+ * The reason that a driver doesn't have `request_size' defined is
+ * either that the scaling here suffices or that the supported formats
+ * are bitmap-only and size matching is not implemented.
*
* In the latter case, a simple size matching is done.
*/
diff --git a/src/bdf/bdfdrivr.c b/src/bdf/bdfdrivr.c
index 213abcb..84026f5 100644
--- a/src/bdf/bdfdrivr.c
+++ b/src/bdf/bdfdrivr.c
@@ -624,11 +624,13 @@ THE SOFTWARE.
if ( height == ( bsize->y_ppem + 32 ) >> 6 )
error = BDF_Err_Ok;
break;
+
case FT_SIZE_REQUEST_TYPE_REAL_DIM:
if ( height == ( bdffont->font_ascent +
bdffont->font_descent ) )
error = BDF_Err_Ok;
break;
+
default:
error = BDF_Err_Unimplemented_Feature;
break;
diff --git a/src/pcf/pcfdrivr.c b/src/pcf/pcfdrivr.c
index f3d56d9..a0491ed 100644
--- a/src/pcf/pcfdrivr.c
+++ b/src/pcf/pcfdrivr.c
@@ -408,11 +408,13 @@ THE SOFTWARE.
if ( height == ( bsize->y_ppem + 32 ) >> 6 )
error = PCF_Err_Ok;
break;
+
case FT_SIZE_REQUEST_TYPE_REAL_DIM:
if ( height == ( face->accel.fontAscent +
face->accel.fontDescent ) )
error = PCF_Err_Ok;
break;
+
default:
error = PCF_Err_Unimplemented_Feature;
break;
diff --git a/src/winfonts/winfnt.c b/src/winfonts/winfnt.c
index 66ae9f1..819b0db 100644
--- a/src/winfonts/winfnt.c
+++ b/src/winfonts/winfnt.c
@@ -613,10 +613,12 @@
if ( height == ( bsize->y_ppem + 32 ) >> 6 )
error = FNT_Err_Ok;
break;
+
case FT_SIZE_REQUEST_TYPE_REAL_DIM:
if ( height == header->pixel_height )
error = FNT_Err_Ok;
break;
+
default:
error = FNT_Err_Unimplemented_Feature;
break;