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

done im_gbandjoin()

Browse Source 
but needs testing, also see TODO for notes
This commit is contained in:
John Cupitt 2011-10-27 17:40:39 +01:00
parent a09929ef94
commit 5821f6cb40
9 changed files with 419 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
TODO
View File

@ -1,4 +1,6 @@
- im_gbandjoin() needed by binary
- bandjoin needs testing
see vips_bandjoin() .. ugly!
@ -10,6 +12,19 @@
- vips_image_new_array() needs to go ... replcae with vips_object_array()
see new sizealike/foprmatalike in bandjoin.c ... move these into binary.c
sort out naming
GObject **vips_array_object_get( const GValue *value, int *n );
VipsArea *vips_array_object_new( int n );
- lintra_vec next
get rid of binary.c, instead have a general 'pointwise' class which takes

1
libvips/conversion/Makefile.am
View File

@ -11,6 +11,7 @@ libconversion_la_SOURCES = \
extract.c \
replicate.c \
cast.c \
bandjoin.c \
conver_dispatch.c \
im_black.c \
im_c2amph.c \

354
libvips/conversion/bandjoin.c Normal file
View File

@ -0,0 +1,354 @@
/* VipsBandjoin -- bandwise join of a set of images
*
* Copyright: 1991, N. Dessipris, modification of im_bandjoin()
*
* Author: N. Dessipris
* Written on: 17/04/1991
* Modified on :
* 16/3/94 JC
* - rewritten for partials
* - now in ANSI C
* - now works for any number of input images, except zero
* 7/10/94 JC
* - new IM_NEW()
* 16/4/07
* - fall back to im_copy() for 1 input image
* 17/1/09
* - cleanups
* - gtk-doc
* - im_bandjoin() just calls this
* - works for RAD coding too
* 27/1/10
* - formatalike inputs
* 17/5/11
* - sizealike inputs
* 27/10/11
* - rewrite as a class
*/
/*
This file is part of VIPS.
VIPS is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
/*
These files are distributed with VIPS - http://www.vips.ecs.soton.ac.uk
*/
/*
#define VIPS_DEBUG
*/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif /*HAVE_CONFIG_H*/
#include <vips/intl.h>
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#include <math.h>
#include <vips/vips.h>
#include <vips/internal.h>
#include <vips/debug.h>
#include "conversion.h"
/**
* VipsBandjoin:
* @in: vector of input images
* @out: output image
*
* Join a set of images together, bandwise.
* If the images
* have n and m bands, then the output image will have n + m
* bands, with the first n coming from the first image and the last m
* from the second.
*
* If the images differ in size, the smaller images are enlarged to match the
* larger by adding zero pixels along the bottom and right.
*
* The input images are cast up to the smallest common type (see table
* Smallest common format in
* <link linkend="VIPS-arithmetic">arithmetic</link>).
*
* See also: #VipsInsert.
*/
typedef struct _VipsBandjoin {
VipsConversion parent_instance;
/* The input images.
*/
VipsArea *in;
int *is; /* An int for SIZEOF_PEL() for each image */
} VipsBandjoin;
typedef VipsConversionClass VipsBandjoinClass;
G_DEFINE_TYPE( VipsBandjoin, vips_bandjoin, VIPS_TYPE_CONVERSION );
/* Save a bit of typing.
*/
#define UC VIPS_FORMAT_UCHAR
#define C VIPS_FORMAT_CHAR
#define US VIPS_FORMAT_USHORT
#define S VIPS_FORMAT_SHORT
#define UI VIPS_FORMAT_UINT
#define I VIPS_FORMAT_INT
#define F VIPS_FORMAT_FLOAT
#define X VIPS_FORMAT_COMPLEX
#define D VIPS_FORMAT_DOUBLE
#define DX VIPS_FORMAT_DPCOMPLEX
/* For two integer types, the "largest", ie. one which can represent the
* full range of both.
*/
static VipsBandFormat format_largest[6][6] = {
/* UC C US S UI I */
/* UC */ { UC, S, US, S, UI, I },
/* C */ { S, C, I, S, I, I },
/* US */ { US, I, US, I, UI, I },
/* S */ { S, S, I, S, I, I },
/* UI */ { UI, I, UI, I, UI, I },
/* I */ { I, I, I, I, I, I }
};
/* For two formats, find one which can represent the full range of both.
*/
static VipsBandFormat
vips_format_common( VipsBandFormat a, VipsBandFormat b )
{
if( vips_band_format_iscomplex( a ) ||
vips_band_format_iscomplex( b ) ) {
if( a == VIPS_FORMAT_DPCOMPLEX ||
b == VIPS_FORMAT_DPCOMPLEX )
return( VIPS_FORMAT_DPCOMPLEX );
else
return( VIPS_FORMAT_COMPLEX );
}
else if( vips_band_format_isfloat( a ) ||
vips_band_format_isfloat( b ) ) {
if( a == VIPS_FORMAT_DOUBLE ||
b == VIPS_FORMAT_DOUBLE )
return( VIPS_FORMAT_DOUBLE );
else
return( VIPS_FORMAT_FLOAT );
}
else
return( format_largest[a][b] );
}
static int
vips_formatalike( VipsImage **in, VipsImage **out, int n )
{
int i;
VipsBandFormat format;
g_assert( n >= 1 );
format = in[0]->BandFmt;
for( i = 1; i < n; i++ )
format = vips_format_common( format, in[i]->BandFmt );
for( i = 0; i < n; i++ )
if( vips_cast( in[i], &out[i], format, NULL ) )
return( -1 );
return( 0 );
}
int
vips_sizealike( VipsImage **in, VipsImage **out, int n )
{
int i;
int width_max;
int height_max;
g_assert( n >= 1 );
width_max = in[0]->Xsize;
height_max = in[0]->Ysize;
for( i = 1; i < n; i++ ) {
width_max = VIPS_MAX( width_max, in[i]->Xsize );
height_max = VIPS_MAX( height_max, in[i]->Ysize );
}
for( i = 0; i < n; i++ )
if( vips_embed( in[i], &out[i],
0, 0, width_max, height_max, NULL ) )
return( -1 );
return( 0 );
}
static int
vips_bandjoin_gen( VipsRegion *or, void *seq, void *a, void *b, gboolean *stop )
{
VipsRegion **ir = (VipsRegion **) seq;
VipsBandjoin *bandjoin = (VipsBandjoin *) b;
int n = bandjoin->in->n;
Rect *r = &or->valid;
const int ps = VIPS_IMAGE_SIZEOF_PEL( or->im );
int x, y, z, i;
for( i = 0; i < n; i++ )
if( vips_region_prepare( ir[i], r ) )
return( -1 );
/* Loop over output!
*/
for( y = 0; y < r->height; y++ ) {
PEL *qb;
qb = (PEL *) VIPS_REGION_ADDR( or, r->left, r->top + y );
/* Loop for each input image. Scattered write is faster than
* scattered read.
*/
for( i = 0; i < n; i++ ) {
int k = bandjoin->is[i];
PEL *p;
PEL *q;
p = (PEL *) VIPS_REGION_ADDR( ir[i],
r->left, r->top + y );
q = qb;
for( x = 0; x < r->width; x++ ) {
for( z = 0; z < k; z++ )
q[z] = p[z];
p += z;
q += ps;
}
qb += k;
}
}
return( 0 );
}
static int
vips_bandjoin_build( VipsObject *object )
{
VipsConversion *conversion = VIPS_CONVERSION( object );
VipsBandjoin *bandjoin = (VipsBandjoin *) object;
int n = bandjoin->in->n;
VipsImage **in;
int i;
VipsImage **format;
VipsImage **size;
if( VIPS_OBJECT_CLASS( vips_bandjoin_parent_class )->build( object ) )
return( -1 );
in = bandjoin->in->data;
if( n == 1 )
return( vips_image_write( in[0], conversion->out ) );
if( vips_image_pio_output( conversion->out ) ||
vips_check_coding_known( "VipsBandjoin", in[0] ) )
return( -1 );
for( i = 0; i < n; i++ )
if( vips_image_pio_input( in[i] ) ||
vips_check_coding_same( "VipsBandjoin", in[i], in[0] ) )
return( -1 );
format = (VipsImage **) vips_object_local_array( object, n );
size = (VipsImage **) vips_object_local_array( object, n );
if( vips_formatalike( in, format, n ) ||
vips_sizealike( format, size, n ) )
return( -1 );
in = size;
for( i = 0; i < n; i++ )
bandjoin->is[i] = VIPS_IMAGE_SIZEOF_PEL( in[i] );
if( vips_image_generate( conversion->out,
vips_start_many, vips_bandjoin_gen, vips_stop_many,
in, bandjoin ) )
return( -1 );
return( 0 );
}
static void
vips_bandjoin_class_init( VipsBandjoinClass *class )
{
GObjectClass *gobject_class = G_OBJECT_CLASS( class );
VipsObjectClass *vobject_class = VIPS_OBJECT_CLASS( class );
VIPS_DEBUG_MSG( "vips_bandjoin_class_init\n" );
gobject_class->set_property = vips_object_set_property;
gobject_class->get_property = vips_object_get_property;
vobject_class->nickname = "bandjoin";
vobject_class->description = _( "bandwise join a set of images" );
vobject_class->build = vips_bandjoin_build;
VIPS_ARG_BOXED( class, "in", 0,
_( "Input" ),
_( "Array of input images" ),
VIPS_ARGUMENT_REQUIRED_INPUT,
G_STRUCT_OFFSET( VipsBandjoin, in ),
VIPS_TYPE_ARRAY_IMAGE );
}
static void
vips_bandjoin_init( VipsBandjoin *bandjoin )
{
/* Init our instance fields.
*/
}
int
vips_bandjoin( VipsImage **in, VipsImage **out, int n, ... )
{
va_list ap;
VipsArea *area;
VipsImage **array;
int i;
int result;
area = vips_array_object_new( n );
array = (VipsImage **) area->data;
for( i = 0; i < n; i++ ) {
array[i] = in[i];
g_object_ref( array[i] );
}
va_start( ap, n );
result = vips_call_split( "bandjoin", ap, area, out );
va_end( ap );
vips_area_unref( area );
return( result );
}

