minhngoc25a
/
freetype2
mirror of git://git.savannah.gnu.org/freetype/freetype2.git
2
1
Fork 2
Code Issues 4 Releases Wiki Activity

* src/pcf/pcfread.c: Put READ_Fields() always in a conditional to 

avoid compiler warnings.
This commit is contained in:
Werner Lemberg 2001-03-11 13:11:43 +00:00
parent 183ee0af2f
commit 459d7e660f
2 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -2,6 +2,9 @@
* TODO: Updated. * TODO: Updated.
* src/pcf/pcfread.c: Put READ_Fields() always in a conditional to
avoid compiler warnings.
2001-03-10 Tom Kacvinsky <tjk@ams.org> 2001-03-10 Tom Kacvinsky <tjk@ams.org>
* TODO: New file. * TODO: New file.

36
src/pcf/pcfread.c
View File

@ -205,9 +205,10 @@ THE SOFTWARE.
FT_Error error = FT_Err_Ok; FT_Error error = FT_Err_Ok;
(void)READ_Fields( header, metric ); if ( READ_Fields( header, metric ) )
return error;
return error; return FT_Err_Ok;
} }
@ -219,7 +220,8 @@ THE SOFTWARE.
FT_Error error = FT_Err_Ok; FT_Error error = FT_Err_Ok;
(void)READ_Fields( pcf_compressed_metric_header, &compr_metric ); if ( READ_Fields( pcf_compressed_metric_header, &compr_metric ) )
return error;
metric->leftSideBearing = (FT_Short)compr_metric.leftSideBearing - 0x80; metric->leftSideBearing = (FT_Short)compr_metric.leftSideBearing - 0x80;
metric->rightSideBearing = (FT_Short)compr_metric.rightSideBearing - 0x80; metric->rightSideBearing = (FT_Short)compr_metric.rightSideBearing - 0x80;
@ -228,7 +230,7 @@ THE SOFTWARE.
metric->descent = (FT_Short)compr_metric.descent - 0x80; metric->descent = (FT_Short)compr_metric.descent - 0x80;
metric->attributes = 0; metric->attributes = 0;
return error; return FT_Err_Ok;
} }
@ -394,11 +396,15 @@ THE SOFTWARE.
for ( i = 0; i < nprops; i++ ) for ( i = 0; i < nprops; i++ )
{ {
if ( PCF_BYTE_ORDER( format ) == MSBFirst ) if ( PCF_BYTE_ORDER( format ) == MSBFirst )
(void)READ_Fields( pcf_property_msb_header, props + i ); {
if ( READ_Fields( pcf_property_msb_header, props + i ) )
goto Bail;
}
else else
(void)READ_Fields( pcf_property_header, props + i ); {
if ( error ) if ( READ_Fields( pcf_property_header, props + i ) )
goto Bail; goto Bail;
}
} }
/* pad the property array */ /* pad the property array */
@ -811,12 +817,16 @@ THE SOFTWARE.
!PCF_FORMAT_MATCH( format, PCF_ACCEL_W_INKBOUNDS ) ) !PCF_FORMAT_MATCH( format, PCF_ACCEL_W_INKBOUNDS ) )
goto Bail; goto Bail;
if ( PCF_BYTE_ORDER( format ) == MSBFirst ) if ( PCF_BYTE_ORDER( format ) == MSBFirst )
(void)READ_Fields( pcf_accel_msb_header , accel ); {
if ( READ_Fields( pcf_accel_msb_header, accel ) )
goto Bail;
}
else else
(void)READ_Fields( pcf_accel_header, accel ); {
if ( error ) if ( READ_Fields( pcf_accel_header, accel ) )
goto Bail; goto Bail;
}
error = pcf_get_metric( stream, format, &(accel->minbounds) ); error = pcf_get_metric( stream, format, &(accel->minbounds) );
if ( error ) if ( error )