fix some compiler warnings

from the msvc patch
This commit is contained in:
John Cupitt 2018-06-01 19:44:43 +01:00
parent 364a5daafc
commit e9aaedc60a
10 changed files with 16 additions and 12 deletions

View File

@ -23,6 +23,7 @@
- add vips_transpose3d() -- swap major dimensions in a volumetric image - add vips_transpose3d() -- swap major dimensions in a volumetric image
- remove vips7 stuff from default API ... you must now #include it explicitly - remove vips7 stuff from default API ... you must now #include it explicitly
- added vips_argument_get_id() to fix derived classes on win32 [angelmixu] - added vips_argument_get_id() to fix derived classes on win32 [angelmixu]
- fix compile with MSVC 2017 [angelmixu]
12/3/18 started 8.6.4 12/3/18 started 8.6.4
- better fitting of fonts with overhanging edges [Adrià] - better fitting of fonts with overhanging edges [Adrià]

View File

@ -13,7 +13,7 @@
* 19/10/93 JC * 19/10/93 JC
* - coredump-inducing bug in complex*complex fixed * - coredump-inducing bug in complex*complex fixed
* 13/12/93 * 13/12/93
* - char*short bug fixed * - char * short bug fixed
* 12/6/95 JC * 12/6/95 JC
* - new im_multiply adapted to make new im_divide * - new im_multiply adapted to make new im_divide
* 27/9/04 * 27/9/04

View File

@ -13,7 +13,7 @@
* 19/10/93 JC * 19/10/93 JC
* - coredump-inducing bug in complex*complex fixed * - coredump-inducing bug in complex*complex fixed
* 13/12/93 * 13/12/93
* - char*short bug fixed * - char * short bug fixed
* 12/6/95 JC * 12/6/95 JC
* - new im_add adapted to make new im_multiply * - new im_add adapted to make new im_multiply
* 27/9/04 * 27/9/04

View File

