sergiotarxz/libvips
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

move --strip into save base class

Browse Source 
was in jpegsave, now in save

need to add support to png writer, maybe vips as well, tiff could not
attach ICC profiles I guess
This commit is contained in:
John Cupitt 2013-11-13 09:00:47 +00:00
parent 3c4cd55d54
commit ad723ade5a
5 changed files with 48 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
TODO
View File

@ -1,3 +1,5 @@
- support --strip for other writers
- vipstumbnail is broken for the gamma trick png on eric brasseur's page
- vipsthumbnail could shrink-on-load openslide and pyr tiff as well?

7
libvips/foreign/foreign.c
View File

@ -1410,6 +1410,13 @@ vips_foreign_save_class_init( VipsForeignSaveClass *class )
_( "Image to save" ),
VIPS_ARGUMENT_REQUIRED_INPUT,
G_STRUCT_OFFSET( VipsForeignSave, in ) );
VIPS_ARG_BOOL( class, "strip", 100,
_( "Strip" ),
_( "Strip all metadata from image" ),
VIPS_ARGUMENT_OPTIONAL_INPUT,
G_STRUCT_OFFSET( VipsForeignSave, strip ),
FALSE );
}
static void

16
libvips/foreign/jpegsave.c
View File

@ -87,10 +87,6 @@ typedef struct _VipsForeignSaveJpeg {
*/
gboolean interlace;
/* Remove all metadata from the image.
*/
gboolean strip;
} VipsForeignSaveJpeg;
typedef VipsForeignSaveClass VipsForeignSaveJpegClass;
@ -151,12 +147,6 @@ vips_foreign_save_jpeg_class_init( VipsForeignSaveJpegClass *class )
G_STRUCT_OFFSET( VipsForeignSaveJpeg, interlace ),
FALSE );
VIPS_ARG_BOOL( class, "strip", 14,
_( "Strip" ),
_( "Strip all metadata from image" ),
VIPS_ARGUMENT_OPTIONAL_INPUT,
G_STRUCT_OFFSET( VipsForeignSaveJpeg, strip ),
FALSE );
}
static void
@ -192,7 +182,7 @@ vips_foreign_save_jpeg_file_build( VipsObject *object )
if( vips__jpeg_write_file( save->ready, file->filename,
jpeg->Q, jpeg->profile, jpeg->optimize_coding,
jpeg->interlace, jpeg->strip ) )
jpeg->interlace, save->strip ) )
return( -1 );
return( 0 );
@ -258,7 +248,7 @@ vips_foreign_save_jpeg_buffer_build( VipsObject *object )
if( vips__jpeg_write_buffer( save->ready,
&obuf, &olen, jpeg->Q, jpeg->profile, jpeg->optimize_coding,
jpeg->interlace, jpeg->strip ) )
jpeg->interlace, save->strip ) )
return( -1 );
area = vips_area_new_blob( (VipsCallbackFn) vips_free, obuf, olen );
@ -320,7 +310,7 @@ vips_foreign_save_jpeg_mime_build( VipsObject *object )
if( vips__jpeg_write_buffer( save->ready,
&obuf, &olen, jpeg->Q, jpeg->profile, jpeg->optimize_coding,
jpeg->interlace, jpeg->strip ) )
jpeg->interlace, save->strip ) )
return( -1 );
printf( "Content-length: %zd\r\n", olen );

4
libvips/include/vips/foreign.h
View File

