From 3d8eeb8e97009d621e0a3f6b326cbfc4a0cb540f Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Sat, 14 Jan 2006 07:10:45 +0000 Subject: [PATCH] Formatting, comment fixes. --- ChangeLog | 2 +- src/base/ftobjs.c | 6 +++--- src/bdf/bdfdrivr.c | 2 ++ src/pcf/pcfdrivr.c | 2 ++ src/winfonts/winfnt.c | 2 ++ 5 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index c6210ae3e..cea604d0c 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 c2efbe064..e3f425120 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 213abcb99..84026f569 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 f3d56d910..a0491ed92 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 66ae9f10e..819b0dbdc 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;