diff --git a/ChangeLog b/ChangeLog index b714fb2b..762bad9f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,7 @@ - fix openslide read: always return png-style rgba, im_argb2rgba() becomes a NOP - cast to unsigned int now removes <0 values +- vips7 interface to openslide now supports :,level,associated options 13/3/12 started 7.28.2 - xres/yres tiffsave args were broken diff --git a/libvips/deprecated/im_openslide2vips.c b/libvips/deprecated/im_openslide2vips.c index 4a2ccf88..f4d9e120 100644 --- a/libvips/deprecated/im_openslide2vips.c +++ b/libvips/deprecated/im_openslide2vips.c @@ -2,6 +2,8 @@ * * 17/12/11 * - just a stub + * 11/4/12 + * - support :level,associated in filenames */ /* @@ -49,11 +51,28 @@ #include static int -im_openslide2vips( const char *filename, IMAGE *out ) +im_openslide2vips( const char *name, IMAGE *out ) { + char filename[FILENAME_MAX]; + char mode[FILENAME_MAX]; + char *p, *q; + char *associated; + int level; VipsImage *t; - if( vips_openslideload( filename, &t, NULL ) ) + im_filename_split( name, filename, mode ); + level = 1; + associated = NULL; + p = &mode[0]; + if( (q = im_getnextoption( &p )) ) + level = atoi( q ); + if( (q = im_getnextoption( &p )) ) + associated = q; + + if( vips_openslideload( filename, &t, + "level", level, + "associated", associated, + NULL ) ) return( -1 ); if( vips_image_write( t, out ) ) { g_object_unref( t ); diff --git a/python/try4.py b/python/try4.py new file mode 100755 index 00000000..35a20724 --- /dev/null +++ b/python/try4.py @@ -0,0 +1,12 @@ +#!/usr/bin/python + +import sys +from vips8 import vips +from gi.repository import Vips + +a = vips.Image(sys.argv[1]) +b = vips.Image(sys.argv[2]) + +c = a.join(b, Vips.Direction.HORIZONTAL, expand = True) + +c.write_to_file(sys.argv[3])