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

more fixes for im_add

Browse Source 
still getting some dangling region refs though argh
This commit is contained in:
John Cupitt 2011-05-23 18:19:20 +01:00
parent 8036dda5b7
commit 9515c5cb06
4 changed files with 35 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
TODO
View File

@ -2,7 +2,10 @@
$ vips im_add k2.v babe.v out.v
egV
VIPS:ERROR:image.c:300:vips_image_finalize: assertion failed:
(!image->regions)

2
libvips/iofuncs/image.c
View File

@ -31,8 +31,8 @@
*/
/*
#define VIPS_DEBUG
*/
#define VIPS_DEBUG
#ifdef HAVE_CONFIG_H
#include <config.h>

2
libvips/iofuncs/object.c
View File

@ -30,10 +30,10 @@
*/
/*
*/
#define DEBUG
#define VIPS_DEBUG
#define DEBUG_REF
*/
#ifdef HAVE_CONFIG_H
#include <config.h>

38
libvips/iofuncs/operation.c
View File

@ -28,8 +28,8 @@
*/
/*
#define VIPS_DEBUG
*/
#define VIPS_DEBUG
#ifdef HAVE_CONFIG_H
#include <config.h>
@ -294,24 +294,44 @@ vips_operation_get_valist( VipsOperation *operation, va_list ap )
VIPS_ARGUMENT_FOR_ALL( operation,
pspec, argument_class, argument_instance ) {
if( (argument_class->flags & VIPS_ARGUMENT_REQUIRED) &&
(argument_class->flags & VIPS_ARGUMENT_OUTPUT) ) {
void *arg;
(argument_class->flags & VIPS_ARGUMENT_INPUT) ) {
GValue value = { 0 };
char *msg = NULL;
arg = va_arg( ap, void * );
/* Collect the arg from valist to eat it up, but don't
* do anything with it.
*/
G_VALUE_COLLECT_INIT( &value,
G_PARAM_SPEC_VALUE_TYPE( pspec ), ap, 0, &msg );
g_value_unset( &value );
}
else if( (argument_class->flags & VIPS_ARGUMENT_REQUIRED) &&
(argument_class->flags & VIPS_ARGUMENT_OUTPUT) ) {
void **arg;
arg = va_arg( ap, void ** );
if( !argument_instance->assigned )
continue;
g_object_get( G_OBJECT( operation ),
g_param_spec_get_name( pspec ), arg, NULL );
#ifdef VIPS_DEBUG
printf( "\twriting arg %s to %p\n",
printf( "\twriting %s to %p\n",
g_param_spec_get_name( pspec ), arg );
#endif /*VIPS_DEBUG */
/* TODO ... actually do the write.
g_object_get( G_OBJECT( operation ),
g_param_spec_get_name( pspec ), arg, NULL );
/* If the pspec is an object, that will up the ref
* count. We want to hand over the ref, so we have to
* knock it down again.
*/
if( G_IS_PARAM_SPEC_OBJECT( pspec ) ) {
GObject *object;
object = *((GObject **) arg);
g_object_unref( object );
}
}
} VIPS_ARGUMENT_FOR_ALL_END
}