2
libvips/conversion/conversion.c
View File

@ -111,6 +111,7 @@ vips_conversion_operation_init( void )
extern GType vips_extract_band_get_type( void );
extern GType vips_replicate_get_type( void );
extern GType vips_cast_get_type( void );
extern GType vips_bandjoin_get_type( void );
vips_copy_get_type();
vips_embed_get_type();
@ -121,5 +122,6 @@ vips_conversion_operation_init( void )
vips_extract_band_get_type();
vips_replicate_get_type();
vips_cast_get_type();
vips_bandjoin_get_type();
}

12
libvips/conversion/embed.c
View File

@ -407,14 +407,6 @@ vips_embed_build( VipsObject *object )
if( VIPS_OBJECT_CLASS( vips_embed_parent_class )->build( object ) )
return( -1 );
if( vips_image_pio_input( embed->in ) ||
vips_image_pio_output( conversion->out ) )
return( -1 );
if( embed->extend < 0 || embed->extend >= VIPS_EXTEND_LAST ) {
vips_error( "VipsEmbed", "%s", _( "unknown VipsExtend" ) );
return( -1 );
}
/* nip can generate this quite often ... just copy.
*/
if( embed->x == 0 &&
@ -423,6 +415,10 @@ vips_embed_build( VipsObject *object )
embed->height == embed->in->Ysize )
return( vips_image_write( embed->in, conversion->out ) );
if( vips_image_pio_input( embed->in ) ||
vips_image_pio_output( conversion->out ) )
return( -1 );
pool = vips_pool_new( "VipsEmbed" );
vips_object_local( object, pool );

