Skip to content

Commit

Permalink
fix some compiler warnings
Browse files Browse the repository at this point in the history
from the MSVC patches, and add a changelog line
  • Loading branch information
jcupitt committed Jun 1, 2018
1 parent 364a5da commit 0c8552d
Show file tree
Hide file tree
Showing 10 changed files with 16 additions and 12 deletions.
1 change: 1 addition & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
- add vips_transpose3d() -- swap major dimensions in a volumetric image
- remove vips7 stuff from default API ... you must now #include it explicitly
- added vips_argument_get_id() to fix derived classes on win32 [angelmixu]
- fix build with MSVC [angelmixu]

12/3/18 started 8.6.4
- better fitting of fonts with overhanging edges [Adrià]
Expand Down
2 changes: 1 addition & 1 deletion libvips/arithmetic/divide.c
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* 19/10/93 JC
* - coredump-inducing bug in complex*complex fixed
* 13/12/93
* - char*short bug fixed
* - char * short bug fixed
* 12/6/95 JC
* - new im_multiply adapted to make new im_divide
* 27/9/04
Expand Down
2 changes: 1 addition & 1 deletion libvips/arithmetic/multiply.c
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* 19/10/93 JC
* - coredump-inducing bug in complex*complex fixed
* 13/12/93
* - char*short bug fixed
* - char * short bug fixed
* 12/6/95 JC
* - new im_add adapted to make new im_multiply
* 27/9/04
Expand Down
6 changes: 3 additions & 3 deletions libvips/foreign/exif.c
Original file line number Diff line number Diff line change
Expand Up @@ -570,7 +570,7 @@ vips_exif_double_to_srational( double value, ExifSRational *srv )
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
vips_exif_parse_rational( const char *str, ExifRational *rv )
Expand All @@ -580,7 +580,7 @@ vips_exif_parse_rational( const char *str, ExifRational *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
vips_exif_parse_srational( const char *str, ExifSRational *srv )
Expand All @@ -591,7 +591,7 @@ vips_exif_parse_srational( const char *str, ExifSRational *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
vips_exif_set_rational( ExifData *ed,
Expand Down
2 changes: 1 addition & 1 deletion libvips/foreign/tiff2vips.c
Original file line number Diff line number Diff line change
Expand Up @@ -1843,7 +1843,7 @@ rtiff_stripwise_generate( VipsRegion *or,

/* 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;
q = VIPS_REGION_ADDR( or, 0, r->top + y );
for( z = 0; z < hit.height; z++ ) {
Expand Down
2 changes: 1 addition & 1 deletion libvips/foreign/vipspng.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
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;
}

Expand Down
6 changes: 4 additions & 2 deletions libvips/include/vips/type.h
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,8 @@ void *vips_area_get_data( VipsArea *area,
#ifdef VIPS_DEBUG
#define VIPS_ARRAY_ADDR( X, I ) \
(((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, \
"VIPS_ARRAY_ADDR: index out of bounds, " \
"file \"%s\", line %d\n" \
Expand All @@ -109,7 +110,8 @@ void *vips_area_get_data( VipsArea *area,
(I), VIPS_AREA( X )->n ), NULL ))
#else /*!VIPS_DEBUG*/
#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*/

/**
Expand Down
3 changes: 2 additions & 1 deletion libvips/iofuncs/image.c
Original file line number Diff line number Diff line change
Expand Up @@ -3269,7 +3269,8 @@ vips_image_wio_input( VipsImage *image )
*/
if( vips_mapfile( image ) )
return( -1 );
image->data = ((char*)image->baseaddr) + image->sizeof_header;
image->data = (VipsPel *) image->baseaddr +
image->sizeof_header;
image->dtype = VIPS_IMAGE_MMAPIN;

break;
Expand Down
2 changes: 1 addition & 1 deletion libvips/iofuncs/util.c
Original file line number Diff line number Diff line change
Expand Up @@ -1005,7 +1005,7 @@ vips__gslist_gvalue_merge( GSList *a, const GSList *b )
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'.
*/
char *
Expand Down
2 changes: 1 addition & 1 deletion tools/vipsedit.c
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ Copyright K.Martinez 30/6/93
#include <vips/internal.h>
#include <vips/debug.h>

/* We have to represent all header fields as char* so we can spot unset args
/* We have to represent all header fields as char * so we can spot unset args
* safely.
*/
static char *xsize = NULL;
Expand Down

0 comments on commit 0c8552d

Please sign in to comment.