all working
though not as quick as hoped :(
This commit is contained in:
John Cupitt
parent
991349c9a7
commit
4b2349323c
@ -9,6 +9,7 @@ libresample_la_SOURCES = \
|
||||
shrink.c \
|
||||
shrinkh.c \
|
||||
shrinkv.c \
|
||||
reduce.c \
|
||||
reduceh.c \
|
||||
reducev.c \
|
||||
interpolate.c \
|
||||
|
||||
@ -268,6 +268,12 @@ vips_interpolate_cubich_interpolate( VipsInterpolate *interpolate,
|
||||
cubich_unsigned_int_tab<unsigned char, UCHAR_MAX>(
|
||||
out, p, bands, cxi );
|
||||
|
||||
//cubich_float_tab<unsigned char>(
|
||||
//out, p, bands, cxf );
|
||||
|
||||
//cubich_notab<unsigned char>(
|
||||
//out, p, bands, x - ix );
|
||||
|
||||
/*
|
||||
|
||||
Handy for benchmarking
|
||||
|
||||
186
libvips/resample/reduce.c
Normal file
186
libvips/resample/reduce.c
Normal file
@ -0,0 +1,186 @@
|
||||
/* 2D reduce ... call reduceh and reducev
|
||||
*
|
||||
* 27/1/16
|
||||
* - from shrink.c
|
||||
*/
|
||||
|
||||
/*
|
||||
|
||||
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., 51 Franklin Street, Fifth Floor, Boston, MA
|
||||
02110-1301 USA
|
||||
|
||||
*/
|
||||
|
||||
/*
|
||||
|
||||
These files are distributed with VIPS - http://www.vips.ecs.soton.ac.uk
|
||||
|
||||
*/
|
||||
|
||||
/*
|
||||
#define DEBUG
|
||||
*/
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include <config.h>
|
||||
#endif /*HAVE_CONFIG_H*/
|
||||
#include <vips/intl.h>
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <math.h>
|
||||
|
||||
#include <vips/vips.h>
|
||||
#include <vips/debug.h>
|
||||
#include <vips/internal.h>
|
||||
|
||||
#include "presample.h"
|
||||
|
||||
typedef struct _VipsReduce {
|
||||
VipsResample parent_instance;
|
||||
|
||||
double xshrink; /* Shrink factors */
|
||||
double yshrink;
|
||||
VipsInterpolate *interpolateh;
|
||||
VipsInterpolate *interpolatev;
|
||||
|
||||
} VipsReduce;
|
||||
|
||||
typedef VipsResampleClass VipsReduceClass;
|
||||
|
||||
G_DEFINE_TYPE( VipsReduce, vips_reduce, VIPS_TYPE_RESAMPLE );
|
||||
|
||||
static int
|
||||
vips_reduce_build( VipsObject *object )
|
||||
{
|
||||
VipsResample *resample = VIPS_RESAMPLE( object );
|
||||
VipsReduce *reduce = (VipsReduce *) object;
|
||||
VipsImage **t = (VipsImage **)
|
||||
vips_object_local_array( object, 3 );
|
||||
|
||||
if( VIPS_OBJECT_CLASS( vips_reduce_parent_class )->build( object ) )
|
||||
return( -1 );
|
||||
|
||||
if( vips_reducev( resample->in, &t[0], reduce->yshrink,
|
||||
"interpolate", reduce->interpolatev, NULL ) ||
|
||||
vips_reduceh( t[0], &t[1], reduce->xshrink,
|
||||
"interpolate", reduce->interpolateh, NULL ) ||
|
||||
vips_image_write( t[1], resample->out ) )
|
||||
return( -1 );
|
||||
|
||||
/*
|
||||
if( vips_reduceh( resample->in, &t[0], reduce->xshrink,
|
||||
"interpolate", reduce->interpolateh, NULL ) ||
|
||||
vips_reducev( t[0], &t[1], reduce->yshrink,
|
||||
"interpolate", reduce->interpolatev, NULL ) ||
|
||||
vips_image_write( t[1], resample->out ) )
|
||||
return( -1 );
|
||||
*/
|
||||
|
||||
return( 0 );
|
||||
}
|
||||
|
||||
static void
|
||||
vips_reduce_class_init( VipsReduceClass *class )
|
||||
{
|
||||
GObjectClass *gobject_class = G_OBJECT_CLASS( class );
|
||||
VipsObjectClass *vobject_class = VIPS_OBJECT_CLASS( class );
|
||||
VipsOperationClass *operation_class = VIPS_OPERATION_CLASS( class );
|
||||
|
||||
VIPS_DEBUG_MSG( "vips_reduce_class_init\n" );
|
||||
|
||||
gobject_class->set_property = vips_object_set_property;
|
||||
gobject_class->get_property = vips_object_get_property;
|
||||
|
||||
vobject_class->nickname = "reduce";
|
||||
vobject_class->description = _( "reduce an image" );
|
||||
vobject_class->build = vips_reduce_build;
|
||||
|
||||
operation_class->flags = VIPS_OPERATION_SEQUENTIAL;
|
||||
|
||||
VIPS_ARG_DOUBLE( class, "xshrink", 8,
|
||||
_( "Xshrink" ),
|
||||
_( "Horizontal shrink factor" ),
|
||||
VIPS_ARGUMENT_REQUIRED_INPUT,
|
||||
G_STRUCT_OFFSET( VipsReduce, xshrink ),
|
||||
1.0, 1000000.0, 1.0 );
|
||||
|
||||
VIPS_ARG_DOUBLE( class, "yshrink", 9,
|
||||
_( "Yshrink" ),
|
||||
_( "Vertical shrink factor" ),
|
||||
VIPS_ARGUMENT_REQUIRED_INPUT,
|
||||
G_STRUCT_OFFSET( VipsReduce, yshrink ),
|
||||
1.0, 1000000.0, 1.0 );
|
||||
|
||||
VIPS_ARG_INTERPOLATE( class, "interpolateh", 10,
|
||||
_( "Interpolateh" ),
|
||||
_( "Interpolate horizontal pixels with this" ),
|
||||
VIPS_ARGUMENT_OPTIONAL_INPUT,
|
||||
G_STRUCT_OFFSET( VipsReduce, interpolateh ) );
|
||||
|
||||
VIPS_ARG_INTERPOLATE( class, "interpolatev", 10,
|
||||
_( "Interpolatev" ),
|
||||
_( "Interpolate vertical pixels with this" ),
|
||||
VIPS_ARGUMENT_OPTIONAL_INPUT,
|
||||
G_STRUCT_OFFSET( VipsReduce, interpolatev ) );
|
||||
|
||||
}
|
||||
|
||||
static void
|
||||
vips_reduce_init( VipsReduce *reduce )
|
||||
{
|
||||
}
|
||||
|
||||
/**
|
||||
* vips_reduce:
|
||||
* @in: input image
|
||||
* @out: output image
|
||||
* @xshrink: horizontal shrink
|
||||
* @shrinke: vertical shrink
|
||||
* @...: %NULL-terminated list of optional named arguments
|
||||
*
|
||||
* Optional arguments:
|
||||
*
|
||||
* @interpolateh: interpolate horizontally with this, default cubich
|
||||
* @interpolatev: interpolate vertically with this, default cubicv
|
||||
*
|
||||
* Reduce @in by a pair of factors with a pair of 1D interpolators. This iwll
|
||||
* not work well for shrink factors greater than two.
|
||||
*
|
||||
* This is a very low-level operation: see vips_resize() for a more
|
||||
* convenient way to resize images.
|
||||
*
|
||||
* This operation does not change xres or yres. The image resolution needs to
|
||||
* be updated by the application.
|
||||
*
|
||||
* See also: vips_resize(), vips_affine().
|
||||
*
|
||||
* Returns: 0 on success, -1 on error
|
||||
*/
|
||||
int
|
||||
vips_reduce( VipsImage *in, VipsImage **out,
|
||||
double xshrink, double yshrink, ... )
|
||||
{
|
||||
va_list ap;
|
||||
int result;
|
||||
|
||||
va_start( ap, yshrink );
|
||||
result = vips_call_split( "reduce", ap, in, out, xshrink, yshrink );
|
||||
va_end( ap );
|
||||
|
||||
return( result );
|
||||
}
|
||||
@ -97,16 +97,15 @@ vips_reduceh_gen( VipsRegion *or, void *seq,
|
||||
|
||||
for( y = 0; y < r->height; y ++ ) {
|
||||
VipsPel *q = VIPS_REGION_ADDR( or, r->left, r->top + y );
|
||||
double X = window_offset + r->left * reduceh->xshrink;
|
||||
double Y = r->top + y;
|
||||
|
||||
int x;
|
||||
|
||||
for( x = 0; x < r->width; x++ ) {
|
||||
double X = window_offset +
|
||||
(r->left + x) * reduceh->xshrink;
|
||||
|
||||
interpolate( reduceh->interpolate, q, ir, X, Y );
|
||||
|
||||
X += reduceh->xshrink;
|
||||
q += ps;
|
||||
}
|
||||
}
|
||||
|
||||
@ -97,15 +97,15 @@ vips_reducev_gen( VipsRegion *or, void *seq,
|
||||
|
||||
for( y = 0; y < r->height; y ++ ) {
|
||||
VipsPel *q = VIPS_REGION_ADDR( or, r->left, r->top + y );
|
||||
double X = r->left;
|
||||
double Y = window_offset + (r->top + y) * reducev->yshrink;
|
||||
|
||||
int x;
|
||||
|
||||
for( x = 0; x < r->width; x++ ) {
|
||||
double X = r->left + x;
|
||||
|
||||
interpolate( reducev->interpolate, q, ir, X, Y );
|
||||
|
||||
X += 1;
|
||||
q += ps;
|
||||
}
|
||||
}
|
||||
|
||||
@ -128,6 +128,8 @@ vips_resample_operation_init( void )
|
||||
vips_shrinkh_get_type();
|
||||
vips_shrinkv_get_type();
|
||||
vips_reduceh_get_type();
|
||||
vips_reducev_get_type();
|
||||
vips_reduce_get_type();
|
||||
vips_quadratic_get_type();
|
||||
vips_affine_get_type();
|
||||
vips_similarity_get_type();
|
||||
|
||||
Loading…
Reference in New Issue
Block a user