1
libvips/include/vips/header.h
View File

@ -215,6 +215,7 @@ int vips_array_double_set( GValue *value, const double *array, int n );
GType vips_array_image_get_type( void );
GObject **vips_array_object_get( const GValue *value, int *n );
int vips_array_object_set( GValue *value, int n );
VipsArea *vips_array_object_new( int n );
void vips_image_set_area( VipsImage *image,
const char *field, VipsCallbackFn free_fn, void *data );

2
libvips/include/vips/object.h
View File

@ -464,6 +464,8 @@ int vips_class_depth( VipsObjectClass *klass );
VipsObjectClass *vips_class_find( const char *basename, const char *nickname );
GType vips_type_find( const char *basename, const char *nickname );
VipsObject **vips_object_local_array( VipsObject *parent, int n );
void vips_object_local_cb( VipsObject *vobject, GObject *gobject );
#define vips_object_local( V, G ) \
(g_signal_connect( V, "close", \

2
libvips/iofuncs/header.c
View File

@ -1774,7 +1774,7 @@ transform_g_string_array_image( const GValue *src_value, GValue *dest_value )
}
GType
vips_array_image( void )
vips_array_image_get_type( void )
{
static GType type = 0;

39
libvips/iofuncs/object.c
View File

@ -1763,7 +1763,7 @@ vips_type_find( const char *basename, const char *nickname )
return( G_OBJECT_CLASS_TYPE( class ) );
}
/* The vips_object_local() macros uses this as its callback.
/* The vips_object_local() macro uses this as its callback.
*/
void
vips_object_local_cb( VipsObject *vobject, GObject *gobject )
@ -1771,6 +1771,43 @@ vips_object_local_cb( VipsObject *vobject, GObject *gobject )
g_object_unref( gobject );
}
typedef struct {
VipsObject **array;
int n;
} VipsObjectLocal;
static void
vips_object_local_array_cb( GObject *parent, VipsObjectLocal *local )
{
int i;
for( i = 0; i < local->n; i++ )
VIPS_FREEF( g_object_unref, local->array[i] );
g_free( local->array );
g_free( local );
}
/* Make an array of VipsObject refs which will be unreffed when parent closes.
*/
VipsObject **
vips_object_local_array( VipsObject *parent, int n )
{
VipsObjectLocal *local;
local = g_new( VipsObjectLocal, 1 );
local->n = n;
/* Make the array 1 too long so we can be sure there's a NULL
* terminator.
*/
local->array = g_new0( VipsObject *, n + 1 );
g_signal_connect( parent, "close",
G_CALLBACK( vips_object_local_array_cb ), local );
return( local->array );
}
static void *
vips_object_print_all_cb( VipsObject *object, int *n )
{