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

rename _!PIXEL etc. to help bindings

Browse Source 
ruby gobject-introspection hates numbers at the start of _ separated
names
This commit is contained in:
John Cupitt 2015-01-07 14:22:13 +00:00
parent 6f101ae86b
commit eda4ed64f1
5 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -6,6 +6,8 @@
- display param default and range in usage - display param default and range in usage
- better docs - better docs
- more tests - more tests
- renamed VIPS_FOREIGN_DZ_DEPTH_1 as VIPS_FOREIGN_DZ_DEPTH_ONE etc. to help
bindings
24/12/14 started 7.42.1 24/12/14 started 7.42.1
- add gobject-2.0 to Requires: in vips and vips-cpp .pc files - add gobject-2.0 to Requires: in vips and vips-cpp .pc files

2
libvips/deprecated/im_vips2dz.c
View File

@ -59,7 +59,7 @@ im_vips2dz( IMAGE *in, const char *filename )
char *suffix = ".jpeg"; char *suffix = ".jpeg";
int overlap = 0; int overlap = 0;
int tile_size = 256; int tile_size = 256;
VipsForeignDzDepth depth = VIPS_FOREIGN_DZ_DEPTH_1PIXEL; VipsForeignDzDepth depth = VIPS_FOREIGN_DZ_DEPTH_ONEPIXEL;
gboolean centre = FALSE; gboolean centre = FALSE;
VipsAngle angle = VIPS_ANGLE_D0; VipsAngle angle = VIPS_ANGLE_D0;

14
libvips/foreign/dzsave.c
View File

@ -542,15 +542,15 @@ pyramid_build( VipsForeignSaveDz *dz, Layer *above,
} }
switch( dz->depth ) { switch( dz->depth ) {
case VIPS_FOREIGN_DZ_DEPTH_1PIXEL: case VIPS_FOREIGN_DZ_DEPTH_ONEPIXEL:
limit = 1; limit = 1;
break; break;
case VIPS_FOREIGN_DZ_DEPTH_1TILE: case VIPS_FOREIGN_DZ_DEPTH_ONETILE:
limit = dz->tile_size; limit = dz->tile_size;
break; break;
case VIPS_FOREIGN_DZ_DEPTH_1: case VIPS_FOREIGN_DZ_DEPTH_ONE:
limit = VIPS_MAX( width, height ); limit = VIPS_MAX( width, height );
break; break;
@ -1603,11 +1603,11 @@ vips_foreign_save_dz_build( VipsObject *object )
*/ */
if( dz->layout == VIPS_FOREIGN_DZ_LAYOUT_DZ ) { if( dz->layout == VIPS_FOREIGN_DZ_LAYOUT_DZ ) {
if( !vips_object_argument_isset( object, "depth" ) ) if( !vips_object_argument_isset( object, "depth" ) )
dz->depth = VIPS_FOREIGN_DZ_DEPTH_1PIXEL; dz->depth = VIPS_FOREIGN_DZ_DEPTH_ONEPIXEL;
} }
else else
if( !vips_object_argument_isset( object, "depth" ) ) if( !vips_object_argument_isset( object, "depth" ) )
dz->depth = VIPS_FOREIGN_DZ_DEPTH_1TILE; dz->depth = VIPS_FOREIGN_DZ_DEPTH_ONETILE;
if( VIPS_OBJECT_CLASS( vips_foreign_save_dz_parent_class )-> if( VIPS_OBJECT_CLASS( vips_foreign_save_dz_parent_class )->
build( object ) ) build( object ) )
@ -1949,7 +1949,7 @@ vips_foreign_save_dz_class_init( VipsForeignSaveDzClass *class )
VIPS_ARGUMENT_OPTIONAL_INPUT, VIPS_ARGUMENT_OPTIONAL_INPUT,
G_STRUCT_OFFSET( VipsForeignSaveDz, depth ), G_STRUCT_OFFSET( VipsForeignSaveDz, depth ),
VIPS_TYPE_FOREIGN_DZ_DEPTH, VIPS_TYPE_FOREIGN_DZ_DEPTH,
VIPS_FOREIGN_DZ_DEPTH_1PIXEL ); VIPS_FOREIGN_DZ_DEPTH_ONEPIXEL );
VIPS_ARG_BOOL( class, "centre", 13, VIPS_ARG_BOOL( class, "centre", 13,
_( "Center" ), _( "Center" ),
@ -2021,7 +2021,7 @@ vips_foreign_save_dz_init( VipsForeignSaveDz *dz )
dz->overlap = 1; dz->overlap = 1;
dz->tile_size = 256; dz->tile_size = 256;
dz->tile_count = 0; dz->tile_count = 0;
dz->depth = VIPS_FOREIGN_DZ_DEPTH_1PIXEL; dz->depth = VIPS_FOREIGN_DZ_DEPTH_ONEPIXEL;
dz->angle = VIPS_ANGLE_D0; dz->angle = VIPS_ANGLE_D0;
dz->container = VIPS_FOREIGN_DZ_CONTAINER_FS; dz->container = VIPS_FOREIGN_DZ_CONTAINER_FS;
} }

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

