rgraves
/
freetype2
forked from minhngoc25a/freetype2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make compilation work with FT_CONFIG_OPTION_USE_ZLIB not defined. 

Reported by Krzysztof Kowalczyk <kkowalczyk@gmail.com>.

* src/pcf/pcfdrivr.c (PCF_Face_Init) [!FT_CONFIG_OPTION_USE_ZLIB]:
Make it work.
Simplify #ifdef logic.
This commit is contained in:
Werner Lemberg 2009-05-28 06:56:26 +02:00
parent 19fbc576af
commit c32019b64a
2 changed files with 43 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2009-05-28 Werner Lemberg <wl@gnu.org>
Make compilation work with FT_CONFIG_OPTION_USE_ZLIB not defined.
Reported by Krzysztof Kowalczyk <kkowalczyk@gmail.com>.
* src/pcf/pcfdrivr.c (PCF_Face_Init) [!FT_CONFIG_OPTION_USE_ZLIB]:
Make it work.
Simplify #ifdef logic.
2009-05-22 Werner Lemberg <wl@gnu.org>
Improve b/w rasterizer.

66
src/pcf/pcfdrivr.c
View File

@ -266,19 +266,27 @@ THE SOFTWARE.
error = pcf_load_font( stream, face );
if ( error )
{
FT_Error error2;
PCF_Face_Done( pcfface );
/* this didn't work, try gzip support! */
error2 = FT_Stream_OpenGzip( &face->gzip_stream, stream );
if ( FT_ERROR_BASE( error2 ) == FT_Err_Unimplemented_Feature )
goto Fail;
#if defined( FT_CONFIG_OPTION_USE_ZLIB ) || \
defined( FT_CONFIG_OPTION_USE_LZW )
#ifdef FT_CONFIG_OPTION_USE_ZLIB
{
FT_Error error2;
/* this didn't work, try gzip support! */
error2 = FT_Stream_OpenGzip( &face->gzip_stream, stream );
if ( FT_ERROR_BASE( error2 ) == FT_Err_Unimplemented_Feature )
goto Fail;
error = error2;
}
#endif /* FT_CONFIG_OPTION_USE_ZLIB */
error = error2;
if ( error )
#ifdef FT_CONFIG_OPTION_USE_LZW
if ( error )
{
FT_Error error3;
@ -289,32 +297,26 @@ THE SOFTWARE.
goto Fail;
error = error3;
if ( error )
goto Fail;
face->gzip_source = stream;
pcfface->stream = &face->gzip_stream;
stream = pcfface->stream;
error = pcf_load_font( stream, face );
if ( error )
goto Fail;
}
#else
#endif /* FT_CONFIG_OPTION_USE_LZW */
if ( error )
goto Fail;
face->gzip_source = stream;
pcfface->stream = &face->gzip_stream;
stream = pcfface->stream;
error = pcf_load_font( stream, face );
if ( error )
goto Fail;
#else /* !(FT_CONFIG_OPTION_USE_ZLIB || FT_CONFIG_OPTION_USE_LZW) */
goto Fail;
#endif
else
{
face->gzip_source = stream;
pcfface->stream = &face->gzip_stream;
stream = pcfface->stream;
error = pcf_load_font( stream, face );
if ( error )
goto Fail;
}
}
/* set up charmap */