Changed interlace method... fixed compile breakage.

This commit is contained in:
Stuart Longland 2008-03-25 09:38:43 +10:00
parent e77ea64738
commit e04cca4ad9
3 changed files with 6 additions and 3 deletions

View File

@ -24,7 +24,6 @@
void* gcmalloc( size_t size ); void* gcmalloc( size_t size );
void* gccalloc( size_t nmemb, size_t size ); void* gccalloc( size_t nmemb, size_t size );
void* gcrealloc( void* ptr, size_t size ); void* gcrealloc( void* ptr, size_t size );
void gcfree( void* ptr );
void gcfreeall(); void gcfreeall();
char* gcstrdup( const char* str ); char* gcstrdup( const char* str );
char* gcreport(); char* gcreport();
@ -44,9 +43,9 @@ static size_t gc_count = 0;
#define gcmalloc( size ) malloc( size ) #define gcmalloc( size ) malloc( size )
#define gccalloc( size, num ) calloc( size, num ) #define gccalloc( size, num ) calloc( size, num )
#define gcrealloc( ptr, size ) realloc( ptr, size ) #define gcrealloc( ptr, size ) realloc( ptr, size )
#define gcfree( ptr ) free( ptr )
#define gcstrdup( size ) strdup( size ) #define gcstrdup( size ) strdup( size )
#endif #endif
void gcfree( void* ptr );
/* Sanitise a given name. Names may only contain alpha-numeric /* Sanitise a given name. Names may only contain alpha-numeric
* characters, hyphens, underscores and full stop characters. * characters, hyphens, underscores and full stop characters.

View File

@ -480,7 +480,7 @@ char* resize_photo( struct photo_meta* dest,
MagickSetImageCompressionQuality( wand, MagickSetImageCompressionQuality( wand,
(unsigned long)quality ); (unsigned long)quality );
MagickSetImageInterlaceScheme( wand, PartitionInterlace ); MagickSetImageInterlaceScheme( wand, LineInterlace );
if (MagickWriteImage( wand, cache_path ) == MagickFalse) { if (MagickWriteImage( wand, cache_path ) == MagickFalse) {
ExceptionType severity; ExceptionType severity;

View File

@ -148,6 +148,10 @@ char* gcstrdup( const char* str ) {
} }
#else #else
void gcfree( void* ptr ) {
free( ptr );
}
void gcfreeall() { void gcfreeall() {
} }