Skip to content

Try the new target API first in VImage::write_to_buffer #2511

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 2, 2021
Merged

Try the new target API first in VImage::write_to_buffer #2511

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 27 additions & 6 deletions cplusplus/VImage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -714,17 +714,38 @@ VImage::write_to_buffer( const char *suffix, void **buf, size_t *size,
const char *operation_name;
VipsBlob *blob;

/* Save with the new target API if we can. Fall back to the older
* mechanism in case the saver we need has not been converted yet.
*
* We need to hide any errors from this first phase.
*/
vips__filename_split8( suffix, filename, option_string );
if( !(operation_name = vips_foreign_find_save_buffer( filename )) ) {

vips_error_freeze();
operation_name = vips_foreign_find_save_target( filename );
vips_error_thaw();

if( operation_name ) {
VTarget target = VTarget::new_to_memory();

call_option_string( operation_name, option_string,
(options ? options : VImage::option())->
set( "in", *this )->
set( "target", target ) );

g_object_get( target.get_target(), "blob", &blob, NULL );
}
else if( (operation_name = vips_foreign_find_save_buffer( filename )) ) {
call_option_string( operation_name, option_string,
(options ? options : VImage::option())->
set( "in", *this )->
set( "buffer", &blob ) );
}
else {
delete options;
throw VError();
}

call_option_string( operation_name, option_string,
(options ? options : VImage::option())->
set( "in", *this )->
set( "buffer", &blob ) );

if( blob ) {
if( buf ) {
*buf = VIPS_AREA( blob )->data;
Expand Down
27 changes: 26 additions & 1 deletion cplusplus/examples/test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
*
* run with:
*
* ./a.out ~/pics/k2.jpg ~/pics/shark.jpg --vips-leak
* VIPS_LEAK=1 ./a.out ~/pics/k2.jpg ~/pics/shark.jpg
* valgrind --leak-check=yes ./a.out ~/pics/k2.jpg ~/pics/shark.jpg
* rm x.tif
*
Expand Down Expand Up @@ -295,6 +295,31 @@ main( int argc, char **argv )
g_free( buf );
}

{
// write to a formatted AVIF memory buffer
printf( "testing formatted AVIF memory write ...\n" );

if( vips_type_find("VipsOperation", "avifsave_target") != 0 ) {
size_t size;
void *buf;

// speed-up test by setting @effort to 0
left.write_to_buffer( ".avif", &buf, &size,
VImage::option()->set( "effort", 0 ) );
printf( "written to memory %p in AVIF format, %zu bytes\n", buf, size );

// load from the formatted memory area
VImage im = VImage::new_from_buffer( buf, size, "" );
printf( "loaded from memory, %d x %d pixel %s image\n",
im.width(), im.height(), im.get_string("heif-compression") );

g_free( buf );
}
else {
printf( "skipped, not compiled against libheif\n" );
}
}

{
// write to a vanilla memory buffer
printf( "testing memory array write ...\n" );
Expand Down
2 changes: 1 addition & 1 deletion libvips/iofuncs/image.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2678,7 +2678,7 @@ vips_image_write_to_file( VipsImage *image, const char *name, ... )
int result;

/* Save with the new target API if we can. Fall back to the older
* mechanism in case the loader we need has not been converted yet.
* mechanism in case the saver we need has not been converted yet.
*
* We need to hide any errors from this first phase.
*/
Expand Down