delete nohalo1, mv nohalo2 to nohalo, move snohalo1 to snohalo
This commit is contained in:
Nicolas Robidoux
parent
e80140c817
commit
415ccb5c08
|
|
@ -2,20 +2,18 @@
|
|||
if ENABLE_CXX
|
||||
C_SOURCES = \
|
||||
bicubic.cpp \
|
||||
nohalo.cpp \
|
||||
lbb.cpp \
|
||||
nohalo1.cpp \
|
||||
snohalo1.cpp \
|
||||
nohalo2.cpp \
|
||||
snohalo.cpp \
|
||||
templates.h
|
||||
C_DIST =
|
||||
else
|
||||
C_SOURCES =
|
||||
C_DIST = \
|
||||
bicubic.cpp \
|
||||
nohalo.cpp \
|
||||
lbb.cpp \
|
||||
nohalo1.cpp \
|
||||
snohalo1.cpp \
|
||||
nohalo2.cpp \
|
||||
snohalo.cpp \
|
||||
templates.h
|
||||
endif
|
||||
|
||||
|
|
|
|||
|
|
@ -507,20 +507,18 @@ void
|
|||
vips__interpolate_init( void )
|
||||
{
|
||||
extern GType vips_interpolate_bicubic_get_type( void );
|
||||
extern GType vips_interpolate_nohalo_get_type( void );
|
||||
extern GType vips_interpolate_lbb_get_type( void );
|
||||
extern GType vips_interpolate_nohalo1_get_type( void );
|
||||
extern GType vips_interpolate_snohalo1_get_type( void );
|
||||
extern GType vips_interpolate_nohalo2_get_type( void );
|
||||
extern GType vips_interpolate_snohalo_get_type( void );
|
||||
|
||||
vips_interpolate_nearest_get_type();
|
||||
vips_interpolate_bilinear_get_type();
|
||||
|
||||
#ifdef ENABLE_CXX
|
||||
vips_interpolate_bicubic_get_type();
|
||||
vips_interpolate_nohalo_get_type();
|
||||
vips_interpolate_lbb_get_type();
|
||||
vips_interpolate_nohalo1_get_type();
|
||||
vips_interpolate_snohalo1_get_type();
|
||||
vips_interpolate_nohalo2_get_type();
|
||||
vips_interpolate_snohalo_get_type();
|
||||
#endif /*ENABLE_CXX*/
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,6 @@
|
|||
/* nohalo level 1 subdivision followed by LBB interpolation
|
||||
/* Nohalo (one level) subdivision followed by LBB (Locally Bounded Bicubic) interpolation
|
||||
*
|
||||
* N. Robidoux and C. Racette based on code by N. Robidoux 05/10--05/16
|
||||
*
|
||||
* N. Robidoux based on code by N. Robidoux and J. Cupitt 01/4-29/5/09
|
||||
*
|
||||
|
|
@ -49,7 +51,7 @@
|
|||
*/
|
||||
|
||||
/*
|
||||
* TO DO: RENAME AS NOHALO, REDO THE COMMENTS, EXPLAIN CODE BETTER.
|
||||
* TO DO: REDO THE COMMENTS, EXPLAIN CODE BETTER.
|
||||
*/
|
||||
|
||||
/*
|
||||
|
|
@ -57,30 +59,9 @@
|
|||
* NOHALO RESAMPLER
|
||||
* ================
|
||||
*
|
||||
* "Nohalo" is a family of parameterized resamplers with a mission:
|
||||
* smoothly straightening oblique lines without undesirable
|
||||
* side-effects. In particular, without much blurring and with
|
||||
* absolutely no added haloing.
|
||||
*
|
||||
* The key parameter, which may be described as a "quality" parameter,
|
||||
* is an integer which specifies the number of "levels" of binary
|
||||
* subdivision which are performed. level = 0 can be thought of as
|
||||
* being plain vanilla bilinear resampling; level = 1 is then the
|
||||
* first "non-classical" method of the familiy.
|
||||
*
|
||||
* Although it increases computational cost, additional levels
|
||||
* increase the quality of the resampled pixel value unless the
|
||||
* resampled location happens to be exactly where a subdivided grid
|
||||
* point (for this level) is located, in which case further levels do
|
||||
* not change the answer, and consequently do not increase its
|
||||
* quality.
|
||||
*
|
||||
* ==========================================================
|
||||
* THIS CODE ONLY IMPLEMENTS THE SECOND LOWEST QUALITY NOHALO
|
||||
* ==========================================================
|
||||
*
|
||||
* This code implement nohalo for (quality) level = 2. Nohalo for
|
||||
* higher quality levels will be implemented later.
|
||||
* "Nohalo" is a resampler with a mission: smoothly straightening
|
||||
* oblique lines without undesirable side-effects. In particular,
|
||||
* without much blurring and with absolutely no added haloing.
|
||||
*
|
||||
* Key properties:
|
||||
*
|
||||
|
|
@ -205,42 +186,36 @@
|
|||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
/*
|
||||
* THIS CODE ALMOST CERTAINLY HAS A SMALL BUG. Nicolas Robidoux May
|
||||
* 31, 2009.
|
||||
*/
|
||||
|
||||
|
||||
#include <vips/vips.h>
|
||||
#include <vips/internal.h>
|
||||
|
||||
#include "templates.h"
|
||||
|
||||
#define VIPS_TYPE_INTERPOLATE_NOHALO2 \
|
||||
(vips_interpolate_nohalo2_get_type())
|
||||
#define VIPS_INTERPOLATE_NOHALO2( obj ) \
|
||||
#define VIPS_TYPE_INTERPOLATE_NOHALO \
|
||||
(vips_interpolate_nohalo_get_type())
|
||||
#define VIPS_INTERPOLATE_NOHALO( obj ) \
|
||||
(G_TYPE_CHECK_INSTANCE_CAST( (obj), \
|
||||
VIPS_TYPE_INTERPOLATE_NOHALO2, VipsInterpolateNohalo2 ))
|
||||
#define VIPS_INTERPOLATE_NOHALO2_CLASS( klass ) \
|
||||
VIPS_TYPE_INTERPOLATE_NOHALO, VipsInterpolateNohalo ))
|
||||
#define VIPS_INTERPOLATE_NOHALO_CLASS( klass ) \
|
||||
(G_TYPE_CHECK_CLASS_CAST( (klass), \
|
||||
VIPS_TYPE_INTERPOLATE_NOHALO2, VipsInterpolateNohalo2Class))
|
||||
#define VIPS_IS_INTERPOLATE_NOHALO2( obj ) \
|
||||
(G_TYPE_CHECK_INSTANCE_TYPE( (obj), VIPS_TYPE_INTERPOLATE_NOHALO2 ))
|
||||
#define VIPS_IS_INTERPOLATE_NOHALO2_CLASS( klass ) \
|
||||
(G_TYPE_CHECK_CLASS_TYPE( (klass), VIPS_TYPE_INTERPOLATE_NOHALO2 ))
|
||||
#define VIPS_INTERPOLATE_NOHALO2_GET_CLASS( obj ) \
|
||||
VIPS_TYPE_INTERPOLATE_NOHALO, VipsInterpolateNohaloClass))
|
||||
#define VIPS_IS_INTERPOLATE_NOHALO( obj ) \
|
||||
(G_TYPE_CHECK_INSTANCE_TYPE( (obj), VIPS_TYPE_INTERPOLATE_NOHALO ))
|
||||
#define VIPS_IS_INTERPOLATE_NOHALO_CLASS( klass ) \
|
||||
(G_TYPE_CHECK_CLASS_TYPE( (klass), VIPS_TYPE_INTERPOLATE_NOHALO ))
|
||||
#define VIPS_INTERPOLATE_NOHALO_GET_CLASS( obj ) \
|
||||
(G_TYPE_INSTANCE_GET_CLASS( (obj), \
|
||||
VIPS_TYPE_INTERPOLATE_NOHALO2, VipsInterpolateNohalo2Class ))
|
||||
VIPS_TYPE_INTERPOLATE_NOHALO, VipsInterpolateNohaloClass ))
|
||||
|
||||
typedef struct _VipsInterpolateNohalo2 {
|
||||
typedef struct _VipsInterpolateNohalo {
|
||||
VipsInterpolate parent_object;
|
||||
|
||||
} VipsInterpolateNohalo2;
|
||||
} VipsInterpolateNohalo;
|
||||
|
||||
typedef struct _VipsInterpolateNohalo2Class {
|
||||
typedef struct _VipsInterpolateNohaloClass {
|
||||
VipsInterpolateClass parent_class;
|
||||
|
||||
} VipsInterpolateNohalo2Class;
|
||||
} VipsInterpolateNohaloClass;
|
||||
|
||||
/*
|
||||
* MINMOD is an implementation of the minmod function which only needs
|
||||
|
|
@ -284,7 +259,7 @@ typedef struct _VipsInterpolateNohalo2Class {
|
|||
( (a_times_b)>=0. ? 1. : 0. ) * ( (a_times_b)<(a_times_a) ? (b) : (a) )
|
||||
|
||||
static void inline
|
||||
nohalo_step1 (const double uno_two,
|
||||
nohalo_subdivision (const double uno_two,
|
||||
const double uno_thr,
|
||||
const double uno_fou,
|
||||
const double dos_one,
|
||||
|
|
@ -323,9 +298,9 @@ nohalo_step1 (const double uno_two,
|
|||
double* restrict qua_fou_1)
|
||||
{
|
||||
/*
|
||||
* nohalo_step1 calculates the missing ten double density pixel
|
||||
* values, and also returns the "already known" two, so that the
|
||||
* twelve values which make up the stencil of Nohalo level 1 are
|
||||
* nohalo_subdivision calculates the missing ten double density
|
||||
* pixel values, and also returns the "already known" two, so that
|
||||
* the twelve values which make up the stencil of Nohalo level 1 are
|
||||
* available.
|
||||
*/
|
||||
/*
|
||||
|
|
@ -1085,9 +1060,9 @@ lbbicubic( const double c00,
|
|||
* this would allow code comments!---but we can't figure a clean way
|
||||
* to do it.
|
||||
*/
|
||||
#define NOHALO2_INTER( inter ) \
|
||||
#define NOHALO_INTER( inter ) \
|
||||
template <typename T> static void inline \
|
||||
nohalo2_ ## inter( PEL* restrict pout, \
|
||||
nohalo_ ## inter( PEL* restrict pout, \
|
||||
const PEL* restrict pin, \
|
||||
const int bands, \
|
||||
const int lskip, \
|
||||
|
|
@ -1233,7 +1208,7 @@ lbbicubic( const double c00,
|
|||
double tre_one, tre_two, tre_thr, tre_fou; \
|
||||
double qua_one, qua_two, qua_thr, qua_fou; \
|
||||
\
|
||||
nohalo_step1( in[ uno_two_shift ], \
|
||||
nohalo_subdivision( in[ uno_two_shift ], \
|
||||
in[ uno_thr_shift ], \
|
||||
in[ uno_fou_shift ], \
|
||||
in[ dos_one_shift ], \
|
||||
|
|
@ -1271,7 +1246,6 @@ lbbicubic( const double c00,
|
|||
&qua_thr, \
|
||||
&qua_fou ); \
|
||||
\
|
||||
\
|
||||
const double double_result = \
|
||||
lbbicubic( c00, \
|
||||
c10, \
|
||||
|
|
@ -1314,12 +1288,12 @@ lbbicubic( const double c00,
|
|||
}
|
||||
|
||||
|
||||
NOHALO2_INTER( fptypes )
|
||||
NOHALO2_INTER( withsign )
|
||||
NOHALO2_INTER( nosign )
|
||||
NOHALO_INTER( fptypes )
|
||||
NOHALO_INTER( withsign )
|
||||
NOHALO_INTER( nosign )
|
||||
|
||||
#define CALL( T, inter ) \
|
||||
nohalo2_ ## inter<T>( out, \
|
||||
nohalo_ ## inter<T>( out, \
|
||||
p, \
|
||||
bands, \
|
||||
lskip, \
|
||||
|
|
@ -1330,12 +1304,12 @@ NOHALO2_INTER( nosign )
|
|||
* We need C linkage:
|
||||
*/
|
||||
extern "C" {
|
||||
G_DEFINE_TYPE( VipsInterpolateNohalo2, vips_interpolate_nohalo2,
|
||||
G_DEFINE_TYPE( VipsInterpolateNohalo, vips_interpolate_nohalo,
|
||||
VIPS_TYPE_INTERPOLATE );
|
||||
}
|
||||
|
||||
static void
|
||||
vips_interpolate_nohalo2_interpolate( VipsInterpolate* restrict interpolate,
|
||||
vips_interpolate_nohalo_interpolate( VipsInterpolate* restrict interpolate,
|
||||
PEL* restrict out,
|
||||
REGION* restrict in,
|
||||
double absolute_x,
|
||||
|
|
@ -1424,7 +1398,7 @@ vips_interpolate_nohalo2_interpolate( VipsInterpolate* restrict interpolate,
|
|||
}
|
||||
|
||||
static void
|
||||
vips_interpolate_nohalo2_class_init( VipsInterpolateNohalo2Class *klass )
|
||||
vips_interpolate_nohalo_class_init( VipsInterpolateNohaloClass *klass )
|
||||
{
|
||||
GObjectClass *gobject_class = G_OBJECT_CLASS( klass );
|
||||
VipsObjectClass *object_class = VIPS_OBJECT_CLASS( klass );
|
||||
|
|
@ -1433,15 +1407,15 @@ vips_interpolate_nohalo2_class_init( VipsInterpolateNohalo2Class *klass )
|
|||
gobject_class->set_property = vips_object_set_property;
|
||||
gobject_class->get_property = vips_object_get_property;
|
||||
|
||||
object_class->nickname = "nohalo2";
|
||||
object_class->description = _( "Smoother and more edge-enhancing nohalo1" );
|
||||
object_class->nickname = "nohalo";
|
||||
object_class->description = _( "Edge sharpening resampler with halo reduction" );
|
||||
|
||||
interpolate_class->interpolate = vips_interpolate_nohalo2_interpolate;
|
||||
interpolate_class->interpolate = vips_interpolate_nohalo_interpolate;
|
||||
interpolate_class->window_size = 5;
|
||||
interpolate_class->window_offset = 2;
|
||||
}
|
||||
|
||||
static void
|
||||
vips_interpolate_nohalo2_init( VipsInterpolateNohalo2 *nohalo2 )
|
||||
vips_interpolate_nohalo_init( VipsInterpolateNohalo *nohalo )
|
||||
{
|
||||
}
|
||||
|
|
@ -1,666 +0,0 @@
|
|||
/* nohalo level 1 interpolator
|
||||
*
|
||||
* Hacked for vips by J. Cupitt, 20/1/09
|
||||
*
|
||||
* Rename as nohalo1 and move "restrict" support to configure by
|
||||
* J. Cupitt, 16/3/09
|
||||
*
|
||||
* Tweaks by N. Robidoux and J. Cupitt 4-17/3/09
|
||||
*
|
||||
* Tweaks by N. Robidoux 25-28/5/09
|
||||
*/
|
||||
|
||||
/*
|
||||
|
||||
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
|
||||
|
||||
*/
|
||||
|
||||
/*
|
||||
* 2009 (c) Nicolas Robidoux
|
||||
*
|
||||
* Nicolas thanks John Cupitt, Geert Jordaens, Øyvind Kolås, Ralf
|
||||
* Meyer, Minglun Gong, and Sven Neumann for useful comments and code.
|
||||
*
|
||||
* Nicolas Robidoux's research on Nohalo funded in part by an NSERC
|
||||
* (National Science and Engineering Research Council of Canada)
|
||||
* Discovery Grant.
|
||||
*/
|
||||
|
||||
/*
|
||||
* ================
|
||||
* NOHALO RESAMPLER
|
||||
* ================
|
||||
*
|
||||
* "Nohalo" is a family of parameterized resamplers with a mission:
|
||||
* smoothly straightening oblique lines without undesirable
|
||||
* side-effects. In particular, without much blurring and with
|
||||
* absolutely no added haloing.
|
||||
*
|
||||
* The key parameter, which may be described as a "quality" parameter,
|
||||
* is an integer which specifies the number of "levels" of binary
|
||||
* subdivision which are performed. level = 0 can be thought of as
|
||||
* being plain vanilla bilinear resampling; level = 1 is then the
|
||||
* first "non-classical" method of the familiy.
|
||||
*
|
||||
* Although it increases computational cost, additional levels
|
||||
* increase the quality of the resampled pixel value unless the
|
||||
* resampled location happens to be exactly where a subdivided grid
|
||||
* point (for this level) is located, in which case further levels do
|
||||
* not change the answer, and consequently do not increase its
|
||||
* quality.
|
||||
*
|
||||
* ===================================================
|
||||
* THIS CODE ONLY IMPLEMENTS THE LOWEST QUALITY NOHALO
|
||||
* ===================================================
|
||||
*
|
||||
* This code implement nohalo for (quality) level = 1. Nohalo for
|
||||
* higher quality levels will be implemented later.
|
||||
*
|
||||
* Key properties:
|
||||
*
|
||||
* =======================
|
||||
* Nohalo is interpolatory
|
||||
* =======================
|
||||
*
|
||||
* That is, nohalo preserves point values: If asked for the value at
|
||||
* the center of an input pixel, the sampler returns the corresponding
|
||||
* value, unchanged. In addition, because nohalo is continuous, if
|
||||
* asked for a value at a location "very close" to the center of an
|
||||
* input pixel, then the sampler returns a value "very close" to
|
||||
* it. (Nohalo is not smoothing like, say, B-Spline
|
||||
* pseudo-interpolation.)
|
||||
*
|
||||
* ==================================================================
|
||||
* Nohalo is co-monotone (this is why it's called "nohalo" = no halo)
|
||||
* ==================================================================
|
||||
*
|
||||
* What monotonicity more or less means here is that the resampled
|
||||
* value is in the range of the four closest input values. This
|
||||
* property is why there is no added haloing. It also implies that
|
||||
* clamping is unnecessary (provided abyss values are within the range
|
||||
* of acceptable values, which is always the case). (Note: plain
|
||||
* vanilla bilinear is also co-monotone.)
|
||||
*
|
||||
* Note: If the abyss policy is an extrapolating one---for example,
|
||||
* linear or bilinear extrapolation---clamping is still unnecessary
|
||||
* unless one attempts to resample outside of the convex hull of the
|
||||
* input pixel positions. Consequence: the usual "interpolatory" image
|
||||
* size convention (oft associated with "pixel center-based
|
||||
* coordinates") does not require clamping when using linear
|
||||
* extrapolation abyss policy when performing image resizing, but the
|
||||
* usual "exact area" image size convention (oft associated with
|
||||
* "pixel corner-based coordinates) does require clamping at locations
|
||||
* very close to the boundary when upscaling. If computing values at
|
||||
* locations outside of the convex hull of the pixel center locations
|
||||
* of the input image, nearest neighbour abyss policy is most likely
|
||||
* better anyway, because linear extrapolation produces "streaks" if
|
||||
* positions far outside the original image boundary are sampled. Note
|
||||
* that the nearest neighbor abyss policy ("clamp" in GPU parlance) is
|
||||
* the most common one. Again, for this abyss policy, nohalo is
|
||||
* monotone through and through and no pixel value clamping is
|
||||
* necessary.
|
||||
*
|
||||
* ========================
|
||||
* Nohalo is a local method
|
||||
* ========================
|
||||
*
|
||||
* The value of the reconstructed intensity surface at any point
|
||||
* depends on the values of (at most) 12 nearby input values, located
|
||||
* in a "cross" centered at the closest four input pixel centers.
|
||||
*
|
||||
* ===========================================================
|
||||
* When level = infinity, nohalo's intensity surface is smooth
|
||||
* ===========================================================
|
||||
*
|
||||
* It is conjectured that the intensity surface is infinitely
|
||||
* differentiable. Consequently, "Mach banding" (primarily caused by
|
||||
* sharp "ridges" in the reconstructed intensity surface and
|
||||
* particularly noticeable, for example, when using bilinear
|
||||
* resampling) is (essentially) absent, even at high magnifications,
|
||||
* WHEN THE LEVEL IS HIGH (more or less when 2^(level+1) is at least
|
||||
* the largest local magnification factor, which means that the level
|
||||
* 1 nohalo does not show much Mach banding up to a magnification of
|
||||
* about 4).
|
||||
*
|
||||
* ===============================
|
||||
* Nohalo is second order accurate
|
||||
* ===============================
|
||||
*
|
||||
* (Except possibly near the boundary: it is easy to make this
|
||||
* property carry over everywhere but this requires a tuned abyss
|
||||
* policy---linear extrapolation, say---or building the boundary
|
||||
* conditions inside the sampler.) Nohalo is exact on linear
|
||||
* intensity profiles, meaning that if the input pixel values (in the
|
||||
* stencil) are obtained from a function of the form f(x,y) = a + b*x
|
||||
* + c*y (a, b, c constants), then the computed pixel value is exactly
|
||||
* the value of f(x,y) at the asked-for sampling location. The
|
||||
* boundary condition which is emulated by VIPS throught the "extend"
|
||||
* extension of the input image---this corresponds to the nearest
|
||||
* neighbour abyss policy---does NOT make this resampler exact on
|
||||
* linears at the boundary. It does, however, guarantee that no
|
||||
* clamping is required even when resampled values are computed at
|
||||
* positions outside of the extent of the input image (when
|
||||
* extrapolation is required).
|
||||
*
|
||||
* ===================
|
||||
* Nohalo is nonlinear
|
||||
* ===================
|
||||
*
|
||||
* In particular, resampling a sum of images may not be the same as
|
||||
* summing the resamples. (This occurs even without taking into account
|
||||
* over and underflow issues: images can only take values within a
|
||||
* banded range, and consequently no sampler is truly linear.)
|
||||
*
|
||||
* ====================
|
||||
* Weaknesses of nohalo
|
||||
* ====================
|
||||
*
|
||||
* In some cases, the first level nonlinear computation is wasted:
|
||||
*
|
||||
* If a region is bichromatic, the nonlinear component of the level 1
|
||||
* nohalo is zero in the interior of the region, and consequently
|
||||
* nohalo boils down to bilinear. For such images, either stick to
|
||||
* bilinear, or use a higher level (quality) setting. (There is no
|
||||
* real harm in using nohalo when it boils down to bilinear if one
|
||||
* does not mind wasting cycles.)
|
||||
*
|
||||
* Low quality levels do NOT produce a continuously differentiable
|
||||
* intensity surface:
|
||||
*
|
||||
* With a "finite" level is used (that is, in practice), the nohalo
|
||||
* intensity surface is only continuous: there are gradient
|
||||
* discontinuities because the "final interpolation step" is performed
|
||||
* with bilinear. (Exception: if the "corner" image size convention is
|
||||
* used and the magnification factor is 2, that is, if the resampled
|
||||
* points sit exactly on the binary subdivided grid, then nohalo level
|
||||
* 1 gives the same result as as level=infinity, and consequently the
|
||||
* intensity surface can be treated as if smooth.) Note that these
|
||||
* gradient discontinuities are nearly invisible when the
|
||||
* magnification ratio is modest.
|
||||
*
|
||||
* ============================
|
||||
* CONVENTIONS USED IN THE CODE
|
||||
* ============================
|
||||
*
|
||||
* This code uses the "center-based coordinate convention, for which,
|
||||
* the very first actual image pixel is understood to be located at
|
||||
* (0,0), and the last one at (N-1,M-1), where M is the number of
|
||||
* pixel rows of the input image, and N is its number of pixel
|
||||
* columns.
|
||||
*/
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include <config.h>
|
||||
#endif /*HAVE_CONFIG_H*/
|
||||
#include <vips/intl.h>
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#include <vips/vips.h>
|
||||
#include <vips/internal.h>
|
||||
|
||||
#include "templates.h"
|
||||
|
||||
#define VIPS_TYPE_INTERPOLATE_NOHALO1 \
|
||||
(vips_interpolate_nohalo1_get_type())
|
||||
#define VIPS_INTERPOLATE_NOHALO1( obj ) \
|
||||
(G_TYPE_CHECK_INSTANCE_CAST( (obj), \
|
||||
VIPS_TYPE_INTERPOLATE_NOHALO1, VipsInterpolateNohalo1 ))
|
||||
#define VIPS_INTERPOLATE_NOHALO1_CLASS( klass ) \
|
||||
(G_TYPE_CHECK_CLASS_CAST( (klass), \
|
||||
VIPS_TYPE_INTERPOLATE_NOHALO1, VipsInterpolateNohalo1Class))
|
||||
#define VIPS_IS_INTERPOLATE_NOHALO1( obj ) \
|
||||
(G_TYPE_CHECK_INSTANCE_TYPE( (obj), VIPS_TYPE_INTERPOLATE_NOHALO1 ))
|
||||
#define VIPS_IS_INTERPOLATE_NOHALO1_CLASS( klass ) \
|
||||
(G_TYPE_CHECK_CLASS_TYPE( (klass), VIPS_TYPE_INTERPOLATE_NOHALO1 ))
|
||||
#define VIPS_INTERPOLATE_NOHALO1_GET_CLASS( obj ) \
|
||||
(G_TYPE_INSTANCE_GET_CLASS( (obj), \
|
||||
VIPS_TYPE_INTERPOLATE_NOHALO1, VipsInterpolateNohalo1Class ))
|
||||
|
||||
typedef struct _VipsInterpolateNohalo1 {
|
||||
VipsInterpolate parent_object;
|
||||
|
||||
} VipsInterpolateNohalo1;
|
||||
|
||||
typedef struct _VipsInterpolateNohalo1Class {
|
||||
VipsInterpolateClass parent_class;
|
||||
|
||||
} VipsInterpolateNohalo1Class;
|
||||
|
||||
static void inline
|
||||
nohalo1( const double uno_two,
|
||||
const double uno_thr,
|
||||
const double dos_one,
|
||||
const double dos_two,
|
||||
const double dos_thr,
|
||||
const double dos_fou,
|
||||
const double tre_one,
|
||||
const double tre_two,
|
||||
const double tre_thr,
|
||||
const double tre_fou,
|
||||
const double qua_two,
|
||||
const double qua_thr,
|
||||
double* restrict r1,
|
||||
double* restrict r2,
|
||||
double* restrict r3 )
|
||||
{
|
||||
/*
|
||||
* This function calculates the missing three double density pixel
|
||||
* values. The caller does bilinear interpolation on them and
|
||||
* dos_two.
|
||||
*/
|
||||
/*
|
||||
* THE STENCIL OF INPUT VALUES:
|
||||
*
|
||||
* Nohalo's stencil is the same as, say, Catmull-Rom, with the
|
||||
* exception that the four corner values are not used:
|
||||
*
|
||||
* (ix,iy-1) (ix+1,iy-1)
|
||||
* = uno_two = uno_thr
|
||||
*
|
||||
* (ix-1,iy) (ix,iy) (ix+1,iy) (ix+2,iy)
|
||||
* = dos_one = dos_two = dos_thr = dos_fou
|
||||
*
|
||||
* (ix-1,iy+1) (ix,iy+1) (ix+1,iy+1) (ix+2,iy+1)
|
||||
* = tre_one = tre_two = tre_thr = tre_fou
|
||||
*
|
||||
* (ix,iy+2) (ix+1,iy+2)
|
||||
* = qua_two = qua_thr
|
||||
*
|
||||
* Here, ix is the floor of the requested left-to-right location, iy
|
||||
* is the floor of the requested up-to-down location.
|
||||
*
|
||||
* Pointer arithmetic is used to implicitly reflect the input
|
||||
* stencil so that the requested pixel location is closer to
|
||||
* dos_two, The above consequently corresponds to the case in which
|
||||
* absolute_x is closer to ix than ix+1, and absolute_y is closer to
|
||||
* iy than iy+1. For example, if relative_x_is_rite = 1 but
|
||||
* relative_y_is_down = 0 (see below), then dos_two corresponds to
|
||||
* (ix+1,iy), dos_thr corresponds to (ix,iy) etc. Consequently, the
|
||||
* three missing double density values (corresponding to r1, r2 and
|
||||
* r3) are halfway between dos_two and dos_thr, halfway between
|
||||
* dos_two and tre_two, and at the average of the four central
|
||||
* positions.
|
||||
*
|
||||
* The following code assumes that the stencil reflection has
|
||||
* already been performed.
|
||||
*/
|
||||
|
||||
/*
|
||||
* Computation of the nonlinear slopes: If two consecutive pixel
|
||||
* value differences have the same sign, the smallest one (in
|
||||
* absolute value) is taken to be the corresponding slope; if the
|
||||
* two consecutive pixel value differences don't have the same sign,
|
||||
* the corresponding slope is set to 0. In other words, apply minmod
|
||||
* to comsecutive differences.
|
||||
*/
|
||||
/*
|
||||
* Dos(s) horizontal differences:
|
||||
*/
|
||||
const double prem_dos = dos_two - dos_one;
|
||||
const double deux_dos = dos_thr - dos_two;
|
||||
const double troi_dos = dos_fou - dos_thr;
|
||||
/*
|
||||
* Tre(s) horizontal differences:
|
||||
*/
|
||||
const double prem_tre = tre_two - tre_one;
|
||||
const double deux_tre = tre_thr - tre_two;
|
||||
const double troi_tre = tre_fou - tre_thr;
|
||||
/*
|
||||
* Two vertical differences:
|
||||
*/
|
||||
const double prem_two = dos_two - uno_two;
|
||||
const double deux_two = tre_two - dos_two;
|
||||
const double troi_two = qua_two - tre_two;
|
||||
/*
|
||||
* Thr(ee) vertical differences:
|
||||
*/
|
||||
const double prem_thr = dos_thr - uno_thr;
|
||||
const double deux_thr = tre_thr - dos_thr;
|
||||
const double troi_thr = qua_thr - tre_thr;
|
||||
|
||||
/*
|
||||
* Products useful for minmod:
|
||||
*/
|
||||
const double deux_prem_dos = deux_dos * prem_dos;
|
||||
const double deux_deux_dos = deux_dos * deux_dos;
|
||||
const double deux_troi_dos = deux_dos * troi_dos;
|
||||
|
||||
const double deux_prem_two = deux_two * prem_two;
|
||||
const double deux_deux_two = deux_two * deux_two;
|
||||
const double deux_troi_two = deux_two * troi_two;
|
||||
|
||||
const double deux_prem_tre = deux_tre * prem_tre;
|
||||
const double deux_deux_tre = deux_tre * deux_tre;
|
||||
const double deux_troi_tre = deux_tre * troi_tre;
|
||||
|
||||
const double deux_prem_thr = deux_thr * prem_thr;
|
||||
const double deux_deux_thr = deux_thr * deux_thr;
|
||||
const double deux_troi_thr = deux_thr * troi_thr;
|
||||
|
||||
/*
|
||||
* Differences useful for minmod:
|
||||
*/
|
||||
const double deux_prem_minus_deux_deux_dos = deux_prem_dos - deux_deux_dos;
|
||||
const double deux_troi_minus_deux_deux_dos = deux_troi_dos - deux_deux_dos;
|
||||
|
||||
const double deux_prem_minus_deux_deux_two = deux_prem_two - deux_deux_two;
|
||||
const double deux_troi_minus_deux_deux_two = deux_troi_two - deux_deux_two;
|
||||
|
||||
const double deux_prem_minus_deux_deux_tre = deux_prem_tre - deux_deux_tre;
|
||||
const double deux_troi_minus_deux_deux_tre = deux_troi_tre - deux_deux_tre;
|
||||
|
||||
const double deux_prem_minus_deux_deux_thr = deux_prem_thr - deux_deux_thr;
|
||||
const double deux_troi_minus_deux_deux_thr = deux_troi_thr - deux_deux_thr;
|
||||
|
||||
/*
|
||||
* The following terms are computed here to put "space" between the
|
||||
* computation of components of flag variables and their use:
|
||||
*/
|
||||
const double twice_dos_two_plus_dos_thr = ( dos_two + dos_thr ) * 2.;
|
||||
const double twice_dos_two_plus_tre_two = ( dos_two + tre_two ) * 2.;
|
||||
const double twice_deux_thr_plus_deux_dos = ( deux_thr + deux_dos ) * 2.;
|
||||
|
||||
/*
|
||||
* Compute the needed "right" (at the boundary between one input
|
||||
* pixel areas) double resolution pixel value:
|
||||
*/
|
||||
const double four_times_dos_twothr =
|
||||
twice_dos_two_plus_dos_thr
|
||||
+
|
||||
FAST_MINMOD( deux_dos, prem_dos, deux_prem_dos,
|
||||
deux_prem_minus_deux_deux_dos )
|
||||
-
|
||||
FAST_MINMOD( deux_dos, troi_dos, deux_troi_dos,
|
||||
deux_troi_minus_deux_deux_dos );
|
||||
|
||||
/*
|
||||
* Compute the needed "down" double resolution pixel value:
|
||||
*/
|
||||
const double four_times_dostre_two =
|
||||
twice_dos_two_plus_tre_two
|
||||
+
|
||||
FAST_MINMOD( deux_two, prem_two, deux_prem_two,
|
||||
deux_prem_minus_deux_deux_two )
|
||||
-
|
||||
FAST_MINMOD( deux_two, troi_two, deux_troi_two,
|
||||
deux_troi_minus_deux_deux_two );
|
||||
|
||||
/*
|
||||
* Compute the "diagonal" (at the boundary between four input
|
||||
* pixel areas) double resolution pixel value:
|
||||
*/
|
||||
const double eight_times_dostre_twothr =
|
||||
twice_deux_thr_plus_deux_dos
|
||||
+
|
||||
FAST_MINMOD( deux_tre, prem_tre, deux_prem_tre,
|
||||
deux_prem_minus_deux_deux_tre )
|
||||
-
|
||||
FAST_MINMOD( deux_tre, troi_tre, deux_troi_tre,
|
||||
deux_troi_minus_deux_deux_tre )
|
||||
+
|
||||
FAST_MINMOD( deux_thr, prem_thr, deux_prem_thr,
|
||||
deux_prem_minus_deux_deux_thr )
|
||||
-
|
||||
FAST_MINMOD( deux_thr, troi_thr, deux_troi_thr,
|
||||
deux_troi_minus_deux_deux_thr )
|
||||
+
|
||||
four_times_dos_twothr
|
||||
+
|
||||
four_times_dostre_two;
|
||||
|
||||
/*
|
||||
* Return the first newly computed double density values:
|
||||
*/
|
||||
*r1 = four_times_dos_twothr;
|
||||
*r2 = four_times_dostre_two;
|
||||
*r3 = eight_times_dostre_twothr;
|
||||
}
|
||||
|
||||
/* Call nohalo1 with an interpolator as a parameter.
|
||||
* It'd be nice to do this with templates somehow :-( but I can't see
|
||||
* a clean way to do it.
|
||||
*/
|
||||
#define NOHALO1_INTER( inter ) \
|
||||
template <typename T> static void inline \
|
||||
nohalo1_ ## inter( PEL* restrict pout, \
|
||||
const PEL* restrict pin, \
|
||||
const int bands, \
|
||||
const int lskip, \
|
||||
const double relative_x, \
|
||||
const double relative_y ) \
|
||||
{ \
|
||||
T* restrict out = (T *) pout; \
|
||||
\
|
||||
const int relative_x_is_rite = ( relative_x >= 0. ); \
|
||||
const int relative_y_is_down = ( relative_y >= 0. ); \
|
||||
\
|
||||
const int sign_of_relative_x = 2 * relative_x_is_rite - 1; \
|
||||
const int sign_of_relative_y = 2 * relative_y_is_down - 1; \
|
||||
\
|
||||
const int corner_reflection_shift = \
|
||||
relative_x_is_rite * bands + relative_y_is_down * lskip; \
|
||||
\
|
||||
const int shift_back_1_pix = sign_of_relative_x * bands; \
|
||||
const int shift_back_1_row = sign_of_relative_y * lskip; \
|
||||
\
|
||||
const T* restrict in = ( (T *) pin ) + corner_reflection_shift; \
|
||||
\
|
||||
const int shift_forw_1_pix = -shift_back_1_pix; \
|
||||
const int shift_forw_1_row = -shift_back_1_row; \
|
||||
\
|
||||
const double w = ( 2 * sign_of_relative_x ) * relative_x; \
|
||||
const double z = ( 2 * sign_of_relative_y ) * relative_y; \
|
||||
\
|
||||
const int shift_forw_2_pix = 2 * shift_forw_1_pix; \
|
||||
const int shift_forw_2_row = 2 * shift_forw_1_row; \
|
||||
\
|
||||
const int uno_two_shift = shift_back_1_row; \
|
||||
const int uno_thr_shift = shift_forw_1_pix + shift_back_1_row; \
|
||||
\
|
||||
const double x = 1. - w; \
|
||||
const double w_times_z = w * z; \
|
||||
\
|
||||
const int dos_one_shift = shift_back_1_pix; \
|
||||
const int dos_two_shift = 0; \
|
||||
const int dos_thr_shift = shift_forw_1_pix; \
|
||||
const int dos_fou_shift = shift_forw_2_pix; \
|
||||
\
|
||||
const int tre_one_shift = shift_back_1_pix + shift_forw_1_row; \
|
||||
const int tre_two_shift = shift_forw_1_row; \
|
||||
const int tre_thr_shift = shift_forw_1_pix + shift_forw_1_row; \
|
||||
const int tre_fou_shift = shift_forw_2_pix + shift_forw_1_row; \
|
||||
\
|
||||
const double x_times_z = x * z; \
|
||||
\
|
||||
const int qua_two_shift = shift_forw_2_row; \
|
||||
const int qua_thr_shift = shift_forw_1_pix + shift_forw_2_row; \
|
||||
\
|
||||
const double w_times_y_over_4 = .25 * ( w - w_times_z ); \
|
||||
const double x_times_z_over_4 = .25 * x_times_z; \
|
||||
const double x_times_y_over_8 = .125 * ( x - x_times_z ); \
|
||||
\
|
||||
int band = bands; \
|
||||
\
|
||||
do \
|
||||
{ \
|
||||
double four_times_dos_twothr; \
|
||||
double four_times_dostre_two; \
|
||||
double eight_times_dostre_twothr; \
|
||||
\
|
||||
const double dos_two = in[dos_two_shift]; \
|
||||
\
|
||||
nohalo1( in[uno_two_shift], in[uno_thr_shift], \
|
||||
in[dos_one_shift], dos_two, \
|
||||
in[dos_thr_shift], in[dos_fou_shift], \
|
||||
in[tre_one_shift], in[tre_two_shift], \
|
||||
in[tre_thr_shift], in[tre_fou_shift], \
|
||||
in[qua_two_shift], in[qua_thr_shift], \
|
||||
&four_times_dos_twothr, \
|
||||
&four_times_dostre_two, \
|
||||
&eight_times_dostre_twothr ); \
|
||||
\
|
||||
const T result = bilinear_ ## inter<T>( w_times_z, \
|
||||
x_times_z_over_4, \
|
||||
w_times_y_over_4, \
|
||||
x_times_y_over_8, \
|
||||
dos_two, \
|
||||
four_times_dos_twothr, \
|
||||
four_times_dostre_two, \
|
||||
eight_times_dostre_twothr ); \
|
||||
\
|
||||
in++; \
|
||||
*out++ = result; \
|
||||
} while (--band); \
|
||||
}
|
||||
|
||||
NOHALO1_INTER( fptypes )
|
||||
NOHALO1_INTER( withsign )
|
||||
NOHALO1_INTER( nosign )
|
||||
|
||||
/* We need C linkage for this.
|
||||
*/
|
||||
extern "C" {
|
||||
G_DEFINE_TYPE( VipsInterpolateNohalo1, vips_interpolate_nohalo1,
|
||||
VIPS_TYPE_INTERPOLATE );
|
||||
}
|
||||
|
||||
static void
|
||||
vips_interpolate_nohalo1_interpolate( VipsInterpolate* restrict interpolate,
|
||||
PEL* restrict out,
|
||||
REGION* restrict in,
|
||||
double absolute_x,
|
||||
double absolute_y )
|
||||
{
|
||||
/*
|
||||
* Unit buffer pointer shifts:
|
||||
*/
|
||||
const int actual_bands = in->im->Bands;
|
||||
const int lskip = IM_REGION_LSKIP( in ) / IM_IMAGE_SIZEOF_ELEMENT( in->im );
|
||||
|
||||
const double absolute_y_minus_half = absolute_y - .5;
|
||||
const double absolute_x_minus_half = absolute_x - .5;
|
||||
/*
|
||||
* floor's surrogate FAST_PSEUDO_FLOOR is used to make sure that the
|
||||
* transition through 0 is smooth. If it is known that absolute_x
|
||||
* and absolute_y will never be less than 0, plain cast---that is,
|
||||
* const int ix = absolute_x---should be used instead. Actually,
|
||||
* any function which agrees with floor for non-integer values, and
|
||||
* picks one of the two possibilities for integer values, can be
|
||||
* used. FAST_PSEUDO_FLOOR fits the bill.
|
||||
*
|
||||
* Then, x is the x-coordinate of the sampling point relative to the
|
||||
* position of the center of the convex hull of the 2x2 block of
|
||||
* closest pixels. Similarly for y. Range of values: [-.5,.5).
|
||||
*/
|
||||
const int iy = FAST_PSEUDO_FLOOR (absolute_y);
|
||||
const double relative_y = absolute_y_minus_half - iy;
|
||||
const int ix = FAST_PSEUDO_FLOOR (absolute_x);
|
||||
const double relative_x = absolute_x_minus_half - ix;
|
||||
|
||||
/*
|
||||
* Move the pointer to (the first band of) the top/left pixel of the
|
||||
* 2x2 group of pixel centers which contains the sampling location
|
||||
* in its convex hull:
|
||||
*/
|
||||
const PEL* restrict p = (PEL *) IM_REGION_ADDR( in, ix, iy );
|
||||
|
||||
/*
|
||||
* Double bands for complex images:
|
||||
*/
|
||||
const int bands = vips_bandfmt_iscomplex( in->im->BandFmt ) ?
|
||||
2 * actual_bands : actual_bands;
|
||||
|
||||
#define CALL( T, inter ) \
|
||||
nohalo1_ ## inter<T>( out, \
|
||||
p, \
|
||||
bands, \
|
||||
lskip, \
|
||||
relative_x, \
|
||||
relative_y );
|
||||
|
||||
switch( in->im->BandFmt ) {
|
||||
case IM_BANDFMT_UCHAR:
|
||||
CALL( unsigned char, nosign );
|
||||
break;
|
||||
|
||||
case IM_BANDFMT_CHAR:
|
||||
CALL( signed char, withsign );
|
||||
break;
|
||||
|
||||
case IM_BANDFMT_USHORT:
|
||||
CALL( unsigned short, nosign );
|
||||
break;
|
||||
|
||||
case IM_BANDFMT_SHORT:
|
||||
CALL( signed short, withsign );
|
||||
break;
|
||||
|
||||
case IM_BANDFMT_UINT:
|
||||
CALL( unsigned int, nosign );
|
||||
break;
|
||||
|
||||
case IM_BANDFMT_INT:
|
||||
CALL( signed int, withsign );
|
||||
break;
|
||||
|
||||
/* Complex images handled by doubling of bands, see above.
|
||||
*/
|
||||
case IM_BANDFMT_FLOAT:
|
||||
case IM_BANDFMT_COMPLEX:
|
||||
CALL( float, fptypes );
|
||||
break;
|
||||
|
||||
case IM_BANDFMT_DOUBLE:
|
||||
case IM_BANDFMT_DPCOMPLEX:
|
||||
CALL( double, fptypes );
|
||||
break;
|
||||
|
||||
default:
|
||||
g_assert( 0 );
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
vips_interpolate_nohalo1_class_init( VipsInterpolateNohalo1Class *klass )
|
||||
{
|
||||
VipsObjectClass *object_class = VIPS_OBJECT_CLASS( klass );
|
||||
VipsInterpolateClass *interpolate_class =
|
||||
VIPS_INTERPOLATE_CLASS( klass );
|
||||
|
||||
object_class->nickname = "nohalo1";
|
||||
object_class->description = _( "Edge-enhancing bilinear" );
|
||||
|
||||
interpolate_class->interpolate = vips_interpolate_nohalo1_interpolate;
|
||||
interpolate_class->window_size = 4;
|
||||
interpolate_class->window_offset = 1;
|
||||
}
|
||||
|
||||
static void
|
||||
vips_interpolate_nohalo1_init( VipsInterpolateNohalo1 *nohalo1 )
|
||||
{
|
||||
}
|
||||
|
|
@ -5,6 +5,9 @@
|
|||
* When blur = 0. (minimum value), Snohalo level 1.5 gives the same
|
||||
* results as Nohalo level 2. At the maximum reasonable blur value
|
||||
* (1.), very strong antialiasing takes place.
|
||||
*
|
||||
* Warning: This is a prototype. It is not a final production version
|
||||
* (although it works well for mild upsampling or downsampling).
|
||||
*/
|
||||
|
||||
/*
|
||||
|
|
@ -70,32 +73,32 @@ enum {
|
|||
PROP_LAST
|
||||
};
|
||||
|
||||
#define VIPS_TYPE_INTERPOLATE_SNOHALO1 \
|
||||
(vips_interpolate_snohalo1_get_type())
|
||||
#define VIPS_INTERPOLATE_SNOHALO1( obj ) \
|
||||
#define VIPS_TYPE_INTERPOLATE_SNOHALO \
|
||||
(vips_interpolate_snohalo_get_type())
|
||||
#define VIPS_INTERPOLATE_SNOHALO( obj ) \
|
||||
(G_TYPE_CHECK_INSTANCE_CAST( (obj), \
|
||||
VIPS_TYPE_INTERPOLATE_SNOHALO1, VipsInterpolateSnohalo1 ))
|
||||
#define VIPS_INTERPOLATE_SNOHALO1_CLASS( klass ) \
|
||||
VIPS_TYPE_INTERPOLATE_SNOHALO, VipsInterpolateSnohalo ))
|
||||
#define VIPS_INTERPOLATE_SNOHALO_CLASS( klass ) \
|
||||
(G_TYPE_CHECK_CLASS_CAST( (klass), \
|
||||
VIPS_TYPE_INTERPOLATE_SNOHALO1, VipsInterpolateSnohalo1Class))
|
||||
#define VIPS_IS_INTERPOLATE_SNOHALO1( obj ) \
|
||||
(G_TYPE_CHECK_INSTANCE_TYPE( (obj), VIPS_TYPE_INTERPOLATE_SNOHALO1 ))
|
||||
#define VIPS_IS_INTERPOLATE_SNOHALO1_CLASS( klass ) \
|
||||
(G_TYPE_CHECK_CLASS_TYPE( (klass), VIPS_TYPE_INTERPOLATE_SNOHALO1 ))
|
||||
#define VIPS_INTERPOLATE_SNOHALO1_GET_CLASS( obj ) \
|
||||
VIPS_TYPE_INTERPOLATE_SNOHALO, VipsInterpolateSnohaloClass))
|
||||
#define VIPS_IS_INTERPOLATE_SNOHALO( obj ) \
|
||||
(G_TYPE_CHECK_INSTANCE_TYPE( (obj), VIPS_TYPE_INTERPOLATE_SNOHALO ))
|
||||
#define VIPS_IS_INTERPOLATE_SNOHALO_CLASS( klass ) \
|
||||
(G_TYPE_CHECK_CLASS_TYPE( (klass), VIPS_TYPE_INTERPOLATE_SNOHALO ))
|
||||
#define VIPS_INTERPOLATE_SNOHALO_GET_CLASS( obj ) \
|
||||
(G_TYPE_INSTANCE_GET_CLASS( (obj), \
|
||||
VIPS_TYPE_INTERPOLATE_SNOHALO1, VipsInterpolateSnohalo1Class ))
|
||||
VIPS_TYPE_INTERPOLATE_SNOHALO, VipsInterpolateSnohaloClass ))
|
||||
|
||||
typedef struct _VipsInterpolateSnohalo1 {
|
||||
typedef struct _VipsInterpolateSnohalo {
|
||||
VipsInterpolate parent_object;
|
||||
|
||||
double blur;
|
||||
} VipsInterpolateSnohalo1;
|
||||
} VipsInterpolateSnohalo;
|
||||
|
||||
typedef struct _VipsInterpolateSnohalo1Class {
|
||||
typedef struct _VipsInterpolateSnohaloClass {
|
||||
VipsInterpolateClass parent_class;
|
||||
|
||||
} VipsInterpolateSnohalo1Class;
|
||||
} VipsInterpolateSnohaloClass;
|
||||
|
||||
/*
|
||||
* MINMOD is an implementation of the minmod function which only needs
|
||||
|
|
@ -759,9 +762,9 @@ snohalo_step2( const double uno_two,
|
|||
* this would allow code comments!---but we can't figure a clean way
|
||||
* to do it.
|
||||
*/
|
||||
#define SNOHALO1_INTER( inter ) \
|
||||
#define SNOHALO_INTER( inter ) \
|
||||
template <typename T> static void inline \
|
||||
snohalo1_ ## inter( PEL* restrict pout, \
|
||||
snohalo_ ## inter( PEL* restrict pout, \
|
||||
const PEL* restrict pin, \
|
||||
const int bands, \
|
||||
const int lskip, \
|
||||
|
|
@ -964,16 +967,16 @@ snohalo_step2( const double uno_two,
|
|||
} while (--band); \
|
||||
}
|
||||
|
||||
SNOHALO1_INTER( fptypes )
|
||||
SNOHALO1_INTER( withsign )
|
||||
SNOHALO1_INTER( nosign )
|
||||
SNOHALO_INTER( fptypes )
|
||||
SNOHALO_INTER( withsign )
|
||||
SNOHALO_INTER( nosign )
|
||||
|
||||
#define CALL( T, inter ) \
|
||||
snohalo1_ ## inter<T>( out, \
|
||||
snohalo_ ## inter<T>( out, \
|
||||
p, \
|
||||
bands, \
|
||||
lskip, \
|
||||
snohalo1->blur, \
|
||||
snohalo->blur, \
|
||||
relative_x, \
|
||||
relative_y );
|
||||
|
||||
|
|
@ -981,19 +984,19 @@ SNOHALO1_INTER( nosign )
|
|||
* We need C linkage:
|
||||
*/
|
||||
extern "C" {
|
||||
G_DEFINE_TYPE( VipsInterpolateSnohalo1, vips_interpolate_snohalo1,
|
||||
G_DEFINE_TYPE( VipsInterpolateSnohalo, vips_interpolate_snohalo,
|
||||
VIPS_TYPE_INTERPOLATE );
|
||||
}
|
||||
|
||||
static void
|
||||
vips_interpolate_snohalo1_interpolate( VipsInterpolate* restrict interpolate,
|
||||
vips_interpolate_snohalo_interpolate( VipsInterpolate* restrict interpolate,
|
||||
PEL* restrict out,
|
||||
REGION* restrict in,
|
||||
double absolute_x,
|
||||
double absolute_y )
|
||||
{
|
||||
VipsInterpolateSnohalo1 *snohalo1 =
|
||||
VIPS_INTERPOLATE_SNOHALO1( interpolate );
|
||||
VipsInterpolateSnohalo *snohalo =
|
||||
VIPS_INTERPOLATE_SNOHALO( interpolate );
|
||||
|
||||
/*
|
||||
* Floor's surrogate FAST_PSEUDO_FLOOR is used to make sure that the
|
||||
|
|
@ -1078,7 +1081,7 @@ vips_interpolate_snohalo1_interpolate( VipsInterpolate* restrict interpolate,
|
|||
}
|
||||
|
||||
static void
|
||||
vips_interpolate_snohalo1_class_init( VipsInterpolateSnohalo1Class *klass )
|
||||
vips_interpolate_snohalo_class_init( VipsInterpolateSnohaloClass *klass )
|
||||
{
|
||||
GObjectClass *gobject_class = G_OBJECT_CLASS( klass );
|
||||
VipsObjectClass *object_class = VIPS_OBJECT_CLASS( klass );
|
||||
|
|
@ -1090,10 +1093,10 @@ vips_interpolate_snohalo1_class_init( VipsInterpolateSnohalo1Class *klass )
|
|||
gobject_class->set_property = vips_object_set_property;
|
||||
gobject_class->get_property = vips_object_get_property;
|
||||
|
||||
object_class->nickname = "snohalo1";
|
||||
object_class->description = _( "Nohalo level 2 with antialiasing blur" );
|
||||
object_class->nickname = "snohalo";
|
||||
object_class->description = _( "Nohalo with antialiasing blur" );
|
||||
|
||||
interpolate_class->interpolate = vips_interpolate_snohalo1_interpolate;
|
||||
interpolate_class->interpolate = vips_interpolate_snohalo_interpolate;
|
||||
interpolate_class->window_size = 7;
|
||||
interpolate_class->window_offset = 3;
|
||||
|
||||
|
|
@ -1117,11 +1120,11 @@ vips_interpolate_snohalo1_class_init( VipsInterpolateSnohalo1Class *klass )
|
|||
object_class,
|
||||
pspec,
|
||||
VIPS_ARGUMENT_SET_ONCE,
|
||||
G_STRUCT_OFFSET( VipsInterpolateSnohalo1, blur ) );
|
||||
G_STRUCT_OFFSET( VipsInterpolateSnohalo, blur ) );
|
||||
}
|
||||
|
||||
static void
|
||||
vips_interpolate_snohalo1_init( VipsInterpolateSnohalo1 *snohalo1 )
|
||||
vips_interpolate_snohalo_init( VipsInterpolateSnohalo *snohalo )
|
||||
{
|
||||
snohalo1->blur = 0.3333333;
|
||||
snohalo->blur = 0.3333333;
|
||||
}
|
||||
Loading…
Reference in New Issue