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

stuff

Browse Source
This commit is contained in:
John Cupitt 2009-01-27 15:50:19 +00:00
parent d87cf4c6e7
commit 1ed3ca8197
2 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libsrc/mosaicing/nohalo.cpp
View File

@ -299,7 +299,7 @@ typedef struct _VipsInterpolateNohaloClass {
* bilinear interpolation of them.
*/
static void
static void inline
nohalo_sharp_level_1(
const double dos_thr,
const double dos_fou,
@ -862,9 +862,6 @@ vips_interpolate_nohalo_interpolate( VipsInterpolate *interpolate,
const int ix = FAST_PSEUDO_FLOOR (absolute_x + 0.5);
const int iy = FAST_PSEUDO_FLOOR (absolute_y + 0.5);
/* FIXME ... this ^^^ will go outsie the 5x5 stencil, argh
*/
/*
* x is the x-coordinate of the sampling point relative to the
* position of the tre_thr pixel center. Similarly for y. Range of
@ -1096,10 +1093,7 @@ vips_interpolate_nohalo_class_init( VipsInterpolateNohaloClass *klass )
interpolate_class->interpolate =
vips_interpolate_nohalo_interpolate;
/* Should be 5, but round-to-nearest FIXME above makes this 7.
*/
interpolate_class->window_size = 7;
interpolate_class->window_size = 5;
}
static void

16
libsrc/mosaicing/templates.h
View File

@ -79,10 +79,10 @@ bilinear_signed(
const double trequa_thrfou )
{
const double val =
(w_times_z / 16) * tre_thr +
(x_times_z / 16) * tre_thrfou +
(w_times_y / 16) * trequa_thr +
(x_times_y / 16) * trequa_thrfou;
w_times_z * tre_thr +
x_times_z * tre_thrfou +
w_times_y * trequa_thr +
x_times_y * trequa_thrfou;
const int sign_of_val = 2 * ( val >= 0. ) - 1;
@ -107,10 +107,10 @@ bilinear_unsigned(
const double trequa_thrfou )
{
const T newval =
(w_times_z / 16) * tre_thr +
(x_times_z / 16) * tre_thrfou +
(w_times_y / 16) * trequa_thr +
(x_times_y / 16) * trequa_thrfou +
w_times_z * tre_thr +
x_times_z * tre_thrfou +
w_times_y * trequa_thr +
x_times_y * trequa_thrfou +
0.5;
return( newval );