From 071abecbff85370d6fd442e85e7b11e3ddcd14a3 Mon Sep 17 00:00:00 2001 From: John Cupitt Date: Thu, 10 Mar 2011 09:41:45 +0000 Subject: [PATCH] rename IMAGE to VipsImage all headers revised to rename IMAGE as VipsImage, also trimmed some junk --- libvips/include/vips/Makefile.am | 1 - libvips/include/vips/arithmetic.h | 93 ++++++++++++++------------- libvips/include/vips/boolean.h | 26 ++++---- libvips/include/vips/cimg_funcs.h | 2 +- libvips/include/vips/colour.h | 72 +++++++++++---------- libvips/include/vips/convolution.h | 30 ++++----- libvips/include/vips/disp.h | 18 +++--- libvips/include/vips/format.h | 60 ++++++++--------- libvips/include/vips/freq_filt.h | 21 +++--- libvips/include/vips/generate.h | 30 ++++----- libvips/include/vips/header.h | 23 +++---- libvips/include/vips/histograms_lut.h | 54 ++++++++-------- libvips/include/vips/internal.h | 1 - libvips/include/vips/meta.h | 31 +++++---- libvips/include/vips/morphology.h | 18 +++--- libvips/include/vips/mosaicing.h | 28 ++++---- libvips/include/vips/other.h | 20 +++--- libvips/include/vips/private.h | 6 +- libvips/include/vips/region.h | 2 +- libvips/include/vips/relational.h | 40 ++++++------ libvips/include/vips/resample.h | 13 ++-- libvips/include/vips/struct.h | 44 ------------- libvips/include/vips/transform.h | 2 +- libvips/include/vips/video.h | 4 +- 24 files changed, 301 insertions(+), 338 deletions(-) delete mode 100644 libvips/include/vips/struct.h diff --git a/libvips/include/vips/Makefile.am b/libvips/include/vips/Makefile.am index db6c577f..322f2016 100644 --- a/libvips/include/vips/Makefile.am +++ b/libvips/include/vips/Makefile.am @@ -37,7 +37,6 @@ pkginclude_HEADERS = \ relational.h \ resample.h \ semaphore.h \ - struct.h \ threadpool.h \ thread.h \ transform.h \ diff --git a/libvips/include/vips/arithmetic.h b/libvips/include/vips/arithmetic.h index a2954233..ccc2ec45 100644 --- a/libvips/include/vips/arithmetic.h +++ b/libvips/include/vips/arithmetic.h @@ -39,62 +39,63 @@ extern "C" { /* arithmetic */ -DOUBLEMASK *im_measure_area( IMAGE *im, +DOUBLEMASK *im_measure_area( VipsImage *im, int left, int top, int width, int height, int h, int v, int *sel, int nsel, const char *name ); -DOUBLEMASK *im_stats( IMAGE *in ); -int im_max( IMAGE *in, double *out ); -int im_min( IMAGE *in, double *out ); -int im_avg( IMAGE *in, double *out ); -int im_deviate( IMAGE *in, double *out ); -int im_maxpos( IMAGE *in, int *xpos, int *ypos, double *out ); -int im_minpos( IMAGE *in, int *xpos, int *ypos, double *out ); -int im_maxpos_avg( IMAGE *im, double *xpos, double *ypos, double *out ); -int im_maxpos_vec( IMAGE *im, int *xpos, int *ypos, double *maxima, int n ); -int im_minpos_vec( IMAGE *im, int *xpos, int *ypos, double *minima, int n ); -int im_bandmean( IMAGE *in, IMAGE *out ); +DOUBLEMASK *im_stats( VipsImage *in ); +int im_max( VipsImage *in, double *out ); +int im_min( VipsImage *in, double *out ); +int im_avg( VipsImage *in, double *out ); +int im_deviate( VipsImage *in, double *out ); +int im_maxpos( VipsImage *in, int *xpos, int *ypos, double *out ); +int im_minpos( VipsImage *in, int *xpos, int *ypos, double *out ); +int im_maxpos_avg( VipsImage *im, double *xpos, double *ypos, double *out ); +int im_maxpos_vec( VipsImage *im, int *xpos, int *ypos, double *maxima, int n ); +int im_minpos_vec( VipsImage *im, int *xpos, int *ypos, double *minima, int n ); +int im_bandmean( VipsImage *in, VipsImage *out ); -int im_add( IMAGE *in1, IMAGE *in2, IMAGE *out ); -int im_subtract( IMAGE *in1, IMAGE *in2, IMAGE *out ); -int im_invert( IMAGE *in, IMAGE *out ); -int im_lintra( double a, IMAGE *in, double b, IMAGE *out ); -int im_lintra_vec( int n, double *a, IMAGE *in, double *b, IMAGE *out ); -int im_multiply( IMAGE *in1, IMAGE *in2, IMAGE *out ); -int im_divide( IMAGE *in1, IMAGE *in2, IMAGE *out ); -int im_remainder( IMAGE *in1, IMAGE *in2, IMAGE *out ); -int im_remainder_vec( IMAGE *in, IMAGE *out, int n, double *c ); -int im_remainderconst( IMAGE *in, IMAGE *out, double c ); -int im_recomb( IMAGE *in, IMAGE *out, DOUBLEMASK *recomb ); +int im_add( VipsImage *in1, VipsImage *in2, VipsImage *out ); +int im_subtract( VipsImage *in1, VipsImage *in2, VipsImage *out ); +int im_invert( VipsImage *in, VipsImage *out ); +int im_lintra( double a, VipsImage *in, double b, VipsImage *out ); +int im_lintra_vec( int n, double *a, VipsImage *in, double *b, VipsImage *out ); +int im_multiply( VipsImage *in1, VipsImage *in2, VipsImage *out ); +int im_divide( VipsImage *in1, VipsImage *in2, VipsImage *out ); +int im_remainder( VipsImage *in1, VipsImage *in2, VipsImage *out ); +int im_remainder_vec( VipsImage *in, VipsImage *out, int n, double *c ); +int im_remainderconst( VipsImage *in, VipsImage *out, double c ); +int im_recomb( VipsImage *in, VipsImage *out, DOUBLEMASK *recomb ); -int im_sign( IMAGE *in, IMAGE *out ); -int im_abs( IMAGE *in, IMAGE *out ); -int im_floor( IMAGE *in, IMAGE *out ); -int im_rint( IMAGE *in, IMAGE *out ); -int im_ceil( IMAGE *in, IMAGE *out ); +int im_sign( VipsImage *in, VipsImage *out ); +int im_abs( VipsImage *in, VipsImage *out ); +int im_floor( VipsImage *in, VipsImage *out ); +int im_rint( VipsImage *in, VipsImage *out ); +int im_ceil( VipsImage *in, VipsImage *out ); -int im_linreg( IMAGE **ins, IMAGE *out, double *xs ); -int im_point( IMAGE *im, VipsInterpolate *interpolate, +int im_linreg( VipsImage **ins, VipsImage *out, double *xs ); +int im_point( VipsImage *im, VipsInterpolate *interpolate, + double x, double y, int band, double *out ); +int im_point_bilinear( VipsImage *im, double x, double y, int band, double *out ); -int im_point_bilinear( IMAGE *im, double x, double y, int band, double *out ); -int im_powtra( IMAGE *in, IMAGE *out, double e ); -int im_powtra_vec( IMAGE *in, IMAGE *out, int n, double *e ); -int im_exptra( IMAGE *in, IMAGE *out ); -int im_exp10tra( IMAGE *in, IMAGE *out ); -int im_expntra( IMAGE *in, IMAGE *out, double e ); -int im_expntra_vec( IMAGE *in, IMAGE *out, int n, double *e ); -int im_logtra( IMAGE *in, IMAGE *out ); -int im_log10tra( IMAGE *in, IMAGE *out ); +int im_powtra( VipsImage *in, VipsImage *out, double e ); +int im_powtra_vec( VipsImage *in, VipsImage *out, int n, double *e ); +int im_exptra( VipsImage *in, VipsImage *out ); +int im_exp10tra( VipsImage *in, VipsImage *out ); +int im_expntra( VipsImage *in, VipsImage *out, double e ); +int im_expntra_vec( VipsImage *in, VipsImage *out, int n, double *e ); +int im_logtra( VipsImage *in, VipsImage *out ); +int im_log10tra( VipsImage *in, VipsImage *out ); -int im_sintra( IMAGE *in, IMAGE *out ); -int im_costra( IMAGE *in, IMAGE *out ); -int im_tantra( IMAGE *in, IMAGE *out ); -int im_asintra( IMAGE *in, IMAGE *out ); -int im_acostra( IMAGE *in, IMAGE *out ); -int im_atantra( IMAGE *in, IMAGE *out ); +int im_sintra( VipsImage *in, VipsImage *out ); +int im_costra( VipsImage *in, VipsImage *out ); +int im_tantra( VipsImage *in, VipsImage *out ); +int im_asintra( VipsImage *in, VipsImage *out ); +int im_acostra( VipsImage *in, VipsImage *out ); +int im_atantra( VipsImage *in, VipsImage *out ); -int im_cross_phase( IMAGE *a, IMAGE *b, IMAGE *out ); +int im_cross_phase( VipsImage *a, VipsImage *b, VipsImage *out ); #ifdef __cplusplus } diff --git a/libvips/include/vips/boolean.h b/libvips/include/vips/boolean.h index e90a5d6b..f6ccd990 100644 --- a/libvips/include/vips/boolean.h +++ b/libvips/include/vips/boolean.h @@ -37,23 +37,23 @@ extern "C" { #endif /*__cplusplus*/ -int im_andimage( IMAGE *in1, IMAGE *in2, IMAGE *out ); -int im_orimage( IMAGE *in1, IMAGE *in2, IMAGE *out ); -int im_eorimage( IMAGE *in1, IMAGE *in2, IMAGE *out ); +int im_andimage( VipsImage *in1, VipsImage *in2, VipsImage *out ); +int im_orimage( VipsImage *in1, VipsImage *in2, VipsImage *out ); +int im_eorimage( VipsImage *in1, VipsImage *in2, VipsImage *out ); -int im_andimage_vec( IMAGE *in, IMAGE *out, int n, double *c ); -int im_andimageconst( IMAGE *in, IMAGE *out, double c ); +int im_andimage_vec( VipsImage *in, VipsImage *out, int n, double *c ); +int im_andimageconst( VipsImage *in, VipsImage *out, double c ); -int im_orimage_vec( IMAGE *in, IMAGE *out, int n, double *c ); -int im_orimageconst( IMAGE *in, IMAGE *out, double c ); +int im_orimage_vec( VipsImage *in, VipsImage *out, int n, double *c ); +int im_orimageconst( VipsImage *in, VipsImage *out, double c ); -int im_eorimage_vec( IMAGE *in, IMAGE *out, int n, double *c ); -int im_eorimageconst( IMAGE *in, IMAGE *out, double c ); +int im_eorimage_vec( VipsImage *in, VipsImage *out, int n, double *c ); +int im_eorimageconst( VipsImage *in, VipsImage *out, double c ); -int im_shiftleft_vec( IMAGE *in, IMAGE *out, int n, double *c ); -int im_shiftleft( IMAGE *in, IMAGE *out, int n ); -int im_shiftright_vec( IMAGE *in, IMAGE *out, int n, double *c ); -int im_shiftright( IMAGE *in, IMAGE *out, int n ); +int im_shiftleft_vec( VipsImage *in, VipsImage *out, int n, double *c ); +int im_shiftleft( VipsImage *in, VipsImage *out, int n ); +int im_shiftright_vec( VipsImage *in, VipsImage *out, int n, double *c ); +int im_shiftright( VipsImage *in, VipsImage *out, int n ); #ifdef __cplusplus } diff --git a/libvips/include/vips/cimg_funcs.h b/libvips/include/vips/cimg_funcs.h index 5e6b3005..6c8a00b4 100644 --- a/libvips/include/vips/cimg_funcs.h +++ b/libvips/include/vips/cimg_funcs.h @@ -37,7 +37,7 @@ extern "C" { #endif /*__cplusplus*/ -int im_greyc_mask( IMAGE *in, IMAGE *out, IMAGE *mask, +int im_greyc_mask( VipsImage *in, VipsImage *out, VipsImage *mask, int iterations, float amplitude, float sharpness, float anisotropy, float alpha, float sigma, float dl, float da, float gauss_prec, int interpolation, int fast_approx ); diff --git a/libvips/include/vips/colour.h b/libvips/include/vips/colour.h index e2df66ff..0a97dd17 100644 --- a/libvips/include/vips/colour.h +++ b/libvips/include/vips/colour.h @@ -116,38 +116,40 @@ float im_col_dECMC( float im_col_dE00( float L1, float a1, float b1, float L2, float a2, float b2 ); -int im_LCh2Lab( IMAGE *in, IMAGE *out ); -int im_LabQ2XYZ( IMAGE *in, IMAGE *out ); -int im_rad2float( IMAGE *in, IMAGE *out ); -int im_float2rad( IMAGE *in, IMAGE *out ); -int im_LCh2UCS( IMAGE *in, IMAGE *out ); -int im_Lab2LCh( IMAGE *in, IMAGE *out ); -int im_Lab2LabQ( IMAGE *in, IMAGE *out ); -int im_Lab2LabS( IMAGE *in, IMAGE *out ); -int im_Lab2XYZ( IMAGE *in, IMAGE *out ); -int im_Lab2XYZ_temp( IMAGE *in, IMAGE *out, double X0, double Y0, double Z0 ); -int im_Lab2UCS( IMAGE *in, IMAGE *out ); -int im_LabQ2Lab( IMAGE *in, IMAGE *out ); -int im_LabQ2LabS( IMAGE *in, IMAGE *out ); -int im_LabS2LabQ( IMAGE *in, IMAGE *out ); -int im_LabS2Lab( IMAGE *in, IMAGE *out ); -int im_UCS2XYZ( IMAGE *in, IMAGE *out ); -int im_UCS2LCh( IMAGE *in, IMAGE *out ); -int im_UCS2Lab( IMAGE *in, IMAGE *out ); -int im_XYZ2Lab( IMAGE *in, IMAGE *out ); -int im_XYZ2Lab_temp( IMAGE *in, IMAGE *out, double X0, double Y0, double Z0 ); -int im_XYZ2UCS( IMAGE *in, IMAGE *out ); -int im_sRGB2XYZ( IMAGE *in, IMAGE *out ); -int im_XYZ2sRGB( IMAGE *in, IMAGE *out ); -int im_Yxy2XYZ( IMAGE *in, IMAGE *out ); -int im_XYZ2Yxy( IMAGE *in, IMAGE *out ); +int im_LCh2Lab( VipsImage *in, VipsImage *out ); +int im_LabQ2XYZ( VipsImage *in, VipsImage *out ); +int im_rad2float( VipsImage *in, VipsImage *out ); +int im_float2rad( VipsImage *in, VipsImage *out ); +int im_LCh2UCS( VipsImage *in, VipsImage *out ); +int im_Lab2LCh( VipsImage *in, VipsImage *out ); +int im_Lab2LabQ( VipsImage *in, VipsImage *out ); +int im_Lab2LabS( VipsImage *in, VipsImage *out ); +int im_Lab2XYZ( VipsImage *in, VipsImage *out ); +int im_Lab2XYZ_temp( VipsImage *in, VipsImage *out, + double X0, double Y0, double Z0 ); +int im_Lab2UCS( VipsImage *in, VipsImage *out ); +int im_LabQ2Lab( VipsImage *in, VipsImage *out ); +int im_LabQ2LabS( VipsImage *in, VipsImage *out ); +int im_LabS2LabQ( VipsImage *in, VipsImage *out ); +int im_LabS2Lab( VipsImage *in, VipsImage *out ); +int im_UCS2XYZ( VipsImage *in, VipsImage *out ); +int im_UCS2LCh( VipsImage *in, VipsImage *out ); +int im_UCS2Lab( VipsImage *in, VipsImage *out ); +int im_XYZ2Lab( VipsImage *in, VipsImage *out ); +int im_XYZ2Lab_temp( VipsImage *in, VipsImage *out, + double X0, double Y0, double Z0 ); +int im_XYZ2UCS( VipsImage *in, VipsImage *out ); +int im_sRGB2XYZ( VipsImage *in, VipsImage *out ); +int im_XYZ2sRGB( VipsImage *in, VipsImage *out ); +int im_Yxy2XYZ( VipsImage *in, VipsImage *out ); +int im_XYZ2Yxy( VipsImage *in, VipsImage *out ); -int im_dECMC_fromLab( IMAGE *in1, IMAGE *in2, IMAGE *out ); -int im_dE00_fromLab( IMAGE *in1, IMAGE *in2, IMAGE *out ); -int im_dE_fromXYZ( IMAGE *in1, IMAGE *in2, IMAGE *out ); -int im_dE_fromLab( IMAGE *in1, IMAGE *in2, IMAGE *out ); +int im_dECMC_fromLab( VipsImage *in1, VipsImage *in2, VipsImage *out ); +int im_dE00_fromLab( VipsImage *in1, VipsImage *in2, VipsImage *out ); +int im_dE_fromXYZ( VipsImage *in1, VipsImage *in2, VipsImage *out ); +int im_dE_fromLab( VipsImage *in1, VipsImage *in2, VipsImage *out ); -int im_lab_morph( IMAGE *in, IMAGE *out, +int im_lab_morph( VipsImage *in, VipsImage *out, DOUBLEMASK *mask, double L_offset, double L_scale, double a_scale, double b_scale ); @@ -164,16 +166,16 @@ typedef enum { } VipsIntent; int im_icc_present( void ); -int im_icc_transform( IMAGE *in, IMAGE *out, +int im_icc_transform( VipsImage *in, VipsImage *out, const char *input_profile_filename, const char *output_profile_filename, VipsIntent intent ); -int im_icc_import( IMAGE *in, IMAGE *out, +int im_icc_import( VipsImage *in, VipsImage *out, const char *input_profile_filename, VipsIntent intent ); -int im_icc_import_embedded( IMAGE *in, IMAGE *out, VipsIntent intent ); -int im_icc_export_depth( IMAGE *in, IMAGE *out, int depth, +int im_icc_import_embedded( VipsImage *in, VipsImage *out, VipsIntent intent ); +int im_icc_export_depth( VipsImage *in, VipsImage *out, int depth, const char *output_profile_filename, VipsIntent intent ); -int im_icc_ac2rc( IMAGE *in, IMAGE *out, const char *profile_filename ); +int im_icc_ac2rc( VipsImage *in, VipsImage *out, const char *profile_filename ); #ifdef __cplusplus } diff --git a/libvips/include/vips/convolution.h b/libvips/include/vips/convolution.h index 7b0d1be8..b5f14707 100644 --- a/libvips/include/vips/convolution.h +++ b/libvips/include/vips/convolution.h @@ -37,30 +37,30 @@ extern "C" { #endif /*__cplusplus*/ -int im_conv( IMAGE *in, IMAGE *out, INTMASK *mask ); -int im_conv_f( IMAGE *in, IMAGE *out, DOUBLEMASK *mask ); -int im_convsep( IMAGE *in, IMAGE *out, INTMASK *mask ); -int im_convsep_f( IMAGE *in, IMAGE *out, DOUBLEMASK *mask ); +int im_conv( VipsImage *in, VipsImage *out, INTMASK *mask ); +int im_conv_f( VipsImage *in, VipsImage *out, DOUBLEMASK *mask ); +int im_convsep( VipsImage *in, VipsImage *out, INTMASK *mask ); +int im_convsep_f( VipsImage *in, VipsImage *out, DOUBLEMASK *mask ); -int im_compass( IMAGE *in, IMAGE *out, INTMASK *mask ); -int im_gradient( IMAGE *in, IMAGE *out, INTMASK *mask ); -int im_lindetect( IMAGE *in, IMAGE *out, INTMASK *mask ); +int im_compass( VipsImage *in, VipsImage *out, INTMASK *mask ); +int im_gradient( VipsImage *in, VipsImage *out, INTMASK *mask ); +int im_lindetect( VipsImage *in, VipsImage *out, INTMASK *mask ); -int im_sharpen( IMAGE *in, IMAGE *out, +int im_sharpen( VipsImage *in, VipsImage *out, int mask_size, double x1, double y2, double y3, double m1, double m2 ); -int im_grad_x( IMAGE *in, IMAGE *out ); -int im_grad_y( IMAGE *in, IMAGE *out ); +int im_grad_x( VipsImage *in, VipsImage *out ); +int im_grad_y( VipsImage *in, VipsImage *out ); -int im_fastcor( IMAGE *in, IMAGE *ref, IMAGE *out ); -int im_spcor( IMAGE *in, IMAGE *ref, IMAGE *out ); -int im_gradcor( IMAGE *in, IMAGE *ref, IMAGE *out ); -int im_contrast_surface( IMAGE *in, IMAGE *out, +int im_fastcor( VipsImage *in, VipsImage *ref, VipsImage *out ); +int im_spcor( VipsImage *in, VipsImage *ref, VipsImage *out ); +int im_gradcor( VipsImage *in, VipsImage *ref, VipsImage *out ); +int im_contrast_surface( VipsImage *in, VipsImage *out, int half_win_size, int spacing ); -int im_addgnoise( IMAGE *in, IMAGE *out, double sigma ); +int im_addgnoise( VipsImage *in, VipsImage *out, double sigma ); #ifdef __cplusplus } diff --git a/libvips/include/vips/disp.h b/libvips/include/vips/disp.h index dc96365a..b136b659 100644 --- a/libvips/include/vips/disp.h +++ b/libvips/include/vips/disp.h @@ -84,11 +84,11 @@ int im_col_XYZ2rgb( int *r_ret, int *g_ret, int *b_ret, int *or_ret ); -int im_XYZ2disp( IMAGE *in, IMAGE *out, struct im_col_display *d ); -int im_Lab2disp( IMAGE *in, IMAGE *out, struct im_col_display *d ); -int im_LabQ2disp( IMAGE *in, IMAGE *out, struct im_col_display *d ); -int im_disp2XYZ( IMAGE *in, IMAGE *out, struct im_col_display *d ); -int im_disp2Lab( IMAGE *in, IMAGE *out, struct im_col_display *d ); +int im_XYZ2disp( VipsImage *in, VipsImage *out, struct im_col_display *d ); +int im_Lab2disp( VipsImage *in, VipsImage *out, struct im_col_display *d ); +int im_LabQ2disp( VipsImage *in, VipsImage *out, struct im_col_display *d ); +int im_disp2XYZ( VipsImage *in, VipsImage *out, struct im_col_display *d ); +int im_disp2Lab( VipsImage *in, VipsImage *out, struct im_col_display *d ); /* Colour display values and arrays &im_col_screen_white, index 0 @@ -103,12 +103,12 @@ int im_disp2Lab( IMAGE *in, IMAGE *out, struct im_col_display *d ); struct im_col_display *im_col_displays( int n ); struct im_col_display *im_col_display_name( const char *name ); -void *im_LabQ2disp_build_table( IMAGE *out, struct im_col_display *d ); -int im_LabQ2disp_table( IMAGE *in, IMAGE *out, void *table ); +void *im_LabQ2disp_build_table( VipsImage *out, struct im_col_display *d ); +int im_LabQ2disp_table( VipsImage *in, VipsImage *out, void *table ); -int im_dE_fromdisp( IMAGE *in1, IMAGE *in2, IMAGE *out, +int im_dE_fromdisp( VipsImage *in1, VipsImage *in2, VipsImage *out, struct im_col_display *d ); -int im_dECMC_fromdisp( IMAGE *in1, IMAGE *in2, IMAGE *out, +int im_dECMC_fromdisp( VipsImage *in1, VipsImage *in2, VipsImage *out, struct im_col_display *d ); #ifdef __cplusplus diff --git a/libvips/include/vips/format.h b/libvips/include/vips/format.h index 4405c6a7..aecf922b 100644 --- a/libvips/include/vips/format.h +++ b/libvips/include/vips/format.h @@ -75,17 +75,17 @@ typedef struct _VipsFormatClass { */ gboolean (*is_a)( const char * ); - /* Read just the header into the IMAGE. + /* Read just the header into the VipsImage. */ - int (*header)( const char *, IMAGE * ); + int (*header)( const char *, VipsImage * ); /* Load the whole image. */ - int (*load)( const char *, IMAGE * ); + int (*load)( const char *, VipsImage * ); - /* Write the IMAGE to the file in this format. + /* Write the VipsImage to the file in this format. */ - int (*save)( IMAGE *, const char * ); + int (*save)( VipsImage *, const char * ); /* Get the flags for this file in this format. */ @@ -117,48 +117,48 @@ VipsFormatFlags vips_format_get_flags( VipsFormatClass *format, /* Read/write an image convenience functions. */ -int vips_format_read( const char *filename, IMAGE *out ); -int vips_format_write( IMAGE *in, const char *filename ); +int vips_format_read( const char *filename, VipsImage *out ); +int vips_format_write( VipsImage *in, const char *filename ); /* Low-level read/write operations. */ -int im_jpeg2vips( const char *filename, IMAGE *out ); -int im_vips2jpeg( IMAGE *in, const char *filename ); -int im_vips2mimejpeg( IMAGE *in, int qfac ); -int im_vips2bufjpeg( IMAGE *in, IMAGE *out, int qfac, char **obuf, int *olen ); +int im_jpeg2vips( const char *filename, VipsImage *out ); +int im_vips2jpeg( VipsImage *in, const char *filename ); +int im_vips2mimejpeg( VipsImage *in, int qfac ); +int im_vips2bufjpeg( VipsImage *in, VipsImage *out, int qfac, char **obuf, int *olen ); -int im_tiff2vips( const char *filename, IMAGE *out ); -int im_vips2tiff( IMAGE *in, const char *filename ); -int im_tile_cache( IMAGE *in, IMAGE *out, +int im_tiff2vips( const char *filename, VipsImage *out ); +int im_vips2tiff( VipsImage *in, const char *filename ); +int im_tile_cache( VipsImage *in, VipsImage *out, int tile_width, int tile_height, int max_tiles ); -int im_magick2vips( const char *filename, IMAGE *out ); +int im_magick2vips( const char *filename, VipsImage *out ); -int im_exr2vips( const char *filename, IMAGE *out ); +int im_exr2vips( const char *filename, VipsImage *out ); -int im_ppm2vips( const char *filename, IMAGE *out ); -int im_vips2ppm( IMAGE *in, const char *filename ); +int im_ppm2vips( const char *filename, VipsImage *out ); +int im_vips2ppm( VipsImage *in, const char *filename ); -int im_analyze2vips( const char *filename, IMAGE *out ); +int im_analyze2vips( const char *filename, VipsImage *out ); -int im_csv2vips( const char *filename, IMAGE *out ); -int im_vips2csv( IMAGE *in, const char *filename ); +int im_csv2vips( const char *filename, VipsImage *out ); +int im_vips2csv( VipsImage *in, const char *filename ); -int im_png2vips( const char *filename, IMAGE *out ); -int im_vips2png( IMAGE *in, const char *filename ); -int im_vips2bufpng( IMAGE *in, IMAGE *out, +int im_png2vips( const char *filename, VipsImage *out ); +int im_vips2png( VipsImage *in, const char *filename ); +int im_vips2bufpng( VipsImage *in, VipsImage *out, int compression, int interlace, char **obuf, size_t *olen ); -int im_raw2vips( const char *filename, IMAGE *out, +int im_raw2vips( const char *filename, VipsImage *out, int width, int height, int bpp, int offset ); -int im_vips2raw( IMAGE *in, int fd ); +int im_vips2raw( VipsImage *in, int fd ); -int im_mat2vips( const char *filename, IMAGE *out ); +int im_mat2vips( const char *filename, VipsImage *out ); -int im_rad2vips( const char *filename, IMAGE *out ); -int im_vips2rad( IMAGE *in, const char *filename ); +int im_rad2vips( const char *filename, VipsImage *out ); +int im_vips2rad( VipsImage *in, const char *filename ); -int im_fits2vips( const char *filename, IMAGE *out ); +int im_fits2vips( const char *filename, VipsImage *out ); #ifdef __cplusplus } diff --git a/libvips/include/vips/freq_filt.h b/libvips/include/vips/freq_filt.h index dacd6648..440a42a1 100644 --- a/libvips/include/vips/freq_filt.h +++ b/libvips/include/vips/freq_filt.h @@ -62,18 +62,19 @@ typedef enum { VIPS_MASK_FRACTAL_FLT = 18 } VipsMaskType; -int im_fwfft( IMAGE *in, IMAGE *out ); -int im_invfft( IMAGE *in, IMAGE *out ); -int im_invfftr( IMAGE *in, IMAGE *out ); +int im_fwfft( VipsImage *in, VipsImage *out ); +int im_invfft( VipsImage *in, VipsImage *out ); +int im_invfftr( VipsImage *in, VipsImage *out ); -int im_freqflt( IMAGE *in, IMAGE *mask, IMAGE *out ); -int im_disp_ps( IMAGE *in, IMAGE *out ); -int im_rotquad( IMAGE *in, IMAGE *out ); -int im_phasecor_fft( IMAGE *in1, IMAGE *in2, IMAGE *out ); +int im_freqflt( VipsImage *in, VipsImage *mask, VipsImage *out ); +int im_disp_ps( VipsImage *in, VipsImage *out ); +int im_rotquad( VipsImage *in, VipsImage *out ); +int im_phasecor_fft( VipsImage *in1, VipsImage *in2, VipsImage *out ); -int im_flt_image_freq( IMAGE *in, IMAGE *out, VipsMaskType flag, ... ); -int im_create_fmask( IMAGE *out, int xsize, int ysize, VipsMaskType flag, ... ); -int im_fractsurf( IMAGE *out, int size, double frd ); +int im_flt_image_freq( VipsImage *in, VipsImage *out, VipsMaskType flag, ... ); +int im_create_fmask( VipsImage *out, + int xsize, int ysize, VipsMaskType flag, ... ); +int im_fractsurf( VipsImage *out, int size, double frd ); #ifdef __cplusplus } diff --git a/libvips/include/vips/generate.h b/libvips/include/vips/generate.h index d1fcd025..0f4f54ea 100644 --- a/libvips/include/vips/generate.h +++ b/libvips/include/vips/generate.h @@ -36,56 +36,56 @@ extern "C" { #endif /*__cplusplus*/ -typedef void *(*im_start_fn)( IMAGE *out, void *a, void *b ); +typedef void *(*im_start_fn)( VipsImage *out, void *a, void *b ); typedef int (*im_generate_fn)( VipsRegion *out, void *seq, void *a, void *b ); typedef int (*im_stop_fn)( void *seq, void *a, void *b ); -void *im_start_one( IMAGE *out, void *a, void *b ); +void *im_start_one( VipsImage *out, void *a, void *b ); int im_stop_one( void *seq, void *a, void *b ); -void *im_start_many( IMAGE *out, void *a, void *b ); +void *im_start_many( VipsImage *out, void *a, void *b ); int im_stop_many( void *seq, void *a, void *b ); -IMAGE **im_allocate_input_array( IMAGE *out, ... ) +VipsImage **im_allocate_input_array( VipsImage *out, ... ) __attribute__((sentinel)); -int im_generate( IMAGE *im, +int im_generate( VipsImage *im, im_start_fn start, im_generate_fn generate, im_stop_fn stop, void *a, void *b ); -int im_iterate( IMAGE *im, +int im_iterate( VipsImage *im, im_start_fn start, im_generate_fn generate, im_stop_fn stop, void *a, void *b ); -int im_demand_hint_array( IMAGE *im, im_demand_type hint, IMAGE **in ); -int im_demand_hint( IMAGE *im, im_demand_type hint, ... ) +int im_demand_hint_array( VipsImage *im, im_demand_type hint, VipsImage **in ); +int im_demand_hint( VipsImage *im, im_demand_type hint, ... ) __attribute__((sentinel)); /* Buffer processing. */ typedef void (*im_wrapone_fn)( void *in, void *out, int width, void *a, void *b ); -int im_wrapone( IMAGE *in, IMAGE *out, +int im_wrapone( VipsImage *in, VipsImage *out, im_wrapone_fn fn, void *a, void *b ); typedef void (*im_wraptwo_fn)( void *in1, void *in2, void *out, int width, void *a, void *b ); -int im_wraptwo( IMAGE *in1, IMAGE *in2, IMAGE *out, +int im_wraptwo( VipsImage *in1, VipsImage *in2, VipsImage *out, im_wraptwo_fn fn, void *a, void *b ); typedef void (*im_wrapmany_fn)( void **in, void *out, int width, void *a, void *b ); -int im_wrapmany( IMAGE **in, IMAGE *out, +int im_wrapmany( VipsImage **in, VipsImage *out, im_wrapmany_fn fn, void *a, void *b ); /* Async rendering. */ -int im_render_priority( IMAGE *in, IMAGE *out, IMAGE *mask, +int im_render_priority( VipsImage *in, VipsImage *out, VipsImage *mask, int width, int height, int max, int priority, - void (*notify)( IMAGE *, Rect *, void * ), void *client ); -int im_cache( IMAGE *in, IMAGE *out, int width, int height, int max ); + void (*notify)( VipsImage *, Rect *, void * ), void *client ); +int im_cache( VipsImage *in, VipsImage *out, int width, int height, int max ); -int im_setupout( IMAGE *im ); +int im_setupout( VipsImage *im ); #ifdef __cplusplus } diff --git a/libvips/include/vips/header.h b/libvips/include/vips/header.h index 52629104..5339428b 100644 --- a/libvips/include/vips/header.h +++ b/libvips/include/vips/header.h @@ -37,20 +37,21 @@ extern "C" { #endif /*__cplusplus*/ -int im_header_int( IMAGE *im, const char *field, int *out ); -int im_header_double( IMAGE *im, const char *field, double *out ); -int im_header_string( IMAGE *im, const char *field, char **out ); -int im_header_as_string( IMAGE *im, const char *field, char **out ); -GType im_header_get_typeof( IMAGE *im, const char *field ); -int im_header_get( IMAGE *im, const char *field, GValue *value_copy ); +int im_header_int( VipsImage *im, const char *field, int *out ); +int im_header_double( VipsImage *im, const char *field, double *out ); +int im_header_string( VipsImage *im, const char *field, char **out ); +int im_header_as_string( VipsImage *im, const char *field, char **out ); +GType im_header_get_typeof( VipsImage *im, const char *field ); +int im_header_get( VipsImage *im, const char *field, GValue *value_copy ); -typedef void *(*im_header_map_fn)( IMAGE *, const char *, GValue *, void * ); -void *im_header_map( IMAGE *im, im_header_map_fn fn, void *a ); +typedef void *(*im_header_map_fn)( VipsImage *, + const char *, GValue *, void * ); +void *im_header_map( VipsImage *im, im_header_map_fn fn, void *a ); -int im_histlin( IMAGE *im, const char *fmt, ... ) +int im_histlin( VipsImage *im, const char *fmt, ... ) __attribute__((format(printf, 2, 3))); -int im_updatehist( IMAGE *out, const char *name, int argc, char *argv[] ); -const char *im_history_get( IMAGE *im ); +int im_updatehist( VipsImage *out, const char *name, int argc, char *argv[] ); +const char *im_history_get( VipsImage *im ); #ifdef __cplusplus } diff --git a/libvips/include/vips/histograms_lut.h b/libvips/include/vips/histograms_lut.h index da47d017..8fea5d85 100644 --- a/libvips/include/vips/histograms_lut.h +++ b/libvips/include/vips/histograms_lut.h @@ -37,46 +37,46 @@ extern "C" { #endif /*__cplusplus*/ -int im_histgr( IMAGE *in, IMAGE *out, int bandno ); -int im_histnD( IMAGE *in, IMAGE *out, int bins ); -int im_hist_indexed( IMAGE *index, IMAGE *value, IMAGE *out ); +int im_histgr( VipsImage *in, VipsImage *out, int bandno ); +int im_histnD( VipsImage *in, VipsImage *out, int bins ); +int im_hist_indexed( VipsImage *index, VipsImage *value, VipsImage *out ); -int im_identity( IMAGE *lut, int bands ); -int im_identity_ushort( IMAGE *lut, int bands, int sz ); -int im_invertlut( DOUBLEMASK *input, IMAGE *output, int lut_size ); -int im_buildlut( DOUBLEMASK *input, IMAGE *output ); -int im_project( IMAGE *in, IMAGE *hout, IMAGE *vout ); +int im_identity( VipsImage *lut, int bands ); +int im_identity_ushort( VipsImage *lut, int bands, int sz ); +int im_invertlut( DOUBLEMASK *input, VipsImage *output, int lut_size ); +int im_buildlut( DOUBLEMASK *input, VipsImage *output ); +int im_project( VipsImage *in, VipsImage *hout, VipsImage *vout ); -int im_histnorm( IMAGE *in, IMAGE *out ); -int im_histcum( IMAGE *in, IMAGE *out ); -int im_histeq( IMAGE *in, IMAGE *out ); -int im_histspec( IMAGE *in, IMAGE *ref, IMAGE *out ); -int im_ismonotonic( IMAGE *lut, int *out ); -int im_histplot( IMAGE *in, IMAGE *out ); +int im_histnorm( VipsImage *in, VipsImage *out ); +int im_histcum( VipsImage *in, VipsImage *out ); +int im_histeq( VipsImage *in, VipsImage *out ); +int im_histspec( VipsImage *in, VipsImage *ref, VipsImage *out ); +int im_ismonotonic( VipsImage *lut, int *out ); +int im_histplot( VipsImage *in, VipsImage *out ); -int im_maplut( IMAGE *in, IMAGE *out, IMAGE *lut ); +int im_maplut( VipsImage *in, VipsImage *out, VipsImage *lut ); -int im_hist( IMAGE *in, IMAGE *out, int bandno ); -int im_hsp( IMAGE *in, IMAGE *ref, IMAGE *out ); -int im_gammacorrect( IMAGE *in, IMAGE *out, double exponent ); -int im_mpercent( IMAGE *in, double percent, int *out ); -int im_mpercent_hist( IMAGE *hist, double percent, int *out ); +int im_hist( VipsImage *in, VipsImage *out, int bandno ); +int im_hsp( VipsImage *in, VipsImage *ref, VipsImage *out ); +int im_gammacorrect( VipsImage *in, VipsImage *out, double exponent ); +int im_mpercent( VipsImage *in, double percent, int *out ); +int im_mpercent_hist( VipsImage *hist, double percent, int *out ); -int im_heq( IMAGE *in, IMAGE *out, int bandno ); -int im_lhisteq( IMAGE *in, IMAGE *out, int xwin, int ywin ); -int im_stdif( IMAGE *in, IMAGE *out, +int im_heq( VipsImage *in, VipsImage *out, int bandno ); +int im_lhisteq( VipsImage *in, VipsImage *out, int xwin, int ywin ); +int im_stdif( VipsImage *in, VipsImage *out, double a, double m0, double b, double s0, int xwin, int ywin ); -int im_tone_build_range( IMAGE *out, +int im_tone_build_range( VipsImage *out, int in_max, int out_max, double Lb, double Lw, double Ps, double Pm, double Ph, double S, double M, double H ); -int im_tone_build( IMAGE *out, +int im_tone_build( VipsImage *out, double Lb, double Lw, double Ps, double Pm, double Ph, double S, double M, double H ); -int im_tone_analyse( IMAGE *in, IMAGE *out, +int im_tone_analyse( VipsImage *in, VipsImage *out, double Ps, double Pm, double Ph, double S, double M, double H ); -int im_tone_map( IMAGE *in, IMAGE *out, IMAGE *lut ); +int im_tone_map( VipsImage *in, VipsImage *out, VipsImage *lut ); #ifdef __cplusplus } diff --git a/libvips/include/vips/internal.h b/libvips/include/vips/internal.h index 02bb042c..e1ea346b 100644 --- a/libvips/include/vips/internal.h +++ b/libvips/include/vips/internal.h @@ -79,7 +79,6 @@ typedef int (*im__fftproc_fn)( VipsImage *, VipsImage *, VipsImage * ); /* iofuncs */ -int vips_open_input( VipsImage *image ); int vips_image_open_input( VipsImage *image ); int im_mapfile( VipsImage * ); diff --git a/libvips/include/vips/meta.h b/libvips/include/vips/meta.h index 4c856223..fb4dd67f 100644 --- a/libvips/include/vips/meta.h +++ b/libvips/include/vips/meta.h @@ -40,6 +40,7 @@ extern "C" { * The name that JPEG read and write operations use for the image's EXIF data. */ #define IM_META_EXIF_NAME "exif-data" + /** * IM_META_ICC_NAME: * @@ -49,6 +50,7 @@ extern "C" { * im_icc_transform() operations. */ #define IM_META_ICC_NAME "icc-profile-data" + /** * IM_META_XML: * @@ -56,6 +58,7 @@ extern "C" { * format file. */ #define IM_META_XML "xml-header" + /** * IM_META_RESOLUTION_UNIT: * @@ -111,23 +114,23 @@ void *im_blob_get( const GValue *value, size_t *length ); int im_blob_set( GValue *value, im_callback_fn free_fn, void *data, size_t length ); -int im_meta_set( IMAGE *im, const char *field, GValue *value ); -gboolean im_meta_remove( IMAGE *im, const char *field ); -int im_meta_get( IMAGE *im, const char *field, GValue *value_copy ); -GType im_meta_get_typeof( IMAGE *im, const char *field ); +int im_meta_set( VipsImage *im, const char *field, GValue *value ); +gboolean im_meta_remove( VipsImage *im, const char *field ); +int im_meta_get( VipsImage *im, const char *field, GValue *value_copy ); +GType im_meta_get_typeof( VipsImage *im, const char *field ); -int im_meta_set_int( IMAGE *im, const char *field, int i ); -int im_meta_get_int( IMAGE *im, const char *field, int *i ); -int im_meta_set_double( IMAGE *im, const char *field, double d ); -int im_meta_get_double( IMAGE *im, const char *field, double *d ); -int im_meta_set_area( IMAGE *im, +int im_meta_set_int( VipsImage *im, const char *field, int i ); +int im_meta_get_int( VipsImage *im, const char *field, int *i ); +int im_meta_set_double( VipsImage *im, const char *field, double d ); +int im_meta_get_double( VipsImage *im, const char *field, double *d ); +int im_meta_set_area( VipsImage *im, const char *field, im_callback_fn free_fn, void *data ); -int im_meta_get_area( IMAGE *im, const char *field, void **data ); -int im_meta_set_string( IMAGE *im, const char *field, const char *str ); -int im_meta_get_string( IMAGE *im, const char *field, char **str ); -int im_meta_set_blob( IMAGE *im, const char *field, +int im_meta_get_area( VipsImage *im, const char *field, void **data ); +int im_meta_set_string( VipsImage *im, const char *field, const char *str ); +int im_meta_get_string( VipsImage *im, const char *field, char **str ); +int im_meta_set_blob( VipsImage *im, const char *field, im_callback_fn free_fn, void *data, size_t length ); -int im_meta_get_blob( IMAGE *im, const char *field, +int im_meta_get_blob( VipsImage *im, const char *field, void **data, size_t *length ); #ifdef __cplusplus diff --git a/libvips/include/vips/morphology.h b/libvips/include/vips/morphology.h index 1ec61c16..5a9688f6 100644 --- a/libvips/include/vips/morphology.h +++ b/libvips/include/vips/morphology.h @@ -37,17 +37,17 @@ extern "C" { #endif /*__cplusplus*/ -int im_dilate( IMAGE *in, IMAGE *out, INTMASK *mask ); -int im_erode( IMAGE *in, IMAGE *out, INTMASK *mask ); +int im_dilate( VipsImage *in, VipsImage *out, INTMASK *mask ); +int im_erode( VipsImage *in, VipsImage *out, INTMASK *mask ); -int im_rank( IMAGE *in, IMAGE *out, int width, int height, int index ); -int im_rank_image( IMAGE **in, IMAGE *out, int n, int index ); -int im_maxvalue( IMAGE **in, IMAGE *out, int n ); +int im_rank( VipsImage *in, VipsImage *out, int width, int height, int index ); +int im_rank_image( VipsImage **in, VipsImage *out, int n, int index ); +int im_maxvalue( VipsImage **in, VipsImage *out, int n ); -int im_cntlines( IMAGE *im, double *nolines, int flag ); -int im_zerox( IMAGE *in, IMAGE *out, int sign ); -int im_profile( IMAGE *in, IMAGE *out, int dir ); -int im_label_regions( IMAGE *test, IMAGE *mask, int *segments ); +int im_cntlines( VipsImage *im, double *nolines, int flag ); +int im_zerox( VipsImage *in, VipsImage *out, int sign ); +int im_profile( VipsImage *in, VipsImage *out, int dir ); +int im_label_regions( VipsImage *test, VipsImage *mask, int *segments ); #ifdef __cplusplus } diff --git a/libvips/include/vips/mosaicing.h b/libvips/include/vips/mosaicing.h index 0495053a..f3c90cb4 100644 --- a/libvips/include/vips/mosaicing.h +++ b/libvips/include/vips/mosaicing.h @@ -37,41 +37,41 @@ extern "C" { #endif /*__cplusplus*/ -int im_lrmerge( IMAGE *ref, IMAGE *sec, IMAGE *out, +int im_lrmerge( VipsImage *ref, VipsImage *sec, VipsImage *out, int dx, int dy, int mwidth ); -int im_tbmerge( IMAGE *ref, IMAGE *sec, IMAGE *out, +int im_tbmerge( VipsImage *ref, VipsImage *sec, VipsImage *out, int dx, int dy, int mwidth ); -int im_lrmerge1( IMAGE *ref, IMAGE *sec, IMAGE *out, +int im_lrmerge1( VipsImage *ref, VipsImage *sec, VipsImage *out, int xr1, int yr1, int xs1, int ys1, int xr2, int yr2, int xs2, int ys2, int mwidth ); -int im_tbmerge1( IMAGE *ref, IMAGE *sec, IMAGE *out, +int im_tbmerge1( VipsImage *ref, VipsImage *sec, VipsImage *out, int xr1, int yr1, int xs1, int ys1, int xr2, int yr2, int xs2, int ys2, int mwidth ); -int im_lrmosaic( IMAGE *ref, IMAGE *sec, IMAGE *out, +int im_lrmosaic( VipsImage *ref, VipsImage *sec, VipsImage *out, int bandno, int xref, int yref, int xsec, int ysec, int hwindowsize, int hsearchsize, int balancetype, int mwidth ); -int im_tbmosaic( IMAGE *ref, IMAGE *sec, IMAGE *out, +int im_tbmosaic( VipsImage *ref, VipsImage *sec, VipsImage *out, int bandno, int xref, int yref, int xsec, int ysec, int hwindowsize, int hsearchsize, int balancetype, int mwidth ); -int im_lrmosaic1( IMAGE *ref, IMAGE *sec, IMAGE *out, +int im_lrmosaic1( VipsImage *ref, VipsImage *sec, VipsImage *out, int bandno, int xr1, int yr1, int xs1, int ys1, int xr2, int yr2, int xs2, int ys2, int hwindowsize, int hsearchsize, int balancetype, int mwidth ); -int im_tbmosaic1( IMAGE *ref, IMAGE *sec, IMAGE *out, +int im_tbmosaic1( VipsImage *ref, VipsImage *sec, VipsImage *out, int bandno, int xr1, int yr1, int xs1, int ys1, int xr2, int yr2, int xs2, int ys2, @@ -79,18 +79,18 @@ int im_tbmosaic1( IMAGE *ref, IMAGE *sec, IMAGE *out, int balancetype, int mwidth ); -int im_global_balance( IMAGE *in, IMAGE *out, double gamma ); -int im_global_balancef( IMAGE *in, IMAGE *out, double gamma ); +int im_global_balance( VipsImage *in, VipsImage *out, double gamma ); +int im_global_balancef( VipsImage *in, VipsImage *out, double gamma ); -int im_correl( IMAGE *ref, IMAGE *sec, +int im_correl( VipsImage *ref, VipsImage *sec, int xref, int yref, int xsec, int ysec, int hwindowsize, int hsearchsize, double *correlation, int *x, int *y ); -int im_remosaic( IMAGE *in, IMAGE *out, +int im_remosaic( VipsImage *in, VipsImage *out, const char *old_str, const char *new_str ); -int im_align_bands( IMAGE *in, IMAGE *out ); -int im_maxpos_subpel( IMAGE *in, double *x, double *y ); +int im_align_bands( VipsImage *in, VipsImage *out ); +int im_maxpos_subpel( VipsImage *in, double *x, double *y ); #ifdef __cplusplus } diff --git a/libvips/include/vips/other.h b/libvips/include/vips/other.h index 83ad90eb..77182944 100644 --- a/libvips/include/vips/other.h +++ b/libvips/include/vips/other.h @@ -37,21 +37,21 @@ extern "C" { #endif /*__cplusplus*/ -int im_grey( IMAGE *out, const int xsize, const int ysize ); -int im_fgrey( IMAGE *out, const int xsize, const int ysize ); -int im_make_xy( IMAGE *out, const int xsize, const int ysize ); +int im_grey( VipsImage *out, const int xsize, const int ysize ); +int im_fgrey( VipsImage *out, const int xsize, const int ysize ); +int im_make_xy( VipsImage *out, const int xsize, const int ysize ); -int im_feye( IMAGE *out, +int im_feye( VipsImage *out, const int xsize, const int ysize, const double factor ); -int im_eye( IMAGE *out, +int im_eye( VipsImage *out, const int xsize, const int ysize, const double factor ); -int im_zone( IMAGE *out, int size ); -int im_fzone( IMAGE *out, int size ); -int im_sines( IMAGE *out, +int im_zone( VipsImage *out, int size ); +int im_fzone( VipsImage *out, int size ); +int im_sines( VipsImage *out, int xsize, int ysize, double horfreq, double verfreq ); -int im_benchmarkn( IMAGE *in, IMAGE *out, int n ); -int im_benchmark2( IMAGE *in, double *out ); +int im_benchmarkn( VipsImage *in, VipsImage *out, int n ); +int im_benchmark2( VipsImage *in, double *out ); #ifdef __cplusplus } diff --git a/libvips/include/vips/private.h b/libvips/include/vips/private.h index 6ca3656f..74bc21a4 100644 --- a/libvips/include/vips/private.h +++ b/libvips/include/vips/private.h @@ -58,11 +58,11 @@ extern "C" { typedef unsigned char PEL; /* useful datum */ /* What we track for each mmap window. Have a list of these on an openin - * IMAGE. + * VipsImage. */ typedef struct { int ref_count; /* # of regions referencing us */ - struct _VipsImage *im; /* IMAGE we are attached to */ + struct _VipsImage *im; /* VipsImage we are attached to */ int top; /* Area of image we have mapped, in pixels */ int height; @@ -101,7 +101,7 @@ typedef struct im__buffer_cache_list_t { */ typedef struct im__buffer_t { int ref_count; /* # of regions referencing us */ - struct _VipsImage *im; /* IMAGE we are attached to */ + struct _VipsImage *im; /* VipsImage we are attached to */ Rect area; /* Area this pixel buffer covers */ gboolean done; /* Calculated and in cache */ diff --git a/libvips/include/vips/region.h b/libvips/include/vips/region.h index 38744a9b..bc271770 100644 --- a/libvips/include/vips/region.h +++ b/libvips/include/vips/region.h @@ -62,7 +62,7 @@ typedef struct _VipsRegion { /*< public >*/ /* Users may read these two fields. */ - IMAGE *im; /* Link back to parent image */ + VipsImage *im; /* Link back to parent image */ Rect valid; /* Area of parent we can see */ /* The rest of REGION is private. diff --git a/libvips/include/vips/relational.h b/libvips/include/vips/relational.h index b97f2220..c458883b 100644 --- a/libvips/include/vips/relational.h +++ b/libvips/include/vips/relational.h @@ -37,27 +37,27 @@ extern "C" { #endif /*__cplusplus*/ -int im_equal( IMAGE *in1, IMAGE *in2, IMAGE *out ); -int im_notequal( IMAGE *in1, IMAGE *in2, IMAGE *out ); -int im_less( IMAGE *in1, IMAGE *in2, IMAGE *out ); -int im_lesseq( IMAGE *in1, IMAGE *in2, IMAGE *out ); -int im_more( IMAGE *in1, IMAGE *in2, IMAGE *out ); -int im_moreeq( IMAGE *in1, IMAGE *in2, IMAGE *out ); -int im_equal_vec( IMAGE *in, IMAGE *out, int n, double *c ); -int im_notequal_vec( IMAGE *in, IMAGE *out, int n, double *c ); -int im_less_vec( IMAGE *in, IMAGE *out, int n, double *c ); -int im_lesseq_vec( IMAGE *in, IMAGE *out, int n, double *c ); -int im_more_vec( IMAGE *in, IMAGE *out, int n, double *c ); -int im_moreeq_vec( IMAGE *in, IMAGE *out, int n, double *c ); -int im_equalconst( IMAGE *in, IMAGE *out, double c ); -int im_notequalconst( IMAGE *in, IMAGE *out, double c ); -int im_lessconst( IMAGE *in, IMAGE *out, double c ); -int im_lesseqconst( IMAGE *in, IMAGE *out, double c ); -int im_moreconst( IMAGE *in, IMAGE *out, double c ); -int im_moreeqconst( IMAGE *in, IMAGE *out, double c ); +int im_equal( VipsImage *in1, VipsImage *in2, VipsImage *out ); +int im_notequal( VipsImage *in1, VipsImage *in2, VipsImage *out ); +int im_less( VipsImage *in1, VipsImage *in2, VipsImage *out ); +int im_lesseq( VipsImage *in1, VipsImage *in2, VipsImage *out ); +int im_more( VipsImage *in1, VipsImage *in2, VipsImage *out ); +int im_moreeq( VipsImage *in1, VipsImage *in2, VipsImage *out ); +int im_equal_vec( VipsImage *in, VipsImage *out, int n, double *c ); +int im_notequal_vec( VipsImage *in, VipsImage *out, int n, double *c ); +int im_less_vec( VipsImage *in, VipsImage *out, int n, double *c ); +int im_lesseq_vec( VipsImage *in, VipsImage *out, int n, double *c ); +int im_more_vec( VipsImage *in, VipsImage *out, int n, double *c ); +int im_moreeq_vec( VipsImage *in, VipsImage *out, int n, double *c ); +int im_equalconst( VipsImage *in, VipsImage *out, double c ); +int im_notequalconst( VipsImage *in, VipsImage *out, double c ); +int im_lessconst( VipsImage *in, VipsImage *out, double c ); +int im_lesseqconst( VipsImage *in, VipsImage *out, double c ); +int im_moreconst( VipsImage *in, VipsImage *out, double c ); +int im_moreeqconst( VipsImage *in, VipsImage *out, double c ); -int im_ifthenelse( IMAGE *c, IMAGE *a, IMAGE *b, IMAGE *out ); -int im_blend( IMAGE *c, IMAGE *a, IMAGE *b, IMAGE *out ); +int im_ifthenelse( VipsImage *c, VipsImage *a, VipsImage *b, VipsImage *out ); +int im_blend( VipsImage *c, VipsImage *a, VipsImage *b, VipsImage *out ); #ifdef __cplusplus } diff --git a/libvips/include/vips/resample.h b/libvips/include/vips/resample.h index d0b6bfd8..5fbb7896 100644 --- a/libvips/include/vips/resample.h +++ b/libvips/include/vips/resample.h @@ -37,20 +37,21 @@ extern "C" { #endif /*__cplusplus*/ -int im_affinei( IMAGE *in, IMAGE *out, +int im_affinei( VipsImage *in, VipsImage *out, VipsInterpolate *interpolate, double a, double b, double c, double d, double dx, double dy, int ox, int oy, int ow, int oh ); -int im_affinei_all( IMAGE *in, IMAGE *out, VipsInterpolate *interpolate, +int im_affinei_all( VipsImage *in, VipsImage *out, VipsInterpolate *interpolate, double a, double b, double c, double d, double dx, double dy ) ; -int im_shrink( IMAGE *in, IMAGE *out, double xshrink, double yshrink ); -int im_rightshift_size( IMAGE *in, IMAGE *out, int xshift, int yshift, int band_fmt ); +int im_shrink( VipsImage *in, VipsImage *out, double xshrink, double yshrink ); +int im_rightshift_size( VipsImage *in, VipsImage *out, + int xshift, int yshift, int band_fmt ); -int im_match_linear( IMAGE *ref, IMAGE *sec, IMAGE *out, +int im_match_linear( VipsImage *ref, VipsImage *sec, VipsImage *out, int xr1, int yr1, int xs1, int ys1, int xr2, int yr2, int xs2, int ys2 ); -int im_match_linear_search( IMAGE *ref, IMAGE *sec, IMAGE *out, +int im_match_linear_search( VipsImage *ref, VipsImage *sec, VipsImage *out, int xr1, int yr1, int xs1, int ys1, int xr2, int yr2, int xs2, int ys2, int hwindowsize, int hsearchsize ); diff --git a/libvips/include/vips/struct.h b/libvips/include/vips/struct.h deleted file mode 100644 index 99a8bdf9..00000000 --- a/libvips/include/vips/struct.h +++ /dev/null @@ -1,44 +0,0 @@ -/* Header file for structures using the mosaicing programs */ - -/* - - 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 - - */ - -#ifndef IM_STRUCT_H -#define IM_STRUCT_H - -typedef struct { - char *reference, *secondary; - int nopoints; - float *xref, *yref, *xsec, *ysec; -} CNTRL_POINTS; - -typedef struct { - char *reference, *secondary; - float scale, angle, deltax, deltay; - float Xcoef[6], Ycoef[6]; -} MERGE_PARAM; - -#endif /*IM_STRUCT_H*/ diff --git a/libvips/include/vips/transform.h b/libvips/include/vips/transform.h index 884e04cd..05d13e0d 100644 --- a/libvips/include/vips/transform.h +++ b/libvips/include/vips/transform.h @@ -66,4 +66,4 @@ void im__transform_invert_rect( const Transformation *trn, void im__transform_set_area( Transformation * ); -int im__affine( IMAGE *in, IMAGE *out, Transformation *trn ); +int im__affine( VipsImage *in, VipsImage *out, Transformation *trn ); diff --git a/libvips/include/vips/video.h b/libvips/include/vips/video.h index 1516f59a..554425bf 100644 --- a/libvips/include/vips/video.h +++ b/libvips/include/vips/video.h @@ -37,10 +37,10 @@ extern "C" { #endif /*__cplusplus*/ -int im_video_v4l1( IMAGE *im, const char *device, +int im_video_v4l1( VipsImage *im, const char *device, int channel, int brightness, int colour, int contrast, int hue, int ngrabs ); -int im_video_test( IMAGE *im, int brightness, int error ); +int im_video_test( VipsImage *im, int brightness, int error ); #ifdef __cplusplus }