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

[sfnt] Fix compilation with g++. 

* src/sfnt/pngshim.c (error_callback, read_data_from_FT_stream): Use
cast.
(Load_SBit_Png): Pacify compiler.
This commit is contained in:
Werner Lemberg 2013-08-02 14:53:32 +02:00
parent 89a529f317
commit 74a9b670e9
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2013-08-02 Werner Lemberg <wl@gnu.org>
[sfnt] Fix compilation with g++.
* src/sfnt/pngshim.c (error_callback, read_data_from_FT_stream): Use
cast.
(Load_SBit_Png): Pacify compiler.
2013-08-02 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
Werner Lemberg <wl@gnu.org>

6
src/sfnt/pngshim.c
View File

@ -122,7 +122,7 @@
error_callback( png_structp png,
png_const_charp error_msg )
{
FT_Error* error = png_get_error_ptr( png );
FT_Error* error = (FT_Error*)png_get_error_ptr( png );
FT_UNUSED( error_msg );
@ -159,7 +159,7 @@
if ( FT_FRAME_ENTER( length ) )
{
FT_Error* e = png_get_error_ptr( png );
FT_Error* e = (FT_Error*)png_get_error_ptr( png );
*e = FT_THROW( Invalid_Stream_Read );
@ -195,7 +195,7 @@
int bitdepth, color_type, interlace;
FT_Int i;
png_byte* *rows;
png_byte* *rows = NULL; /* pacify compiler */
if ( x_offset < 0 ||