squash compiler warnings

and rename vips_image_write_filename() to vips_image_write_to_file() to
be more consistent
This commit is contained in:
John Cupitt 2011-10-15 12:22:57 +01:00
parent 7999edbc73
commit d25e94d0d2
5 changed files with 16 additions and 36 deletions

View File

@ -1,6 +1,6 @@
20/8/11 started 7.27.0 20/8/11 started 7.27.0
- version bump for new dev cycle - version bump for new dev cycle
- im_subtract(), im_avg(), im_min(), im_minpos() redone as classes - im_subtract(), im_avg(), im_min(), im_minpos(), im_copy() redone as classes
- added VIPS_ARGUMENT_APPEND to help control arg ordering - added VIPS_ARGUMENT_APPEND to help control arg ordering
- generate has a 'stop' param to signal successful early termination - generate has a 'stop' param to signal successful early termination
- added optional output args, eg. x/y for min - added optional output args, eg. x/y for min
@ -18,9 +18,8 @@
- im_csv2vips() allows quoted strings, including escaped quotes - im_csv2vips() allows quoted strings, including escaped quotes
- added vips_shutdown() - added vips_shutdown()
- added --vips-leak flag - added --vips-leak flag
- added VipsCopy
- more VipsImage props - more VipsImage props
- added vips_image_write(), old one becomes vips_image_write_filename() - added vips_image_write(), old one becomes vips_image_write_to_file()
- jpeg read/write copies over XMP data - jpeg read/write copies over XMP data
12/9/11 started 7.26.4 12/9/11 started 7.26.4

29
TODO
View File

@ -1,34 +1,15 @@
- vips_image_write() uses im_copy() to send an image to a file - improve CSV parsing a bit more, allow quotes on any field not just strings
but im_copy() now calls vips_copy(), which can't actually write to a
specific descriptor!
vips_image_write() needs to do some behind-the-scenes magic, I'm not quite
sure what
just vips_image_generate() with a pointer copy I think, basically
vipscopy without creating the output
rename as vips_image_write_to_filename(), vips_image_write() should write to
a VipsImage
im_add() etc. compat functions need to start calling vips_image_write()
instead of im_copy()
- vipscopy
how would we do meta sets? - vips_object_set_argument_from_string() needs more arg types
vips_object_set_argument_from_string() needs more arg types
must be some way to make this more automatic must be some way to make this more automatic
- nicolas's convsep patch - nicolas's convsep patch
- add nifti support - add nifti support
@ -38,21 +19,19 @@
- do clip/embed etc. in new style, good to get everything that VipsAdd uses in - do clip/embed etc. in new style, good to get everything that VipsAdd uses in
the new stack the new stack
- add vips_init_argv() which processes argc/argv for you? handy for tiny - add vips_init_argv() which processes argc/argv for you? handy for tiny
progs, perhaps progs, perhaps
- generate the code for vips_add() etc. automatically? it might be
- could we generate the code for vips_add() etc. automatically? it might be
nice to have them all in one place at least nice to have them all in one place at least

View File

@ -474,7 +474,7 @@ void vips_image_set_delete_on_close( VipsImage *image,
gboolean delete_on_close ); gboolean delete_on_close );
VipsImage *vips_image_new_disc_temp( const char *format ); VipsImage *vips_image_new_disc_temp( const char *format );
int vips_image_write( VipsImage *image, VipsImage *out ); int vips_image_write( VipsImage *image, VipsImage *out );
int vips_image_write_filename( VipsImage *image, const char *filename ); int vips_image_write_to_file( VipsImage *image, const char *filename );
gboolean vips_image_isMSBfirst( VipsImage *image ); gboolean vips_image_isMSBfirst( VipsImage *image );
gboolean vips_image_isfile( VipsImage *image ); gboolean vips_image_isfile( VipsImage *image );

View File

@ -326,7 +326,7 @@ vips_image_to_string( VipsObject *object, VipsBuf *buf )
static int static int
vips_image_write_object( VipsObject *object, const char *string ) vips_image_write_object( VipsObject *object, const char *string )
{ {
return( vips_image_write_filename( VIPS_IMAGE( object ), string ) ); return( vips_image_write_to_file( VIPS_IMAGE( object ), string ) );
} }
static void * static void *
@ -1780,8 +1780,10 @@ vips_image_write_gen( VipsRegion *or,
* @image: image to write * @image: image to write
* @out: write to this image * @out: write to this image
* *
* A convenience function to write a #VipsImage to another #VipsImage. Unlike * Write @image to @out. Use vips_image_new_mode() and friends to create the
* vips_copy(), you can specify the #VipsImage you want to write to. * #VipsImage you want to write to.
*
* See also: vips_image_new_mode(), vips_copy(), vips_image_write_to_file().
* *
* Returns: 0 on success, or -1 on error. * Returns: 0 on success, or -1 on error.
*/ */
@ -1805,16 +1807,16 @@ vips_image_write( VipsImage *image, VipsImage *out )
} }
/** /**
* vips_image_write_filename: * vips_image_write_to_file:
* @image: image to write * @image: image to write
* @filename: write to this file * @filename: write to this file
* *
* A convenience function to write a #VipsImage to a file. * A convenience function to write @image to a file.
* *
* Returns: 0 on success, or -1 on error. * Returns: 0 on success, or -1 on error.
*/ */
int int
vips_image_write_filename( VipsImage *image, const char *filename ) vips_image_write_to_file( VipsImage *image, const char *filename )
{ {
VipsImage *out; VipsImage *out;

View File

@ -256,7 +256,7 @@ vips_operation_new( const char *name )
g_value_unset( &value ); \ g_value_unset( &value ); \
} \ } \
else if( (ARG_CLASS->flags & VIPS_ARGUMENT_OUTPUT) ) { \ else if( (ARG_CLASS->flags & VIPS_ARGUMENT_OUTPUT) ) { \
void **arg; \ void **arg __attribute__ ((unused)); \
\ \
/* Output args are a pointer to where to send the \ /* Output args are a pointer to where to send the \
* result. \ * result. \