@ -246,6 +246,10 @@ typedef enum {
typedef struct _VipsForeignSave {
VipsForeign parent_object;
/* Dont't attach metadata.
*/
gboolean strip;
/*< public >*/
/* The image we are to save, as supplied by our caller.

65
tools/vipsthumbnail.c
View File

@ -231,7 +231,7 @@ thumbnail_get_thumbnail( VipsImage *im )
* VIPS to load a lower resolution version.
*/
static VipsImage *
thumbnail_open( VipsObject *thumbnail, const char *filename )
thumbnail_open( VipsObject *process, const char *filename )
{
const char *loader;
VipsImage *im;
@ -296,7 +296,7 @@ thumbnail_open( VipsObject *thumbnail, const char *filename )
return( NULL );
}
vips_object_local( thumbnail, im );
vips_object_local( process, im );
return( im );
}
@ -480,7 +480,7 @@ thumbnail_shrink( VipsObject *thumbnail, VipsImage *in,
}
static VipsInterpolate *
thumbnail_interpolator( VipsObject *thumbnail, VipsImage *in )
thumbnail_interpolator( VipsObject *process, VipsImage *in )
{
double residual;
VipsInterpolate *interp;
@ -495,7 +495,7 @@ thumbnail_interpolator( VipsObject *thumbnail, VipsImage *in )
residual > 1.0 ? "nearest" : interpolator ) )) )
return( NULL );
vips_object_local( thumbnail, interp );
vips_object_local( process, interp );
return( interp );
}
@ -504,25 +504,26 @@ thumbnail_interpolator( VipsObject *thumbnail, VipsImage *in )
* stage.
*/
static VipsImage *
thumbnail_sharpen( void )
thumbnail_sharpen( VipsObject *process )
{
static VipsImage *mask = NULL;
VipsImage *mask;
if( !mask ) {
if( strcmp( convolution_mask, "none" ) == 0 )
mask = NULL;
else if( strcmp( convolution_mask, "mild" ) == 0 ) {
mask = vips_image_new_matrixv( 3, 3,
-1.0, -1.0, -1.0,
-1.0, 32.0, -1.0,
-1.0, -1.0, -1.0 );
vips_image_set_double( mask, "scale", 24 );
}
else
if( !(mask =
vips_image_new_from_file( convolution_mask )) )
vips_error_exit( "unable to load sharpen" );
if( strcmp( convolution_mask, "none" ) == 0 )
mask = NULL;
else if( strcmp( convolution_mask, "mild" ) == 0 ) {
mask = vips_image_new_matrixv( 3, 3,
-1.0, -1.0, -1.0,
-1.0, 32.0, -1.0,
-1.0, -1.0, -1.0 );
vips_image_set_double( mask, "scale", 24 );
}
else
if( !(mask =
vips_image_new_from_file( convolution_mask )) )
vips_error_exit( "unable to load sharpen mask" );
if( mask )
vips_object_local( process, mask );
return( mask );
}
@ -574,21 +575,19 @@ thumbnail_write( VipsImage *im, const char *filename )
}
static int
thumbnail_process( VipsObject *thumbnail, const char *filename )
thumbnail_process( VipsObject *process, const char *filename )
{
VipsImage *in;
VipsInterpolate *interp;
VipsImage *sharpen;
VipsImage *thumb;
VipsImage *thumbnail;
if( !(in = thumbnail_open( thumbnail, filename )) )
return( -1 );
if( !(interp = thumbnail_interpolator( thumbnail, in )) )
return( -1 );
sharpen = thumbnail_sharpen();
if( !(thumb = thumbnail_shrink( thumbnail, in, interp, sharpen )) )
return( -1 );
if( thumbnail_write( thumb, filename ) )
if( !(in = thumbnail_open( process, filename )) ||
!(interp = thumbnail_interpolator( process, in )) ||
!(sharpen = thumbnail_sharpen( process )) ||
!(thumbnail =
thumbnail_shrink( process, in, interp, sharpen )) ||
thumbnail_write( thumbnail, filename ) )
return( -1 );
return( 0 );
@ -634,16 +633,16 @@ main( int argc, char **argv )
for( i = 1; i < argc; i++ ) {
/* Hang resources for this processing off this.
*/
VipsObject *thumbnail = VIPS_OBJECT( vips_image_new() );
VipsObject *process = VIPS_OBJECT( vips_image_new() );
if( thumbnail_process( thumbnail, argv[i] ) ) {
if( thumbnail_process( process, argv[i] ) ) {
fprintf( stderr, "%s: unable to thumbnail %s\n",
argv[0], argv[i] );
fprintf( stderr, "%s", vips_error_buffer() );
vips_error_clear();
}
g_object_unref( thumbnail );
g_object_unref( process );
}
vips_shutdown();