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

resampler class clean up

Browse Source
This commit is contained in:
Nicolas Robidoux 2009-05-30 15:19:46 +00:00
parent e02836afbe
commit bb4c1b7215
6 changed files with 91 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libsrc/resample/bicubic.cpp
View File

@ -314,8 +314,8 @@ vips_interpolate_bicubic_interpolate( VipsInterpolate *interpolate,
*/
const double sx = x * VIPS_TRANSFORM_SCALE;
const double sy = y * VIPS_TRANSFORM_SCALE;
const int sxi = FLOOR( sx );
const int syi = FLOOR( sy );
const int sxi = FAST_PSEUDO_FLOOR( sx );
const int syi = FAST_PSEUDO_FLOOR( sy );
/* Get index into interpolation table and unscaled integer
* position.

31
libsrc/resample/interpolate.c
View File

@ -48,9 +48,28 @@
#include <dmalloc.h>
#endif /*WITH_DMALLOC*/
/* "fast" floor() ... on my laptop, anyway.
/*
* FAST_PSEUDO_FLOOR is a floor and floorf replacement which has been
* found to be faster on several linux boxes than the library
* version. It returns the floor of its argument unless the argument
* is a negative integer, in which case it returns one less than the
* floor. For example:
*
* FAST_PSEUDO_FLOOR(0.5) = 0
*
* FAST_PSEUDO_FLOOR(0.) = 0
*
* FAST_PSEUDO_FLOOR(-.5) = -1
*
* as expected, but
*
* FAST_PSEUDO_FLOOR(-1.) = -2
*
* The locations of the discontinuities of FAST_PSEUDO_FLOOR are the
* same as floor and floorf; it is just that at negative integers the
* function is discontinuous on the right instead of the left.
*/
#define FLOOR( V ) ((V) >= 0 ? (int)(V) : (int)((V) - 1))
#define FAST_PSEUDO_FLOOR(x) ( (int)(x) - ( (x) < 0. ) )
G_DEFINE_ABSTRACT_TYPE( VipsInterpolate, vips_interpolate, VIPS_TYPE_OBJECT );
@ -173,8 +192,8 @@ vips_interpolate_nearest_interpolate( VipsInterpolate *interpolate,
/* Top left corner we interpolate from.
*/
const int xi = FLOOR( x );
const int yi = FLOOR( y );
const int xi = FAST_PSEUDO_FLOOR( x );
const int yi = FAST_PSEUDO_FLOOR( y );
const PEL *p = (PEL *) IM_REGION_ADDR( in, xi, yi );
@ -341,8 +360,8 @@ vips_interpolate_bilinear_interpolate( VipsInterpolate *interpolate,
*/
const double sx = x * VIPS_TRANSFORM_SCALE;
const double sy = y * VIPS_TRANSFORM_SCALE;
const int sxi = FLOOR( sx );
const int syi = FLOOR( sy );
const int sxi = FAST_PSEUDO_FLOOR( sx );
const int syi = FAST_PSEUDO_FLOOR( sy );
/* Get index into interpolation table and unscaled integer
* position.

33
libsrc/resample/nohalo1.cpp
View File

@ -224,39 +224,6 @@
#include "templates.h"
/*
* FAST_PSEUDO_FLOOR is a floor and floorf replacement which has been
* found to be faster on several linux boxes than the library
* version. It returns the floor of its argument unless the argument
* is a negative integer, in which case it returns one less than the
* floor. For example:
*
* FAST_PSEUDO_FLOOR(0.5) = 0
*
* FAST_PSEUDO_FLOOR(0.) = 0
*
* FAST_PSEUDO_FLOOR(-.5) = -1
*
* as expected, but
*
* FAST_PSEUDO_FLOOR(-1.) = -2
*
* The locations of the discontinuities of FAST_PSEUDO_FLOOR are the
* same as floor and floorf; it is just that at negative integers the
* function is discontinuous on the right instead of the left.
*/
#define FAST_PSEUDO_FLOOR(x) ( (int)(x) - ( (x) < 0. ) )
/*
* FAST_MINMOD is an implementation of the minmod function which only
* needs two conditional moves. (Nicolas: I think that this may be
* the very first two branch minmod.) The product of the two arguments
* and a useful difference involving them are precomputed as far ahead
* of branching as possible.
*/
#define FAST_MINMOD(a,b,ab,abminusaa) \
( (ab)>=0. ? ( (abminusaa)>=0. ? (a) : (b) ) : 0. )
#define VIPS_TYPE_INTERPOLATE_NOHALO1 \
(vips_interpolate_nohalo1_get_type())
#define VIPS_INTERPOLATE_NOHALO1( obj ) \

33
libsrc/resample/nohalo2.cpp
View File

@ -200,39 +200,6 @@
#include "templates.h"
/*
* FAST_PSEUDO_FLOOR is a floor and floorf replacement which has been
* found to be faster on several linux boxes than the library
* version. It returns the floor of its argument unless the argument
* is a negative integer, in which case it returns one less than the
* floor. For example:
*
* FAST_PSEUDO_FLOOR(0.5) = 0
*
* FAST_PSEUDO_FLOOR(0.) = 0
*
* FAST_PSEUDO_FLOOR(-.5) = -1
*
* as expected, but
*
* FAST_PSEUDO_FLOOR(-1.) = -2
*
* The locations of the discontinuities of FAST_PSEUDO_FLOOR are the
* same as floor and floorf; it is just that at negative integers the
* function is discontinuous on the right instead of the left.
*/
#define FAST_PSEUDO_FLOOR(x) ( (int)(x) - ( (x) < 0. ) )
/*
* FAST_MINMOD is an implementation of the minmod function which only
* needs two conditional moves. (Nicolas: I think that this may be
* the very first two branch minmod.) The product of the two arguments
* and a useful difference involving them are also precomputed to keep
* them out of branching way.
*/
#define FAST_MINMOD(a,b,ab,abminusaa) \
( (ab)>=0. ? ( (abminusaa)>=0. ? (a) : (b) ) : 0. )
#define VIPS_TYPE_INTERPOLATE_NOHALO2 \
(vips_interpolate_nohalo2_get_type())
#define VIPS_INTERPOLATE_NOHALO2( obj ) \

33
libsrc/resample/snohalo1.cpp
View File

@ -51,39 +51,6 @@
#include "templates.h"
/*
* FAST_PSEUDO_FLOOR is a floor and floorf replacement which has been
* found to be faster on several linux boxes than the library
* version. It returns the floor of its argument unless the argument
* is a negative integer, in which case it returns one less than the
* floor. For example:
*
* FAST_PSEUDO_FLOOR(0.5) = 0
*
* FAST_PSEUDO_FLOOR(0.) = 0
*
* FAST_PSEUDO_FLOOR(-.5) = -1
*
* as expected, but
*
* FAST_PSEUDO_FLOOR(-1.) = -2
*
* The locations of the discontinuities of FAST_PSEUDO_FLOOR are the
* same as floor and floorf; it is just that at negative integers the
* function is discontinuous on the right instead of the left.
*/
#define FAST_PSEUDO_FLOOR(x) ( (int)(x) - ( (x) < 0. ) )
/*
* FAST_MINMOD is an implementation of the minmod function which only
* needs two conditional moves. (Nicolas: I think that this may be
* the very first two branch minmod.) The product of the two arguments
* and a useful difference involving them are precomputed as far ahead
* of branching as possible.
*/
#define FAST_MINMOD(a,b,ab,abminusaa) \
( (ab)>=0. ? ( (abminusaa)>=0. ? (a) : (b) ) : 0. )
/* Properties.
*/
enum {

81
libsrc/resample/templates.h
View File

@ -27,10 +27,43 @@
*/
/* "fast" floor() ... on my laptop, anyway.
/*
* FAST_PSEUDO_FLOOR is a floor and floorf replacement which has been
* found to be faster on several linux boxes than the library
* version. It returns the floor of its argument unless the argument
* is a negative integer, in which case it returns one less than the
* floor. For example:
*
* FAST_PSEUDO_FLOOR(0.5) = 0
*
* FAST_PSEUDO_FLOOR(0.) = 0
*
* FAST_PSEUDO_FLOOR(-.5) = -1
*
* as expected, but
*
* FAST_PSEUDO_FLOOR(-1.) = -2
*
* The locations of the discontinuities of FAST_PSEUDO_FLOOR are the
* same as floor and floorf; it is just that at negative integers the
* function is discontinuous on the right instead of the left.
*/
#define FLOOR( V ) ((V) >= 0 ? (int)(V) : (int)((V) - 1))
#define FAST_PSEUDO_FLOOR(x) ( (int)(x) - ( (x) < 0. ) )
/*
* FAST_MINMOD is an implementation of the minmod function which only
* needs two conditional moves. (Nicolas: I think that this may be
* the very first two branch minmod.) The product of the two arguments
* and a useful difference involving them are precomputed as far ahead
* of branching as possible.
*/
#define FAST_MINMOD(a,b,ab,abminusaa) \
( (ab)>=0. ? ( (abminusaa)>=0. ? (a) : (b) ) : 0. )
/*
* Comment from Nicolas: I don't understand why the following restrict
* defs cannot be offloaded to config files.
*/
#ifndef restrict
#ifdef __restrict
#define restrict __restrict
@ -43,7 +76,15 @@
#endif
#endif
/* Bilinear for float and double types.
/*
* Various bilinear implementation templates. Note that no clampling
* is used: There is an assumption that the data is such that
* over/underflow is not an issue:
*/
/*
* Bilinear interpolation for float and double types. The first four
* inputs are weights, the last four are the corresponding pixel
* values:
*/
template <typename T> static T inline
bilinear_fptypes(
@ -65,7 +106,8 @@ bilinear_fptypes(
return( newval );
}
/* Interpolate for signed integer types.
/*
* Bilinear interpolation for signed integer types:
*/
template <typename T> static T inline
bilinear_withsign(
@ -93,7 +135,8 @@ bilinear_withsign(
return( newval );
}
/* Interpolate for unsigned integer types.
/*
* Bilinear Interpolation for unsigned integer types:
*/
template <typename T> static T inline
bilinear_nosign(
@ -116,6 +159,10 @@ bilinear_nosign(
return( newval );
}
/*
* Bicubic (Catmull-Rom) interpolation templates:
*/
/* Fixed-point integer bicubic, used for 8 and 16-bit types.
*/
template <typename T> static int inline
@ -124,7 +171,7 @@ bicubic_int(
const T dos_one, const T dos_two, const T dos_thr, const T dos_fou,
const T tre_one, const T tre_two, const T tre_thr, const T tre_fou,
const T qua_one, const T qua_two, const T qua_thr, const T qua_fou,
const int *cx, const int *cy )
const int* restrict cx, const int* restrict cy )
{
const int r0 =
(cx[0] * uno_one +
@ -164,24 +211,24 @@ bicubic_float(
const T dos_one, const T dos_two, const T dos_thr, const T dos_fou,
const T tre_one, const T tre_two, const T tre_thr, const T tre_fou,
const T qua_one, const T qua_two, const T qua_thr, const T qua_fou,
const double *cx, const double *cy )
const double* restrict cx, const double* restrict cy )
{
return(
cy[0] * (cx[0] * uno_one +
cx[1] * uno_two +
cx[2] * uno_thr +
cx[3] * uno_fou) +
cx[3] * uno_fou)
+
cy[1] * (cx[0] * dos_one +
cx[1] * dos_two +
cx[2] * dos_thr +
cx[3] * dos_fou) +
cx[3] * dos_fou)
+
cy[2] * (cx[0] * tre_one +
cx[1] * tre_two +
cx[2] * tre_thr +
cx[3] * tre_fou) +
cx[3] * tre_fou)
+
cy[3] * (cx[0] * qua_one +
cx[1] * qua_two +
cx[2] * qua_thr +
@ -195,14 +242,14 @@ bicubic_float(
static void inline
calculate_coefficients_catmull( const double x, double c[4] )
{
const double dx = 1.f - x;
const double dx = 1. - x;
const double x2 = dx * x;
const double mx2 = -.5f * x2;
const double mx2 = -.5 * x2;
g_assert( x >= 0 && x <= 1 );
c[0] = mx2 * dx;
c[1] = x2 * (-1.5f * x + 1.f) + dx;
c[2] = 1.f - (mx2 + c[1]);
c[1] = x2 * (-1.5 * x + 1.) + dx;
c[2] = 1. - (mx2 + c[1]);
c[3] = mx2 * x;
}