@ -570,7 +570,7 @@ vips_exif_double_to_srational( double value, ExifSRational *srv )
srv->denominator = 1000; srv->denominator = 1000;
} }
/* Parse a char* into an ExifRational. We allow floats as well. /* Parse a char * into an ExifRational. We allow floats as well.
*/ */
static void static void
vips_exif_parse_rational( const char *str, ExifRational *rv ) vips_exif_parse_rational( const char *str, ExifRational *rv )
@ -580,7 +580,7 @@ vips_exif_parse_rational( const char *str, ExifRational *rv )
vips_exif_double_to_rational( g_ascii_strtod( str, NULL ), rv ); vips_exif_double_to_rational( g_ascii_strtod( str, NULL ), rv );
} }
/* Parse a char* into an ExifSRational. We allow floats as well. /* Parse a char * into an ExifSRational. We allow floats as well.
*/ */
static void static void
vips_exif_parse_srational( const char *str, ExifSRational *srv ) vips_exif_parse_srational( const char *str, ExifSRational *srv )
@ -591,7 +591,7 @@ vips_exif_parse_srational( const char *str, ExifSRational *srv )
vips_exif_double_to_srational( g_ascii_strtod( str, NULL ), srv ); vips_exif_double_to_srational( g_ascii_strtod( str, NULL ), srv );
} }
/* Does both signed and unsigned rationals from a char*. /* Does both signed and unsigned rationals from a char *.
*/ */
static void static void
vips_exif_set_rational( ExifData *ed, vips_exif_set_rational( ExifData *ed,

View File

@ -1843,7 +1843,7 @@ rtiff_stripwise_generate( VipsRegion *or,
/* Do any repacking to generate pixels in vips layout. /* Do any repacking to generate pixels in vips layout.
*/ */
p = (char*)(rtiff->contig_buf) + p = (VipsPel *) rtiff->contig_buf +
(hit.top - strip.top) * scanline_size; (hit.top - strip.top) * scanline_size;
q = VIPS_REGION_ADDR( or, 0, r->top + y ); q = VIPS_REGION_ADDR( or, 0, r->top + y );
for( z = 0; z < hit.height; z++ ) { for( z = 0; z < hit.height; z++ ) {

View File

@ -700,7 +700,7 @@ vips_png_read_buffer( png_structp pPng, png_bytep data, png_size_t length )
if( read->read_pos + length > read->length ) if( read->read_pos + length > read->length )
png_error( pPng, "not enough data in buffer" ); png_error( pPng, "not enough data in buffer" );
memcpy( data, (const char*)(read->buffer) + read->read_pos, length ); memcpy( data, (VipsPel *) read->buffer + read->read_pos, length );
read->read_pos += length; read->read_pos += length;
} }

View File

@ -100,7 +100,8 @@ void *vips_area_get_data( VipsArea *area,
#ifdef VIPS_DEBUG #ifdef VIPS_DEBUG
#define VIPS_ARRAY_ADDR( X, I ) \ #define VIPS_ARRAY_ADDR( X, I ) \
(((I) >= 0 && (I) < VIPS_AREA( X )->n) ? \ (((I) >= 0 && (I) < VIPS_AREA( X )->n) ? \
((char*)(VIPS_AREA( X )->data) + VIPS_AREA( X )->sizeof_type * (I)) : \ (void *) ((VipsPel *) VIPS_AREA( X )->data + \
VIPS_AREA( X )->sizeof_type * (I)) : \
(fprintf( stderr, \ (fprintf( stderr, \
"VIPS_ARRAY_ADDR: index out of bounds, " \ "VIPS_ARRAY_ADDR: index out of bounds, " \
"file \"%s\", line %d\n" \ "file \"%s\", line %d\n" \
@ -109,7 +110,8 @@ void *vips_area_get_data( VipsArea *area,
(I), VIPS_AREA( X )->n ), NULL )) (I), VIPS_AREA( X )->n ), NULL ))
#else /*!VIPS_DEBUG*/ #else /*!VIPS_DEBUG*/
#define VIPS_ARRAY_ADDR( X, I ) \ #define VIPS_ARRAY_ADDR( X, I ) \
((char*)(VIPS_AREA( X )->data) + VIPS_AREA( X )->sizeof_type * (I)) ((void *) \
((VipsPel *) VIPS_AREA( X )->data + VIPS_AREA( X )->sizeof_type * (I)))
#endif /*VIPS_DEBUG*/ #endif /*VIPS_DEBUG*/
/** /**

View File

@ -3269,7 +3269,8 @@ vips_image_wio_input( VipsImage *image )
*/ */
if( vips_mapfile( image ) ) if( vips_mapfile( image ) )
return( -1 ); return( -1 );
image->data = ((char*)image->baseaddr) + image->sizeof_header; image->data = (VipsPel *) image->baseaddr +
image->sizeof_header;
image->dtype = VIPS_IMAGE_MMAPIN; image->dtype = VIPS_IMAGE_MMAPIN;
break; break;

View File

@ -1005,7 +1005,7 @@ vips__gslist_gvalue_merge( GSList *a, const GSList *b )
return( a ); return( a );
} }
/* Make a char* from GSList of GValue. Each GValue should be a ref_string. /* Make a char * from GSList of GValue. Each GValue should be a ref_string.
* free the result. Empty list -> "", not NULL. Join strings with '\n'. * free the result. Empty list -> "", not NULL. Join strings with '\n'.
*/ */
char * char *

View File

@ -717,7 +717,7 @@ VDMask VImage::stats()
Vargv _vec( "im_stats" ); Vargv _vec( "im_stats" );
_vec.data(0) = in.image(); _vec.data(0) = in.image();
((im_mask_object*) _vec.data(1))->name = (char*)"noname"; ((im_mask_object*) _vec.data(1))->name = (char*) "noname";
_vec.call(); _vec.call();
statistics.embed( (DOUBLEMASK *)((im_mask_object*)_vec.data(1))->mask ); statistics.embed( (DOUBLEMASK *)((im_mask_object*)_vec.data(1))->mask );