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

Merge branch 'master' into add-composite

Browse Source
This commit is contained in:
John Cupitt 2017-10-01 19:37:26 +01:00
commit aae5babfcc
138 changed files with 451 additions and 447 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -22,6 +22,7 @@
binding instead
- better svgload: larger output, handle missing width/height, thanks lovell
- add vips_composite(): merge an array of images with porter-duff
- better gobject-introspection annotations, thanks astavale
29/8/17 started 8.5.9
- make --fail stop jpeg read on any libjpeg warning, thanks @mceachen

8
configure.ac
View File

@ -60,8 +60,8 @@ GOBJECT_INTROSPECTION_CHECK([1.30.0])
#
# build with a glob and a list of files to exclude from scanning
# see also IGNORE_HFILES in doc/Makefile.am
introspection_sources=$(cd libvips ; find . -name "*.c")
filter_list="deprecated "
introspection_sources=$(cd libvips ; find . -name "*.c"; find . -name "*.cpp")
filter_list="deprecated introspect.c dummy.c fuzz "
# contains(string, substring)
#
@ -101,8 +101,10 @@ headers="\
image.h \
error.h \
foreign.h \
freqfilt.h \
interpolate.h \
header.h \
histogram.h \
operation.h \
enumtypes.h \
conversion.h \
@ -111,8 +113,10 @@ headers="\
convolution.h \
draw.h \
morphology.h \
mosaicing.h \
type.h \
rect.h \
resample.h \
memory.h \
region.h"

3
cplusplus/VImage.cpp
View File

@ -465,8 +465,7 @@ VImage::call_option_string( const char *operation_name,
operation_name );
if( !(operation = vips_operation_new( operation_name )) ) {
if( options )
delete options;
delete options;
throw( VError() );
}

4
libvips/colour/HSV2sRGB.c
View File

