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

tag merge as seq

Browse Source
This commit is contained in:
John Cupitt 2017-06-13 14:26:41 +01:00
parent e66891a4df
commit dbf7729aee
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libvips/conversion/insert.c
View File

@ -504,8 +504,6 @@ vips_insert_class_init( VipsInsertClass *class )
_( "insert image @sub into @main at @x, @y" ); _( "insert image @sub into @main at @x, @y" );
vobject_class->build = vips_insert_build; vobject_class->build = vips_insert_build;
/* Can't be UNBUFFERED, we are a SMALLTILE operation.
*/
operation_class->flags = VIPS_OPERATION_SEQUENTIAL; operation_class->flags = VIPS_OPERATION_SEQUENTIAL;
VIPS_ARG_IMAGE( class, "main", 0, VIPS_ARG_IMAGE( class, "main", 0,

5
libvips/mosaicing/merge.c
View File

@ -2,6 +2,8 @@
* *
* 22/5/14 * 22/5/14
* - from vips_merge() * - from vips_merge()
* 13/6/17
* - tag as SEQUENTIAL
*/ */
/* /*
@ -97,6 +99,7 @@ vips_merge_class_init( VipsMergeClass *class )
{ {
GObjectClass *gobject_class = G_OBJECT_CLASS( class ); GObjectClass *gobject_class = G_OBJECT_CLASS( class );
VipsObjectClass *object_class = (VipsObjectClass *) class; VipsObjectClass *object_class = (VipsObjectClass *) class;
VipsOperationClass *operation_class = VIPS_OPERATION_CLASS( class );
gobject_class->set_property = vips_object_set_property; gobject_class->set_property = vips_object_set_property;
gobject_class->get_property = vips_object_get_property; gobject_class->get_property = vips_object_get_property;
@ -105,6 +108,8 @@ vips_merge_class_init( VipsMergeClass *class )
object_class->description = _( "merge two images" ); object_class->description = _( "merge two images" );
object_class->build = vips_merge_build; object_class->build = vips_merge_build;
operation_class->flags = VIPS_OPERATION_SEQUENTIAL;
VIPS_ARG_IMAGE( class, "ref", 1, VIPS_ARG_IMAGE( class, "ref", 1,
_( "Reference" ), _( "Reference" ),
_( "Reference image" ), _( "Reference image" ),