[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[ft-cvs] ft2demos ChangeLog src/ftcommon.c src/ftview.c
From: |
Werner LEMBERG |
Subject: |
[ft-cvs] ft2demos ChangeLog src/ftcommon.c src/ftview.c |
Date: |
Thu, 08 Jun 2006 07:38:06 +0000 |
CVSROOT: /cvsroot/freetype
Module name: ft2demos
Changes by: Werner LEMBERG <wl> 06/06/08 07:38:06
Modified files:
. : ChangeLog
src : ftcommon.c ftview.c
Log message:
* src/ftcommon.c (FTDemo_Display_Done, FTDemo_Done): Protect against
NULL argument.
* src/ftview.c (Fatal): New function to finalize FreeType library.
This allows to use FreeType's memory debugger in case of errors.
s/PanicZ/Fatal/.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ft2demos/ChangeLog?cvsroot=freetype&r1=1.162&r2=1.163
http://cvs.savannah.gnu.org/viewcvs/ft2demos/src/ftcommon.c?cvsroot=freetype&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/ft2demos/src/ftview.c?cvsroot=freetype&r1=1.70&r2=1.71
Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/freetype/ft2demos/ChangeLog,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -b -r1.162 -r1.163
--- ChangeLog 4 Jun 2006 15:00:59 -0000 1.162
+++ ChangeLog 8 Jun 2006 07:38:06 -0000 1.163
@@ -1,7 +1,16 @@
+2006-06-07 Werner Lemberg <address@hidden>
+
+ * src/ftcommon.c (FTDemo_Display_Done, FTDemo_Done): Protect against
+ NULL argument.
+
+ * src/ftview.c (Fatal): New function to finalize FreeType library.
+ This allows to use FreeType's memory debugger in case of errors.
+ s/PanicZ/Fatal/.
+
2006-06-04 David Turner <address@hidden>
* src/ftbench.c (main): fixed a subtle memory corruption bug
- at program exit. Reported by address@hidden
+ at program exit. Reported by <address@hidden>.
2006-05-21 Werner Lemberg <address@hidden>
Index: src/ftcommon.c
===================================================================
RCS file: /cvsroot/freetype/ft2demos/src/ftcommon.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- src/ftcommon.c 17 May 2006 05:47:43 -0000 1.15
+++ src/ftcommon.c 8 Jun 2006 07:38:06 -0000 1.16
@@ -121,6 +121,9 @@
void
FTDemo_Display_Done( FTDemo_Display* display )
{
+ if ( !display )
+ return;
+
grDoneBitmap( display->bitmap );
grDoneSurface( display->surface );
@@ -304,6 +307,9 @@
int i;
+ if ( !handle )
+ return;
+
for ( i = 0; i < handle->max_fonts; i++ )
{
if ( handle->fonts[i] )
Index: src/ftview.c
===================================================================
RCS file: /cvsroot/freetype/ft2demos/src/ftview.c,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -b -r1.70 -r1.71
--- src/ftview.c 18 May 2006 14:11:05 -0000 1.70
+++ src/ftview.c 8 Jun 2006 07:38:06 -0000 1.71
@@ -98,6 +98,15 @@
+ static void
+ Fatal( const char* message )
+ {
+ FTDemo_Display_Done( display );
+ FTDemo_Done( handle );
+ PanicZ( message );
+ }
+
+
static FT_Error
Render_Stroke( int num_indices,
int first_index )
@@ -852,7 +861,7 @@
error = FTC_Manager_LookupFace( handle->cache_manager,
handle->image_type.face_id, &face );
if ( error )
- PanicZ( "can't access font file" );
+ Fatal( "can't access font file" );
if ( !status.header )
{
@@ -1071,11 +1080,11 @@
FTDemo_Install_Font( handle, argv[0] );
if ( handle->num_fonts == 0 )
- PanicZ( "could not find/open any font file" );
+ Fatal( "could not find/open any font file" );
display = FTDemo_Display_New( gr_pixel_mode_rgb24 );
if ( !display )
- PanicZ( "could not allocate display surface" );
+ Fatal( "could not allocate display surface" );
memset( display->fore_color.chroma, 0, 4 );
memset( display->back_color.chroma, 0xff, 4 );
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [ft-cvs] ft2demos ChangeLog src/ftcommon.c src/ftview.c,
Werner LEMBERG <=