@ -496,16 +496,16 @@ typedef enum {
/** /**
* VipsForeignDzDepth: * VipsForeignDzDepth:
* @VIPS_FOREIGN_DZ_DEPTH_1PIXEL: create layers down to 1x1 pixel * @VIPS_FOREIGN_DZ_DEPTH_ONEPIXEL: create layers down to 1x1 pixel
* @VIPS_FOREIGN_DZ_DEPTH_1TILE: create layers down to 1x1 tile * @VIPS_FOREIGN_DZ_DEPTH_ONETILE: create layers down to 1x1 tile
* @VIPS_FOREIGN_DZ_DEPTH_1: only create a single layer * @VIPS_FOREIGN_DZ_DEPTH_ONE: only create a single layer
* *
* How many pyramid layers to create. * How many pyramid layers to create.
*/ */
typedef enum { typedef enum {
VIPS_FOREIGN_DZ_DEPTH_1PIXEL, VIPS_FOREIGN_DZ_DEPTH_ONEPIXEL,
VIPS_FOREIGN_DZ_DEPTH_1TILE, VIPS_FOREIGN_DZ_DEPTH_ONETILE,
VIPS_FOREIGN_DZ_DEPTH_1, VIPS_FOREIGN_DZ_DEPTH_ONE,
VIPS_FOREIGN_DZ_DEPTH_LAST VIPS_FOREIGN_DZ_DEPTH_LAST
} VipsForeignDzDepth; } VipsForeignDzDepth;

6
libvips/iofuncs/enumtypes.c
View File

@ -152,9 +152,9 @@ vips_foreign_dz_depth_get_type( void )
if( etype == 0 ) { if( etype == 0 ) {
static const GEnumValue values[] = { static const GEnumValue values[] = {
{VIPS_FOREIGN_DZ_DEPTH_1PIXEL, "VIPS_FOREIGN_DZ_DEPTH_1PIXEL", "1pixel"}, {VIPS_FOREIGN_DZ_DEPTH_ONEPIXEL, "VIPS_FOREIGN_DZ_DEPTH_ONEPIXEL", "onepixel"},
{VIPS_FOREIGN_DZ_DEPTH_1TILE, "VIPS_FOREIGN_DZ_DEPTH_1TILE", "1tile"}, {VIPS_FOREIGN_DZ_DEPTH_ONETILE, "VIPS_FOREIGN_DZ_DEPTH_ONETILE", "onetile"},
{VIPS_FOREIGN_DZ_DEPTH_1, "VIPS_FOREIGN_DZ_DEPTH_1", "1"}, {VIPS_FOREIGN_DZ_DEPTH_ONE, "VIPS_FOREIGN_DZ_DEPTH_ONE", "one"},
{VIPS_FOREIGN_DZ_DEPTH_LAST, "VIPS_FOREIGN_DZ_DEPTH_LAST", "last"}, {VIPS_FOREIGN_DZ_DEPTH_LAST, "VIPS_FOREIGN_DZ_DEPTH_LAST", "last"},
{0, NULL, NULL} {0, NULL, NULL}
}; };