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

(hopefully) fixed the window_offset compile errors

Browse Source
This commit is contained in:
Nicolas Robidoux 2010-05-16 15:42:57 +00:00
parent 504221925f
commit b95939f0e1
3 changed files with 632 additions and 269 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -83,6 +83,7 @@ typedef struct _VipsInterpolateClass {
* (centering) if undefined. * (centering) if undefined.
*/ */
int (*get_window_offset)( VipsInterpolate * ); int (*get_window_offset)( VipsInterpolate * );
int window_offset;
} VipsInterpolateClass; } VipsInterpolateClass;
GType vips_interpolate_get_type( void ); GType vips_interpolate_get_type( void );

15
libvips/resample/interpolate.c
View File

@ -107,9 +107,15 @@ vips_interpolate_real_get_window_size( VipsInterpolate *interpolate )
static int static int
vips_interpolate_real_get_window_offset( VipsInterpolate *interpolate ) vips_interpolate_real_get_window_offset( VipsInterpolate *interpolate )
{ {
/* Default to half window size. VipsInterpolateClass *class = VIPS_INTERPOLATE_GET_CLASS( interpolate );
*/
return( vips_interpolate_get_window_size( interpolate ) / 2 ); g_assert( class->window_offset != -1 );
return( class->window_offset );
/* /\* Default to half window size. */
/* *\/ */
/* return( vips_interpolate_get_window_size( interpolate ) / 2 ); */
} }
static void static void
@ -126,6 +132,7 @@ vips_interpolate_class_init( VipsInterpolateClass *class )
class->get_window_size = vips_interpolate_real_get_window_size; class->get_window_size = vips_interpolate_real_get_window_size;
class->get_window_offset = vips_interpolate_real_get_window_offset; class->get_window_offset = vips_interpolate_real_get_window_offset;
class->window_size = -1; class->window_size = -1;
class->window_offset = -1;
} }
static void static void
@ -269,7 +276,7 @@ vips_interpolate_nearest_new( void )
/* Convenience: return a static nearest you don't need to free. /* Convenience: return a static nearest you don't need to free.
*/ */
VipsInterpolate * VipsInterpolate *
<vips_interpolate_nearest_static( void ) vips_interpolate_nearest_static( void )
{ {
static VipsInterpolate *interpolate = NULL; static VipsInterpolate *interpolate = NULL;

833
libvips/resample/nohalo2.cpp
View File

File diff suppressed because it is too large Load Diff