@ -132,9 +132,9 @@ vips_HSV2sRGB_init( VipsHSV2sRGB *HSV2sRGB )
}
/**
* vips_HSV2sRGB:
* vips_HSV2sRGB: (method)
* @in: input image
* @out: output image
* @out: (out): output image
* @...: %NULL-terminated list of optional named arguments
*
* Convert HSV to sRGB.

4
libvips/colour/LCh2Lab.c
View File

@ -136,9 +136,9 @@ vips_LCh2Lab_init( VipsLCh2Lab *LCh2Lab )
}
/**
* vips_LCh2Lab:
* vips_LCh2Lab: (method)
* @in: input image
* @out: output image
* @out: (out): output image
* @...: %NULL-terminated list of optional named arguments
*
* Turn LCh to Lab.

4
libvips/colour/LCh2UCS.c
View File

@ -217,9 +217,9 @@ vips_LCh2CMC_init( VipsLCh2CMC *LCh2CMC )
}
/**
* vips_LCh2CMC:
* vips_LCh2CMC: (method)
* @in: input image
* @out: output image
* @out: (out): output image
* @...: %NULL-terminated list of optional named arguments
*
* Turn LCh to CMC.

4
libvips/colour/Lab2LCh.c
View File

@ -160,9 +160,9 @@ vips_Lab2LCh_init( VipsLab2LCh *Lab2LCh )
}
/**
* vips_Lab2LCh:
* vips_Lab2LCh: (method)
* @in: input image
* @out: output image
* @out: (out): output image
* @...: %NULL-terminated list of optional named arguments
*
* Turn Lab to LCh.

4
libvips/colour/Lab2LabQ.c
View File

@ -156,9 +156,9 @@ vips_Lab2LabQ_init( VipsLab2LabQ *Lab2LabQ )
}
/**
* vips_Lab2LabQ:
* vips_Lab2LabQ: (method)
* @in: input image
* @out: output image
* @out: (out): output image
* @...: %NULL-terminated list of optional named arguments
*
* Convert a Lab three-band float image to LabQ (#VIPS_CODING_LABQ).

4
libvips/colour/Lab2LabS.c
View File

@ -98,9 +98,9 @@ vips_Lab2LabS_init( VipsLab2LabS *Lab2LabS )
}
/**
* vips_Lab2LabS:
* vips_Lab2LabS: (method)
* @in: input image
* @out: output image
* @out: (out): output image
* @...: %NULL-terminated list of optional named arguments
*
* Turn Lab to LabS, signed 16-bit int fixed point.

10
libvips/colour/Lab2XYZ.c
View File

@ -192,9 +192,9 @@ vips_Lab2XYZ_init( VipsLab2XYZ *Lab2XYZ )
}
/**
* vips_Lab2XYZ:
* vips_Lab2XYZ: (method)
* @in: input image
* @out: output image
* @out: (out): output image
* @...: %NULL-terminated list of optional named arguments
*
* Optional arguments:
@ -224,9 +224,9 @@ vips_Lab2XYZ( VipsImage *in, VipsImage **out, ... )
* @L: Input CIE Lab value
* @a: Input CIE Lab value
* @b: Input CIE Lab value
* @X: Return CIE XYZ colour
* @Y: Return CIE XYZ colour
* @Z: Return CIE XYZ colour
* @X: (out): Return CIE XYZ colour
* @Y: (out): Return CIE XYZ colour
* @Z: (out): Return CIE XYZ colour
*
* Calculate XYZ from Lab, D65.
*

4
libvips/colour/LabQ2Lab.c
View File

@ -141,9 +141,9 @@ vips_LabQ2Lab_init( VipsLabQ2Lab *LabQ2Lab )
}
/**
* vips_LabQ2Lab:
* vips_LabQ2Lab: (method)
* @in: input image
* @out: output image
* @out: (out): output image
* @...: %NULL-terminated list of optional named arguments
*
* Unpack a LabQ (#VIPS_CODING_LABQ) image to a three-band float image.

4
libvips/colour/LabQ2LabS.c
View File

@ -121,9 +121,9 @@ vips_LabQ2LabS_init( VipsLabQ2LabS *LabQ2LabS )
}
/**
* vips_LabQ2LabS:
* vips_LabQ2LabS: (method)
* @in: input image
* @out: output image
* @out: (out): output image
* @...: %NULL-terminated list of optional named arguments
*
* Unpack a LabQ (#VIPS_CODING_LABQ) image to a three-band short image.

4
libvips/colour/LabQ2sRGB.c
View File

@ -531,9 +531,9 @@ vips_LabQ2sRGB_init( VipsLabQ2sRGB *LabQ2sRGB )
}
/**
* vips_LabQ2sRGB:
* vips_LabQ2sRGB: (method)
* @in: input image
* @out: output image
* @out: (out): output image
* @...: %NULL-terminated list of optional named arguments
*
* Unpack a LabQ (#VIPS_CODING_LABQ) image to a three-band short image.

4
libvips/colour/LabS2Lab.c
View File

@ -96,9 +96,9 @@ vips_LabS2Lab_init( VipsLabS2Lab *LabS2Lab )
}
/**
* vips_LabS2Lab:
* vips_LabS2Lab: (method)
* @in: input image
* @out: output image
* @out: (out): output image
* @...: %NULL-terminated list of optional named arguments
*
* Convert a LabS three-band signed short image to a three-band float image.

4
libvips/colour/LabS2LabQ.c
View File

@ -146,9 +146,9 @@ vips_LabS2LabQ_init( VipsLabS2LabQ *LabS2LabQ )
}
/**
* vips_LabS2LabQ:
* vips_LabS2LabQ: (method)
* @in: input image
* @out: output image
* @out: (out): output image
* @...: %NULL-terminated list of optional named arguments
*
* Convert a LabS three-band signed short image to LabQ

4
libvips/colour/UCS2LCh.c
View File

@ -284,9 +284,9 @@ vips_CMC2LCh_init( VipsCMC2LCh *CMC2LCh )
}
/**
* vips_CMC2LCh:
* vips_CMC2LCh: (method)
* @in: input image
* @out: output image
* @out: (out): output image
* @...: %NULL-terminated list of optional named arguments
*
* Turn LCh to CMC.

4
libvips/colour/XYZ2Lab.c
View File

@ -245,9 +245,9 @@ vips_XYZ2Lab_init( VipsXYZ2Lab *XYZ2Lab )
}
/**
* vips_XYZ2Lab:
* vips_XYZ2Lab: (method)
* @in: input image
* @out: output image
* @out: (out): output image
* @...: %NULL-terminated list of optional named arguments
*
* Optional arguments:

4
libvips/colour/XYZ2Yxy.c
View File

@ -103,9 +103,9 @@ vips_XYZ2Yxy_init( VipsXYZ2Yxy *XYZ2Yxy )
}
/**
* vips_XYZ2Yxy:
* vips_XYZ2Yxy: (method)
* @in: input image
* @out: output image
* @out: (out): output image
* @...: %NULL-terminated list of optional named arguments
*
* Turn XYZ to Yxy.

4
libvips/colour/XYZ2scRGB.c
View File

@ -116,9 +116,9 @@ vips_XYZ2scRGB_init( VipsXYZ2scRGB *XYZ2scRGB )
}
/**
* vips_XYZ2scRGB:
* vips_XYZ2scRGB: (method)
* @in: input image
* @out: output image
* @out: (out): output image
* @...: %NULL-terminated list of optional named arguments
*
* Turn XYZ to scRGB.

4
libvips/colour/Yxy2XYZ.c
View File

@ -104,9 +104,9 @@ vips_Yxy2XYZ_init( VipsYxy2XYZ *Yxy2XYZ )
}
/**
* vips_Yxy2XYZ:
* vips_Yxy2XYZ: (method)
* @in: input image
* @out: output image
* @out: (out): output image
* @...: %NULL-terminated list of optional named arguments
*
* Turn XYZ to Yxy.

4
libvips/colour/colourspace.c
View File

@ -617,9 +617,9 @@ vips_colourspace_init( VipsColourspace *colourspace )
}
/**
* vips_colourspace:
* vips_colourspace: (method)
* @in: input image
* @out: output image
* @out: (out): output image
* @space: convert to this colour space
* @...: %NULL-terminated list of optional named arguments
*

2
libvips/colour/dE76.c
View File

@ -127,7 +127,7 @@ vips_dE76_init( VipsdE76 *dE76 )
* vips_dE76:
* @left: first input image
* @right: second input image
* @out: output image
* @out: (out): output image
* @...: %NULL-terminated list of optional named arguments
*
* Calculate dE 76.

2
libvips/colour/dECMC.c
View File

@ -75,7 +75,7 @@ vips_dECMC_init( VipsdECMC *dECMC )
* vips_dECMC:
* @left: first input image
* @right: second input image
* @out: output image
* @out: (out): output image
* @...: %NULL-terminated list of optional named arguments
*
* Calculate dE CMC. The input images are transformed to CMC colour space and

4
libvips/colour/float2rad.c
View File

@ -220,9 +220,9 @@ vips_float2rad_init( VipsFloat2rad *float2rad )
}
/**
* vips_float2rad:
* vips_float2rad: (method)
* @in: input image
* @out: output image
* @out: (out): output image
* @...: %NULL-terminated list of optional named arguments
*
* Convert a three-band float image to Radiance 32-bit packed format.

16
libvips/colour/icc_transform.c
View File

@ -1054,9 +1054,9 @@ vips_icc_transform_init( VipsIccTransform *transform )
}
/**
* vips_icc_ac2rc:
* vips_icc_ac2rc: (method)
* @in: input image
* @out: output image
* @out: (out): output image
* @profile_filename: use this profile
*
* Transform an image from absolute to relative colorimetry using the
@ -1148,9 +1148,9 @@ vips_icc_ac2rc( VipsImage *in, VipsImage **out, const char *profile_filename )
#endif /*HAVE_LCMS*/
/**
* vips_icc_import:
* vips_icc_import: (method)
* @in: input image
* @out: output image
* @out: (out): output image
* @...: %NULL-terminated list of optional named arguments
*
* Optional arguments:
@ -1191,9 +1191,9 @@ vips_icc_import( VipsImage *in, VipsImage **out, ... )
}
/**
* vips_icc_export:
* vips_icc_export: (method)
* @in: input image
* @out: output image
* @out: (out): output image
* @...: %NULL-terminated list of optional named arguments
*
* Optional arguments:
@ -1226,9 +1226,9 @@ vips_icc_export( VipsImage *in, VipsImage **out, ... )
}
/**
* vips_icc_transform:
* vips_icc_transform: (method)
* @in: input image
* @out: output image
* @out: (out): output image
* @output_profile: get the output profile from here
* @...: %NULL-terminated list of optional named arguments
*

4
libvips/colour/rad2float.c
View File

@ -205,9 +205,9 @@ vips_rad2float_init( VipsRad2float *rad2float )
}
/**
* vips_rad2float:
* vips_rad2float: (method)
* @in: input image
* @out: output image
* @out: (out): output image
* @...: %NULL-terminated list of optional named arguments
*
* Unpack a RAD (#VIPS_CODING_RAD) image to a three-band float image.

4
libvips/colour/sRGB2HSV.c
View File

@ -153,9 +153,9 @@ vips_sRGB2HSV_init( VipssRGB2HSV *sRGB2HSV )
}
/**
* vips_sRGB2HSV:
* vips_sRGB2HSV: (method)
* @in: input image
* @out: output image
* @out: (out): output image
* @...: %NULL-terminated list of optional named arguments
*
* Convert to HSV.

4
libvips/colour/sRGB2scRGB.c
View File

@ -259,9 +259,9 @@ vips_sRGB2scRGB_init( VipssRGB2scRGB *sRGB2scRGB )
}
/**
* vips_sRGB2scRGB:
* vips_sRGB2scRGB: (method)
* @in: input image
* @out: output image
* @out: (out): output image
* @...: %NULL-terminated list of optional named arguments
*
* Convert an sRGB image to scRGB. The input image can be 8 or 16-bit.

4
libvips/colour/scRGB2BW.c
View File

@ -261,9 +261,9 @@ vips_scRGB2BW_init( VipsscRGB2BW *scRGB2BW )
}
/**
* vips_scRGB2BW:
* vips_scRGB2BW: (method)
* @in: input image
* @out: output image
* @out: (out): output image
* @...: %NULL-terminated list of optional named arguments
*
* Optional arguments:

4
libvips/colour/scRGB2XYZ.c
View File

@ -101,9 +101,9 @@ vips_scRGB2XYZ_init( VipsscRGB2XYZ *scRGB2XYZ )
}
/**
* vips_scRGB2XYZ:
* vips_scRGB2XYZ: (method)
* @in: input image
* @out: output image
* @out: (out): output image
* @...: %NULL-terminated list of optional named arguments
*
* Turn XYZ to scRGB.

4
libvips/colour/scRGB2sRGB.c
View File

@ -289,9 +289,9 @@ vips_scRGB2sRGB_init( VipsscRGB2sRGB *scRGB2sRGB )
}
/**
* vips_scRGB2sRGB:
* vips_scRGB2sRGB: (method)
* @in: input image
* @out: output image
* @out: (out): output image
* @...: %NULL-terminated list of optional named arguments
*
* Optional arguments:

2
libvips/conversion/arrayjoin.c
View File

@ -384,7 +384,7 @@ vips_arrayjoinv( VipsImage **in, VipsImage **out, int n, va_list ap )
/**
* vips_arrayjoin:
* @in: (array length=n) (transfer none): array of input images
* @out: output image
* @out: (out): output image
* @n: number of input images
* @...: %NULL-terminated list of optional named arguments
*

6
libvips/conversion/autorot.c
View File

@ -125,7 +125,7 @@ vips_autorot_remove_angle_sub( VipsImage *image,
}
/**
* vips_autorot_remove_angle:
* vips_autorot_remove_angle: (method)
* @image: image to remove orientation from
*
* Remove the orientation tag on @image. Also remove any exif orientation tags.
@ -195,9 +195,9 @@ vips_autorot_init( VipsAutorot *autorot )
}
/**
* vips_autorot:
* vips_autorot: (method)
* @in: input image
* @out: output image
* @out: (out): output image
* @...: %NULL-terminated list of optional named arguments
*
* Optional arguments:

16
libvips/conversion/bandbool.c
View File

@ -239,9 +239,9 @@ vips_bandboolv( VipsImage *in, VipsImage **out,
}
/**
* vips_bandbool:
* vips_bandbool: (method)
* @in: left-hand input #VipsImage
* @out: output #VipsImage
* @out: (out): output #VipsImage
* @boolean: boolean operation to perform
* @...: %NULL-terminated list of optional named arguments
*
@ -279,9 +279,9 @@ vips_bandbool( VipsImage *in, VipsImage **out,
}
/**
* vips_bandand:
* vips_bandand: (method)
* @in: left-hand input #VipsImage
* @out: output #VipsImage
* @out: (out): output #VipsImage
* @...: %NULL-terminated list of optional named arguments
*
* Perform #VIPS_OPERATION_BOOLEAN_AND on an image. See
@ -303,9 +303,9 @@ vips_bandand( VipsImage *in, VipsImage **out, ... )
}
/**
* vips_bandor:
* vips_bandor: (method)
* @in: left-hand input #VipsImage
* @out: output #VipsImage
* @out: (out): output #VipsImage
* @...: %NULL-terminated list of optional named arguments
*
* Perform #VIPS_OPERATION_BOOLEAN_OR on an image. See
@ -327,9 +327,9 @@ vips_bandor( VipsImage *in, VipsImage **out, ... )
}
/**
* vips_bandeor:
* vips_bandeor: (method)
* @in: left-hand input #VipsImage
* @out: output #VipsImage
* @out: (out): output #VipsImage
* @...: %NULL-terminated list of optional named arguments
*
* Perform #VIPS_OPERATION_BOOLEAN_EOR on an image. See

4
libvips/conversion/bandfold.c
View File

@ -179,9 +179,9 @@ vips_bandfold_init( VipsBandfold *bandfold )
}
/**
* vips_bandfold:
* vips_bandfold: (method)
* @in: input image
* @out: output image
* @out: (out): output image
* @...: %NULL-terminated list of optional named arguments
*
* Optional arguments:

14
libvips/conversion/bandjoin.c
View File

@ -204,7 +204,7 @@ vips_bandjoinv( VipsImage **in, VipsImage **out, int n, va_list ap )
/**
* vips_bandjoin:
* @in: (array length=n) (transfer none): array of input images
* @out: output image
* @out: (out): output image
* @n: number of input images
* @...: %NULL-terminated list of optional named arguments
*
@ -243,7 +243,7 @@ vips_bandjoin( VipsImage **in, VipsImage **out, int n, ... )
* vips_bandjoin2:
* @in1: first input image
* @in2: second input image
* @out: output image
* @out: (out): output image
* @...: %NULL-terminated list of optional named arguments
*
* Join a pair of images together, bandwise. See vips_bandjoin().
@ -428,9 +428,9 @@ vips_bandjoin_constv( VipsImage *in, VipsImage **out,
}
/**
* vips_bandjoin_const:
* @in: (array length=n) (transfer none): array of input images
* @out: output image
* vips_bandjoin_const: (method)
* @in: input image
* @out: (out): output image
* @c: (array length=n): array of constants to append
* @n: number of constants
* @...: %NULL-terminated list of optional named arguments
@ -455,9 +455,9 @@ vips_bandjoin_const( VipsImage *in, VipsImage **out, double *c, int n, ... )
}
/**
* vips_bandjoin_const1:
* vips_bandjoin_const1: (method)
* @in: input image
* @out: output image
* @out: (out): output image
* @c: constant to append
* @...: %NULL-terminated list of optional named arguments
*

4
libvips/conversion/bandmean.c
View File

@ -207,9 +207,9 @@ vips_bandmean_init( VipsBandmean *bandmean )
}
/**
* vips_bandmean:
* vips_bandmean: (method)
* @in: input image
* @out: output image
* @out: (out): output image
* @...: %NULL-terminated list of optional named arguments
*
* This operation writes a one-band image where each pixel is the average of

4
libvips/conversion/bandrank.c
View File

@ -279,8 +279,8 @@ vips_bandrankv( VipsImage **in, VipsImage **out, int n, va_list ap )
/**
* vips_bandrank:
* @in: array of input images
* @out: output image
* @in: (array length=n): array of input images
* @out: (out): output image
* @n: number of input images
* @...: %NULL-terminated list of optional named arguments
*

4
libvips/conversion/bandunfold.c
View File

@ -182,9 +182,9 @@ vips_bandunfold_init( VipsBandunfold *bandunfold )
}
/**
* vips_bandunfold:
* vips_bandunfold: (method)
* @in: input image
* @out: output image
* @out: (out): output image
* @...: %NULL-terminated list of optional named arguments
*
* Optional arguments:

4
libvips/conversion/byteswap.c
View File

@ -216,9 +216,9 @@ vips_byteswap_init( VipsByteswap *byteswap )
}
/**
* vips_byteswap:
* vips_byteswap: (method)
* @in: input image
* @out: output image
* @out: (out): output image
* @...: %NULL-terminated list of optional named arguments
*
* Swap the byte order in an image.

4
libvips/conversion/cache.c
View File

@ -137,9 +137,9 @@ vips_cache_init( VipsCache *cache )
}
/**
* vips_cache:
* vips_cache: (method)
* @in: input image
* @out: output image
* @out: (out): output image
* @...: %NULL-terminated list of optional named arguments
*
* Optional arguments:

44
libvips/conversion/cast.c
View File

@ -577,9 +577,9 @@ vips_castv( VipsImage *in, VipsImage **out, VipsBandFormat format, va_list ap )
}
/**
* vips_cast:
* vips_cast: (method)
* @in: input image
* @out: output image
* @out: (out): output image
* @format: format to convert to
* @...: %NULL-terminated list of optional named arguments
*
@ -616,9 +616,9 @@ vips_cast( VipsImage *in, VipsImage **out, VipsBandFormat format, ... )
}
/**
* vips_cast_uchar:
* vips_cast_uchar: (method)
* @in: input image
* @out: output image
* @out: (out): output image
* @...: %NULL-terminated list of optional named arguments
*
* Convert @in to #VIPS_FORMAT_UCHAR. See vips_cast().
@ -639,9 +639,9 @@ vips_cast_uchar( VipsImage *in, VipsImage **out, ... )
}
/**
* vips_cast_char:
* vips_cast_char: (method)
* @in: input image
* @out: output image
* @out: (out): output image
* @...: %NULL-terminated list of optional named arguments
*
* Convert @in to #VIPS_FORMAT_CHAR. See vips_cast().
@ -662,9 +662,9 @@ vips_cast_char( VipsImage *in, VipsImage **out, ... )
}
/**
* vips_cast_ushort:
* vips_cast_ushort: (method)
* @in: input image
* @out: output image
* @out: (out): output image
* @...: %NULL-terminated list of optional named arguments
*
* Convert @in to #VIPS_FORMAT_USHORT. See vips_cast().
@ -685,9 +685,9 @@ vips_cast_ushort( VipsImage *in, VipsImage **out, ... )
}
/**
* vips_cast_short:
* vips_cast_short: (method)
* @in: input image
* @out: output image
* @out: (out): output image
* @...: %NULL-terminated list of optional named arguments
*
* Convert @in to #VIPS_FORMAT_SHORT. See vips_cast().
@ -708,9 +708,9 @@ vips_cast_short( VipsImage *in, VipsImage **out, ... )
}
/**
* vips_cast_uint:
* vips_cast_uint: (method)
* @in: input image
* @out: output image
* @out: (out): output image
* @...: %NULL-terminated list of optional named arguments
*
* Convert @in to #VIPS_FORMAT_UINT. See vips_cast().
@ -731,9 +731,9 @@ vips_cast_uint( VipsImage *in, VipsImage **out, ... )
}
/**
* vips_cast_int:
* vips_cast_int: (method)
* @in: input image
* @out: output image
* @out: (out): output image
* @...: %NULL-terminated list of optional named arguments
*
* Convert @in to #VIPS_FORMAT_INT. See vips_cast().
@ -754,9 +754,9 @@ vips_cast_int( VipsImage *in, VipsImage **out, ... )
}
/**
* vips_cast_float:
* vips_cast_float: (method)
* @in: input image
* @out: output image
* @out: (out): output image
* @...: %NULL-terminated list of optional named arguments
*
* Convert @in to #VIPS_FORMAT_FLOAT. See vips_cast().
@ -777,9 +777,9 @@ vips_cast_float( VipsImage *in, VipsImage **out, ... )
}
/**
* vips_cast_double:
* vips_cast_double: (method)
* @in: input image
* @out: output image
* @out: (out): output image
* @...: %NULL-terminated list of optional named arguments
*
* Convert @in to #VIPS_FORMAT_DOUBLE. See vips_cast().
@ -800,9 +800,9 @@ vips_cast_double( VipsImage *in, VipsImage **out, ... )
}
/**
* vips_cast_complex:
* vips_cast_complex: (method)
* @in: input image
* @out: output image
* @out: (out): output image
* @...: %NULL-terminated list of optional named arguments
*
* Convert @in to #VIPS_FORMAT_COMPLEX. See vips_cast().
@ -823,9 +823,9 @@ vips_cast_complex( VipsImage *in, VipsImage **out, ... )
}
/**
* vips_cast_dpcomplex:
* vips_cast_dpcomplex: (method)
* @in: input image
* @out: output image
* @out: (out): output image
* @...: %NULL-terminated list of optional named arguments
*
* Convert @in to #VIPS_FORMAT_DPCOMPLEX. See vips_cast().

8
libvips/conversion/copy.c
View File

@ -359,9 +359,9 @@ vips_copy_init( VipsCopy *copy )
}
/**
* vips_copy:
* vips_copy: (method)
* @in: input image
* @out: output image
* @out: (out): output image
* @...: %NULL-terminated list of optional named arguments
*
* Optional arguments:
@ -403,9 +403,9 @@ vips_copy( VipsImage *in, VipsImage **out, ... )
}
/**
* vips_copy_file:
* vips_copy_file: (method)
* @in: input image
* @out: output image
* @out: (out): output image
* @...: %NULL-terminated list of optional named arguments
*
* A simple convenience function to copy an image to a file, then copy

4
libvips/conversion/embed.c
View File

@ -618,9 +618,9 @@ vips_embed_init( VipsEmbed *embed )
}
/**
* vips_embed:
* vips_embed: (method)
* @in: input image
* @out: output image
* @out: (out): output image
* @x: place @in at this x position in @out
* @y: place @in at this y position in @out
* @width: @out should be this many pixels across

12
libvips/conversion/extract.c
View File

@ -232,9 +232,9 @@ vips_extract_area_init( VipsExtractArea *extract )
}
/**
* vips_extract_area:
* vips_extract_area: (method)
* @in: input image
* @out: output image
* @out: (out): output image
* @left: left edge of area to extract
* @top: top edge of area to extract
* @width: width of area to extract
@ -291,9 +291,9 @@ vips_crop_get_type( void )
}
/**
* vips_crop:
* vips_crop: (method)
* @in: input image
* @out: output image
* @out: (out): output image
* @left: left edge of area to extract
* @top: top edge of area to extract
* @width: width of area to extract
@ -442,9 +442,9 @@ vips_extract_band_init( VipsExtractBand *extract )
}
/**
* vips_extract_band:
* vips_extract_band: (method)
* @in: input image
* @out: output image
* @out: (out): output image
* @band: band to extract
* @...: %NULL-terminated list of optional named arguments
*

4
libvips/conversion/falsecolour.c
View File

@ -391,9 +391,9 @@ vips_falsecolour_init( VipsFalsecolour *falsecolour )
}
/**
* vips_falsecolour:
* vips_falsecolour: (method)
* @in: input image
* @out: output image
* @out: (out): output image
* @...: %NULL-terminated list of optional named arguments
*
* Force @in to 1 band, 8-bit, then transform to

4
libvips/conversion/flatten.c
View File

@ -412,9 +412,9 @@ vips_flatten_init( VipsFlatten *flatten )
}
/**
* vips_flatten:
* vips_flatten: (method)
* @in: input image
* @out: output image
* @out: (out): output image
* @...: %NULL-terminated list of optional named arguments
*
* Optional arguments:

4
libvips/conversion/flip.c
View File

@ -256,9 +256,9 @@ vips_flip_init( VipsFlip *flip )
}
/**
* vips_flip:
* vips_flip: (method)
* @in: input image
* @out: output image
* @out: (out): output image
* @direction: flip horizontally or vertically
* @...: %NULL-terminated list of optional named arguments
*

4
libvips/conversion/gamma.c
View File

@ -161,9 +161,9 @@ vips_gamma_init( VipsGamma *gamma )
}
/**
* vips_gamma:
* vips_gamma: (method)
* @in: input image
* @out: output image
* @out: (out): output image
* @...: %NULL-terminated list of optional named arguments
*
* Optional arguments:

4
libvips/conversion/grid.c
View File

@ -233,9 +233,9 @@ vips_grid_init( VipsGrid *grid )
}
/**
* vips_grid:
* vips_grid: (method)
* @in: input image
* @out: output image
* @out: (out): output image
* @tile_height: chop into tiles this high
* @across: tiles across
* @down: tiles down

2
libvips/conversion/ifthenelse.c
View File

@ -515,7 +515,7 @@ vips_ifthenelse_init( VipsIfthenelse *ifthenelse )
* @cond: condition #VipsImage
* @in1: then #VipsImage
* @in2: else #VipsImage
* @out: output #VipsImage
* @out: (out): output #VipsImage
* @...: %NULL-terminated list of optional named arguments
*
* Optional arguments:

4
libvips/conversion/insert.c
View File

@ -556,10 +556,10 @@ vips_insert_init( VipsInsert *insert )
}
/**
* vips_insert:
* vips_insert: (method)
* @main: big image
* @sub: small image
* @out: output image
* @out: (out): output image
* @x: left position of @sub
* @y: top position of @sub
* @...: %NULL-terminated list of optional named arguments

2
libvips/conversion/join.c
View File

@ -295,7 +295,7 @@ vips_join_init( VipsJoin *join )
* vips_join:
* @in1: first input image
* @in2: second input image
* @out: output image
* @out: (out): output image
* @direction: join horizontally or vertically
* @...: %NULL-terminated list of optional named arguments
*

4
libvips/conversion/msb.c
View File

@ -262,9 +262,9 @@ vips_msb_init( VipsMsb *msb )
}
/**
* vips_msb:
* vips_msb: (method)
* @in: input image
* @out: output image
* @out: (out): output image
* @...: %NULL-terminated list of optional named arguments
*
* Optional arguments:

4
libvips/conversion/premultiply.c
View File

@ -276,9 +276,9 @@ vips_premultiply_init( VipsPremultiply *premultiply )
}
/**
* vips_premultiply:
* vips_premultiply: (method)
* @in: input image
* @out: output image
* @out: (out): output image
* @...: %NULL-terminated list of optional named arguments
*
* Optional arguments:

4
libvips/conversion/recomb.c
View File

@ -222,9 +222,9 @@ vips_recomb_init( VipsRecomb *recomb )
}
/**
* vips_recomb:
* vips_recomb: (method)
* @in: input image
* @out: output image
* @out: (out): output image
* @m: recombination matrix
* @...: %NULL-terminated list of optional named arguments
*

4
libvips/conversion/replicate.c
View File

@ -220,9 +220,9 @@ vips_replicate_init( VipsReplicate *replicate )
}
/**
* vips_replicate:
* vips_replicate: (method)
* @in: input image
* @out: output image
* @out: (out): output image
* @across: repeat input this many times across
* @down: repeat input this many times down
* @...: %NULL-terminated list of optional named arguments

12
libvips/conversion/rot.c
View File

@ -383,9 +383,9 @@ vips_rotv( VipsImage *in, VipsImage **out, VipsAngle angle, va_list ap )
}
/**
* vips_rot:
* vips_rot: (method)
* @in: input image
* @out: output image
* @out: (out): output image
* @angle: rotation angle
* @...: %NULL-terminated list of optional named arguments
*
@ -437,9 +437,9 @@ vips_rot90( VipsImage *in, VipsImage **out, ... )
}
/**
* vips_rot180:
* vips_rot180: (method)
* @in: input image
* @out: output image
* @out: (out): output image
* @...: %NULL-terminated list of optional named arguments
*
* Rotate @in by 180 degress. A convenience function over vips_rot().
@ -462,9 +462,9 @@ vips_rot180( VipsImage *in, VipsImage **out, ... )
}
/**
* vips_rot270:
* vips_rot270: (method)
* @in: input image
* @out: output image
* @out: (out): output image
* @...: %NULL-terminated list of optional named arguments
*
* Rotate @in by 270 degress clockwise. A convenience function over vips_rot().

4
libvips/conversion/rot45.c
View File

@ -284,9 +284,9 @@ vips_rot45_init( VipsRot45 *rot45 )
}
/**
* vips_rot45:
* vips_rot45: (method)
* @in: input image
* @out: output image
* @out: (out): output image
* @...: %NULL-terminated list of optional named arguments
*
* Optional arguments:

4
libvips/conversion/scale.c
View File

@ -176,9 +176,9 @@ vips_scale_init( VipsScale *scale )
}
/**
* vips_scale:
* vips_scale: (method)
* @in: input image
* @out: output image
* @out: (out): output image
* @...: %NULL-terminated list of optional named arguments
*
* Optional arguments:

4
libvips/conversion/sequential.c
View File

@ -265,9 +265,9 @@ vips_sequential_init( VipsSequential *sequential )
}
/**
* vips_sequential:
* vips_sequential: (method)
* @in: input image
* @out: output image
* @out: (out): output image
* @...: %NULL-terminated list of optional named arguments
*
* Optional arguments:

4
libvips/conversion/smartcrop.c
View File

@ -417,9 +417,9 @@ vips_smartcrop_init( VipsSmartcrop *smartcrop )
}
/**
* vips_smartcrop:
* vips_smartcrop: (method)
* @in: input image
* @out: output image
* @out: (out): output image
* @width: width of area to extract
* @height: height of area to extract
* @...: %NULL-terminated list of optional named arguments

4
libvips/conversion/subsample.c
View File

@ -300,9 +300,9 @@ vips_subsample_init( VipsSubsample *subsample )
}
/**
* vips_subsample:
* vips_subsample: (method)
* @in: input image
* @out: output image
* @out: (out): output image
* @xfac: horizontal shrink factor
* @yfac: vertical shrink factor
* @...: %NULL-terminated list of optional named arguments

8
libvips/conversion/tilecache.c
View File

@ -819,9 +819,9 @@ vips_tile_cache_init( VipsTileCache *cache )
}
/**
* vips_tilecache:
* vips_tilecache: (method)
* @in: input image
* @out: output image
* @out: (out): output image
* @...: %NULL-terminated list of optional named arguments
*
* Optional arguments:
@ -988,9 +988,9 @@ vips_line_cache_init( VipsLineCache *cache )
}
/**
* vips_linecache:
* vips_linecache: (method)
* @in: input image
* @out: output image
* @out: (out): output image
* @...: %NULL-terminated list of optional named arguments
*
* Optional arguments:

4
libvips/conversion/unpremultiply.c
View File

@ -286,9 +286,9 @@ vips_unpremultiply_init( VipsUnpremultiply *unpremultiply )
}
/**
* vips_unpremultiply:
* vips_unpremultiply: (method)
* @in: input image
* @out: output image
* @out: (out): output image
* @...: %NULL-terminated list of optional named arguments
*
* Optional arguments:

4
libvips/conversion/wrap.c
View File

@ -143,9 +143,9 @@ vips_wrap_init( VipsWrap *wrap )
}
/**
* vips_wrap:
* vips_wrap: (method)
* @in: input image
* @out: output image
* @out: (out): output image
* @...: %NULL-terminated list of optional named arguments
*
* Optional arguments:

4
libvips/conversion/zoom.c
View File

@ -402,9 +402,9 @@ vips_zoom_init( VipsZoom *zoom )
}
/**
* vips_zoom:
* vips_zoom: (method)
* @in: input image
* @out: output image
* @out: (out): output image
* @xfac: horizontal scale factor
* @yfac: vertical scale factor
* @...: %NULL-terminated list of optional named arguments

4
libvips/convolution/compass.c
View File

@ -205,9 +205,9 @@ vips_compass_init( VipsCompass *compass )
}
/**
* vips_compass:
* vips_compass: (method)
* @in: input image
* @out: output image
* @out: (out): output image
* @mask: convolve with this mask
* @...: %NULL-terminated list of optional named arguments
*

4
libvips/convolution/conv.c
View File

@ -167,9 +167,9 @@ vips_conv_init( VipsConv *conv )
}
/**
* vips_conv:
* vips_conv: (method)
* @in: input image
* @out: output image
* @out: (out): output image
* @mask: convolve with this mask
* @...: %NULL-terminated list of optional named arguments
*

4
libvips/convolution/conva.c
View File

@ -1312,9 +1312,9 @@ vips_conva_init( VipsConva *conva )
}
/**
* vips_conva:
* vips_conva: (method)
* @in: input image
* @out: output image
* @out: (out): output image
* @mask: convolution mask
* @...: %NULL-terminated list of optional named arguments
*

4
libvips/convolution/convasep.c
View File

@ -914,9 +914,9 @@ vips_convasep_init( VipsConvasep *convasep )
}
/**
* vips_convasep:
* vips_convasep: (method)
* @in: input image
* @out: output image
* @out: (out): output image
* @mask: convolve with this mask
* @...: %NULL-terminated list of optional named arguments
*

4
libvips/convolution/convf.c
View File

@ -371,9 +371,9 @@ vips_convf_init( VipsConvf *convf )
}
/**
* vips_convf:
* vips_convf: (method)
* @in: input image
* @out: output image
* @out: (out): output image
* @mask: convolve with this mask
* @...: %NULL-terminated list of optional named arguments
*

4
libvips/convolution/convi.c
View File

@ -1019,9 +1019,9 @@ vips_convi_init( VipsConvi *convi )
}
/**
* vips_convi:
* vips_convi: (method)
* @in: input image
* @out: output image
* @out: (out): output image
* @mask: convolve with this mask
* @...: %NULL-terminated list of optional named arguments
*

4
libvips/convolution/convsep.c
View File

@ -158,9 +158,9 @@ vips_convsep_init( VipsConvsep *convsep )
}
/**
* vips_convsep:
* vips_convsep: (method)
* @in: input image
* @out: output image
* @out: (out): output image
* @mask: convolution mask
* @...: %NULL-terminated list of optional named arguments
*

4
libvips/convolution/fastcor.c
View File

@ -224,10 +224,10 @@ vips_fastcor_init( VipsFastcor *fastcor )
}
/**
* vips_fastcor:
* vips_fastcor: (method)
* @in: input image
* @ref: reference image
* @out: output image
* @out: (out): output image
* @...: %NULL-terminated list of optional named arguments
*
* Calculate a fast correlation surface.

4
libvips/convolution/gaussblur.c
View File

@ -159,9 +159,9 @@ vips_gaussblur_init( VipsGaussblur *gaussblur )
}
/**
* vips_gaussblur:
* vips_gaussblur: (method)
* @in: input image
* @out: output image
* @out: (out): output image
* @sigma: how large a mask to use
* @...: %NULL-terminated list of optional named arguments
*

4
libvips/convolution/sharpen.c
View File

@ -388,9 +388,9 @@ vips_sharpen_init( VipsSharpen *sharpen )
}
/**
* vips_sharpen:
* vips_sharpen: (method)
* @in: input image
* @out: output image
* @out: (out): output image
* @...: %NULL-terminated list of optional named arguments
*
* Optional arguments:

4
libvips/convolution/spcor.c
View File

@ -325,10 +325,10 @@ vips_spcor_init( VipsSpcor *spcor )
}
/**
* vips_spcor:
* vips_spcor: (method)
* @in: input image
* @ref: reference image
* @out: output image
* @out: (out): output image
* @...: %NULL-terminated list of optional named arguments
*
* Calculate a correlation surface.

4
libvips/draw/draw_circle.c
View File

@ -283,7 +283,7 @@ vips_draw_circlev( VipsImage *image,
}
/**
* vips_draw_circle:
* vips_draw_circle: (method)
* @image: image to draw on
* @ink: (array length=n): value to draw
* @n: length of ink array
@ -320,7 +320,7 @@ vips_draw_circle( VipsImage *image,
}
/**
* vips_draw_circle1:
* vips_draw_circle1: (method)
* @image: image to draw on
* @ink: value to draw
* @cx: centre of draw_circle

4
libvips/draw/draw_flood.c
View File

@ -678,7 +678,7 @@ vips_draw_floodv( VipsImage *image,
}
/**
* vips_draw_flood:
* vips_draw_flood: (method)
* @image: image to draw on
* @ink: (array length=n): value to draw
* @n: length of ink array
@ -730,7 +730,7 @@ vips_draw_flood( VipsImage *image,
}
/**
* vips_draw_flood1:
* vips_draw_flood1: (method)
* @image: image to draw on
* @ink: value to draw
* @x: centre of circle

2
libvips/draw/draw_image.c
View File

@ -291,7 +291,7 @@ vips_draw_image_init( VipsDrawImage *draw_image )
}
/**
* vips_draw_image:
* vips_draw_image: (method)
* @image: image to draw on
* @sub: image to paint
* @x: draw @sub here

4
libvips/draw/draw_line.c
View File

@ -331,7 +331,7 @@ vips_draw_linev( VipsImage *image,
}
/**
* vips_draw_line:
* vips_draw_line: (method)
* @image: image to draw on
* @ink: (array length=n): value to draw
* @n: length of ink array
@ -364,7 +364,7 @@ vips_draw_line( VipsImage *image,
}
/**
* vips_draw_line1:
* vips_draw_line1: (method)
* @image: image to draw on
* @ink: value to draw
* @x1: start of draw_line

4
libvips/draw/draw_mask.c
View File

@ -362,7 +362,7 @@ vips_draw_maskv( VipsImage *image,
}
/**
* vips_draw_mask:
* vips_draw_mask: (method)
* @image: image to draw on
* @ink: (array length=n): value to draw
* @n: size of ink array
@ -397,7 +397,7 @@ vips_draw_mask( VipsImage *image,
}
/**
* vips_draw_mask1:
* vips_draw_mask1: (method)
* @image: image to draw on
* @ink: value to draw
* @mask: mask of 0/255 values showing where to plot

8
libvips/draw/draw_rect.c
View File

@ -228,7 +228,7 @@ vips_draw_rectv( VipsImage *image,
}
/**
* vips_draw_rect:
* vips_draw_rect: (method)
* @image: image to draw on
* @ink: (array length=n): value to draw
* @n: length of ink array
@ -265,7 +265,7 @@ vips_draw_rect( VipsImage *image,
}
/**
* vips_draw_rect1:
* vips_draw_rect1: (method)
* @image: image to draw on
* @ink: value to draw
* @left: area to paint
@ -303,7 +303,7 @@ vips_draw_rect1( VipsImage *image,
}
/**
* vips_draw_point:
* vips_draw_point: (method)
* @image: image to draw on
* @ink: (array length=n): value to draw
* @n: length of ink array
@ -331,7 +331,7 @@ vips_draw_point( VipsImage *image, double *ink, int n, int x, int y, ... )
}
/**
* vips_draw_point1:
* vips_draw_point1: (method)
* @image: image to draw on
* @ink: value to draw
* @x: point to draw

2
libvips/draw/draw_smudge.c
View File

@ -229,7 +229,7 @@ vips_draw_smudge_init( VipsDrawSmudge *draw_smudge )
}
/**
* vips_draw_smudge:
* vips_draw_smudge: (method)
* @image: image to draw on
* @left: point to paint
* @top: point to paint

4
libvips/freqfilt/freqmult.c
View File

@ -141,10 +141,10 @@ vips_freqmult_init( VipsFreqmult *freqmult )
}
/**
* vips_freqmult:
* vips_freqmult: (method)
* @in: input image
* @mask: mask image
* @out: output image
* @out: (out): output image
* @...: %NULL-terminated list of optional named arguments
*
* Multiply @in by @mask in Fourier space.

4
libvips/freqfilt/fwfft.c
View File

@ -345,9 +345,9 @@ vips_fwfft_init( VipsFwfft *fwfft )
#endif /*HAVE_FFTW*/
/**
* vips_fwfft:
* vips_fwfft: (method)
* @in: input image
* @out: output image
* @out: (out): output image
* @...: %NULL-terminated list of optional named arguments
*
* Transform an image to Fourier space.

4
libvips/freqfilt/invfft.c
View File

@ -269,9 +269,9 @@ vips_invfft_init( VipsInvfft *invfft )
#endif /*HAVE_FFTW*/
/**
* vips_invfft:
* vips_invfft: (method)
* @in: input image
* @out: output image
* @out: (out): output image
* @...: %NULL-terminated list of optional named arguments
*
* Optional arguments:

2
libvips/freqfilt/phasecor.c
View File

@ -125,7 +125,7 @@ vips_phasecor_init( VipsPhasecor *phasecor )
* vips_phasecor:
* @in1: first input image
* @in2: second input image
* @out: output image
* @out: (out): output image
* @...: %NULL-terminated list of optional named arguments
*
* Convert the two input images to Fourier space, calculate phase-correlation,

4
libvips/freqfilt/spectrum.c
View File

@ -109,9 +109,9 @@ vips_spectrum_init( VipsSpectrum *spectrum )
}
/**
* vips_spectrum:
* vips_spectrum: (method)
* @in: input image
* @out: output image
* @out: (out): output image
* @...: %NULL-terminated list of optional named arguments
*
* Make a displayable (ie. 8-bit unsigned int) power spectrum.

4
libvips/histogram/hist_cum.c
View File

@ -157,9 +157,9 @@ vips_hist_cum_init( VipsHistCum *hist_cum )
}
/**
* vips_hist_cum:
* vips_hist_cum: (method)
* @in: input image
* @out: output image
* @out: (out): output image
* @...: %NULL-terminated list of optional named arguments
*
* Form cumulative histogram.

4
libvips/histogram/hist_entropy.c
View File

@ -130,9 +130,9 @@ vips_hist_entropy_init( VipsHistEntropy *entropy )
}
/**
* vips_hist_entropy:
* vips_hist_entropy: (method)
* @in: input histogram
* @out: image entropy
* @out: (out): image entropy
* @...: %NULL-terminated list of optional named arguments
*
* Estimate image entropy from a histogram. Entropy is calculated as:

4
libvips/histogram/hist_equal.c
View File

@ -137,9 +137,9 @@ vips_hist_equal_init( VipsHistEqual *equal )
}
/**
* vips_hist_equal:
* vips_hist_equal: (method)
* @in: input image
* @out: output image
* @out: (out): output image
* @...: %NULL-terminated list of optional named arguments
*
* Optional arguments:

4
libvips/histogram/hist_ismonotonic.c
View File

@ -136,9 +136,9 @@ vips_hist_ismonotonic_init( VipsHistIsmonotonic *ismonotonic )
}
/**
* vips_hist_ismonotonic:
* vips_hist_ismonotonic: (method)
* @in: lookup-table to test
* @out: set non-zero if @in is monotonic
* @out: (out): set non-zero if @in is monotonic
* @...: %NULL-terminated list of optional named arguments
*
* Test @in for monotonicity. @out is set non-zero if @in is monotonic.

4
libvips/histogram/hist_local.c
View File

@ -395,9 +395,9 @@ vips_hist_local_init( VipsHistLocal *local )
}
/**
* vips_hist_local:
* vips_hist_local: (method)
* @in: input image
* @out: output image
* @out: (out): output image
* @width: width of region
* @height: height of region
* @...: %NULL-terminated list of optional named arguments

4
libvips/histogram/hist_match.c
View File

@ -177,10 +177,10 @@ vips_hist_match_init( VipsHistMatch *match )
}
/**
* vips_hist_match:
* vips_hist_match: (method)
* @in: input histogram
* @ref: reference histogram
* @out: output histogram
* @out: (out): output histogram
* @...: %NULL-terminated list of optional named arguments
*
* Adjust @in to match @ref. If @in and @ref are normalised

4
libvips/histogram/hist_norm.c
View File

@ -156,9 +156,9 @@ vips_hist_norm_init( VipsHistNorm *hist_norm )
}
/**
* vips_hist_norm:
* vips_hist_norm: (method)
* @in: input image
* @out: output image
* @out: (out): output image
* @...: %NULL-terminated list of optional named arguments
*
* Normalise histogram ... normalise range to make it square (ie. max ==

4
libvips/histogram/hist_plot.c
View File

@ -357,9 +357,9 @@ vips_hist_plot_init( VipsHistPlot *hist_plot )
}
/**
* vips_hist_plot:
* vips_hist_plot: (method)
* @in: input image
* @out: output image
* @out: (out): output image
* @...: %NULL-terminated list of optional named arguments
*
* Plot a 1 by any or any by 1 image file as a max by any or

4
libvips/histogram/maplut.c
View File

@ -724,9 +724,9 @@ vips_maplut_init( VipsMaplut *maplut )
}
/**
* vips_maplut:
* vips_maplut: (method)
* @in: input image
* @out: output image
* @out: (out): output image
* @lut: look-up table
* @...: %NULL-terminated list of optional named arguments
*

4
libvips/histogram/percent.c
View File

@ -134,10 +134,10 @@ vips_percent_init( VipsPercent *percent )
}
/**
* vips_percent:
* vips_percent: (method)
* @in: input image
* @percent: threshold percentage
* @threshold: output threshold value
* @threshold: (out): output threshold value
* @...: %NULL-terminated list of optional named arguments
*
* vips_percent() returns (through the @threshold parameter) the threshold

Some files were not shown because too many files have changed in this diff Show More