From bae0342d9506a4e6f2e5e8ba0bb612c6a601044e Mon Sep 17 00:00:00 2001 From: Kleis Auke Wolthuizen Date: Fri, 10 Jun 2022 15:43:44 +0200 Subject: [PATCH] Update C++ binding and function list (#2851) * Update C++ binding and function list Also, start with a capital letter in descriptions whenever possible. * Ensure `dzsave_target` is generated --- cplusplus/include/vips/VImage8.h | 187 +++++++++++++++++++------ cplusplus/meson.build | 2 +- cplusplus/vips-operators.cpp | 17 ++- doc/function-list.xml | 14 +- libvips/arithmetic/boolean.c | 4 +- libvips/arithmetic/complex.c | 6 +- libvips/arithmetic/find_trim.c | 2 +- libvips/arithmetic/getpoint.c | 2 +- libvips/arithmetic/hough_line.c | 2 +- libvips/arithmetic/math.c | 2 +- libvips/arithmetic/math2.c | 4 +- libvips/arithmetic/measure.c | 2 +- libvips/arithmetic/relational.c | 4 +- libvips/arithmetic/round.c | 2 +- libvips/conversion/bandbool.c | 2 +- libvips/conversion/embed.c | 2 +- libvips/conversion/falsecolour.c | 2 +- libvips/conversion/gamma.c | 4 +- libvips/conversion/grid.c | 6 +- libvips/conversion/ifthenelse.c | 2 +- libvips/conversion/join.c | 2 +- libvips/conversion/recomb.c | 2 +- libvips/conversion/sequential.c | 4 +- libvips/convolution/sharpen.c | 2 +- libvips/create/mask_butterworth_band.c | 4 +- libvips/create/mask_gaussian_band.c | 4 +- libvips/create/mask_ideal_band.c | 4 +- libvips/draw/draw_flood.c | 6 +- libvips/draw/draw_rect.c | 6 +- libvips/draw/draw_smudge.c | 6 +- libvips/foreign/dzsave.c | 6 +- libvips/foreign/jxlsave.c | 2 +- libvips/foreign/magick6load.c | 2 +- libvips/foreign/magick7load.c | 2 +- libvips/foreign/ppmsave.c | 8 +- libvips/foreign/tiffsave.c | 6 +- libvips/foreign/vips2magick.c | 4 +- libvips/foreign/webpsave.c | 6 +- libvips/freqfilt/freqfilt.c | 2 +- libvips/freqfilt/freqmult.c | 2 +- libvips/histogram/case.c | 4 +- libvips/histogram/maplut.c | 4 +- libvips/iofuncs/sourceginput.c | 2 +- libvips/morphology/countlines.c | 2 +- libvips/morphology/rank.c | 2 +- libvips/mosaicing/global_balance.c | 2 +- libvips/mosaicing/match.c | 2 +- libvips/mosaicing/mosaic1.c | 2 +- libvips/resample/thumbnail.c | 2 +- 49 files changed, 248 insertions(+), 122 deletions(-) diff --git a/cplusplus/include/vips/VImage8.h b/cplusplus/include/vips/VImage8.h index c4604e24..691e9670 100644 --- a/cplusplus/include/vips/VImage8.h +++ b/cplusplus/include/vips/VImage8.h @@ -1898,7 +1898,6 @@ public: */ // headers for vips operations -// Mon Nov 1 03:31:09 PM CET 2021 // this file is generated automatically, do not edit! /** @@ -2125,7 +2124,7 @@ double avg( VOption *options = 0 ) const; /** * Boolean operation across image bands. - * @param boolean boolean to perform. + * @param boolean Boolean to perform. * @param options Set of options. * @return Output image. */ @@ -2204,7 +2203,7 @@ static VImage black( int width, int height, VOption *options = 0 ); /** * Boolean operation on two images. * @param right Right-hand image argument. - * @param boolean boolean to perform. + * @param boolean Boolean to perform. * @param options Set of options. * @return Output image. */ @@ -2212,7 +2211,7 @@ VImage boolean( VImage right, VipsOperationBoolean boolean, VOption *options = 0 /** * Boolean operations against a constant. - * @param boolean boolean to perform. + * @param boolean Boolean to perform. * @param c Array of constants. * @param options Set of options. * @return Output image. @@ -2309,7 +2308,7 @@ VImage compass( VImage mask, VOption *options = 0 ) const; /** * Perform a complex operation on an image. - * @param cmplx complex to perform. + * @param cmplx Complex to perform. * @param options Set of options. * @return Output image. */ @@ -2318,7 +2317,7 @@ VImage complex( VipsOperationComplex cmplx, VOption *options = 0 ) const; /** * Complex binary operations on two images. * @param right Right-hand image argument. - * @param cmplx binary complex operation to perform. + * @param cmplx Binary complex operation to perform. * @param options Set of options. * @return Output image. */ @@ -2334,7 +2333,7 @@ VImage complexform( VImage right, VOption *options = 0 ) const; /** * Get a component from a complex image. - * @param get complex to perform. + * @param get Complex to perform. * @param options Set of options. * @return Output image. */ @@ -2683,7 +2682,6 @@ void draw_smudge( int left, int top, int width, int height, VOption *options = 0 * - **depth** -- Pyramid depth, VipsForeignDzDepth. * - **angle** -- Rotate image during save, VipsAngle. * - **container** -- Pyramid container type, VipsForeignDzContainer. - * - **properties** -- Write a properties file to the output directory, bool. * - **compression** -- ZIP deflate compression level, int. * - **region_shrink** -- Method to shrink regions, VipsRegionShrink. * - **skip_blanks** -- Skip tiles which are nearly equal to the background, int. @@ -2711,7 +2709,6 @@ void dzsave( const char *filename, VOption *options = 0 ) const; * - **depth** -- Pyramid depth, VipsForeignDzDepth. * - **angle** -- Rotate image during save, VipsAngle. * - **container** -- Pyramid container type, VipsForeignDzContainer. - * - **properties** -- Write a properties file to the output directory, bool. * - **compression** -- ZIP deflate compression level, int. * - **region_shrink** -- Method to shrink regions, VipsRegionShrink. * - **skip_blanks** -- Skip tiles which are nearly equal to the background, int. @@ -2726,6 +2723,33 @@ void dzsave( const char *filename, VOption *options = 0 ) const; */ VipsBlob *dzsave_buffer( VOption *options = 0 ) const; +/** + * Save image to deepzoom target. + * + * **Optional parameters** + * - **basename** -- Base name to save to, const char *. + * - **layout** -- Directory layout, VipsForeignDzLayout. + * - **suffix** -- Filename suffix for tiles, const char *. + * - **overlap** -- Tile overlap in pixels, int. + * - **tile_size** -- Tile size in pixels, int. + * - **centre** -- Center image in tile, bool. + * - **depth** -- Pyramid depth, VipsForeignDzDepth. + * - **angle** -- Rotate image during save, VipsAngle. + * - **container** -- Pyramid container type, VipsForeignDzContainer. + * - **compression** -- ZIP deflate compression level, int. + * - **region_shrink** -- Method to shrink regions, VipsRegionShrink. + * - **skip_blanks** -- Skip tiles which are nearly equal to the background, int. + * - **no_strip** -- Don't strip tile metadata, bool. + * - **id** -- Resource ID, const char *. + * - **strip** -- Strip all metadata from image, bool. + * - **background** -- Background value, std::vector. + * - **page_height** -- Set page height for multipage save, int. + * + * @param target Target to save to. + * @param options Set of options. + */ +void dzsave_target( VTarget target, VOption *options = 0 ) const; + /** * Embed an image in a larger image. * @@ -3026,6 +3050,9 @@ static VImage gifload_source( VSource source, VOption *options = 0 ); * - **dither** -- Amount of dithering, double. * - **effort** -- Quantisation effort, int. * - **bitdepth** -- Number of bits per pixel, int. + * - **interframe_maxerror** -- Maximum inter-frame error for transparency, double. + * - **reoptimise** -- Reoptimise colour palettes, bool. + * - **interpalette_maxerror** -- Maximum inter-palette error for palette reusage, double. * - **strip** -- Strip all metadata from image, bool. * - **background** -- Background value, std::vector. * - **page_height** -- Set page height for multipage save, int. @@ -3042,6 +3069,9 @@ void gifsave( const char *filename, VOption *options = 0 ) const; * - **dither** -- Amount of dithering, double. * - **effort** -- Quantisation effort, int. * - **bitdepth** -- Number of bits per pixel, int. + * - **interframe_maxerror** -- Maximum inter-frame error for transparency, double. + * - **reoptimise** -- Reoptimise colour palettes, bool. + * - **interpalette_maxerror** -- Maximum inter-palette error for palette reusage, double. * - **strip** -- Strip all metadata from image, bool. * - **background** -- Background value, std::vector. * - **page_height** -- Set page height for multipage save, int. @@ -3058,6 +3088,9 @@ VipsBlob *gifsave_buffer( VOption *options = 0 ) const; * - **dither** -- Amount of dithering, double. * - **effort** -- Quantisation effort, int. * - **bitdepth** -- Number of bits per pixel, int. + * - **interframe_maxerror** -- Maximum inter-frame error for transparency, double. + * - **reoptimise** -- Reoptimise colour palettes, bool. + * - **interpalette_maxerror** -- Maximum inter-palette error for palette reusage, double. * - **strip** -- Strip all metadata from image, bool. * - **background** -- Background value, std::vector. * - **page_height** -- Set page height for multipage save, int. @@ -3086,7 +3119,7 @@ VImage globalbalance( VOption *options = 0 ) const; * - **extend** -- How to generate the extra pixels, VipsExtend. * - **background** -- Color for background pixels, std::vector. * - * @param direction direction to place image within width/height. + * @param direction Direction to place image within width/height. * @param width Image width in pixels. * @param height Image height in pixels. * @param options Set of options. @@ -3109,9 +3142,9 @@ static VImage grey( int width, int height, VOption *options = 0 ); /** * Grid an image. - * @param tile_height chop into tiles this high. - * @param across number of tiles across. - * @param down number of tiles down. + * @param tile_height Chop into tiles this high. + * @param across Number of tiles across. + * @param down Number of tiles down. * @param options Set of options. * @return Output image. */ @@ -3124,6 +3157,7 @@ VImage grid( int tile_height, int across, int down, VOption *options = 0 ) const * - **page** -- Load this page from the file, int. * - **n** -- Load this many pages, int. * - **thumbnail** -- Fetch thumbnail image, bool. + * - **unlimited** -- Remove all denial of service limits, bool. * - **memory** -- Force open via memory, bool. * - **access** -- Required access pattern for this file, VipsAccess. * - **fail_on** -- Error level to fail on, VipsFailOn. @@ -3141,6 +3175,7 @@ static VImage heifload( const char *filename, VOption *options = 0 ); * - **page** -- Load this page from the file, int. * - **n** -- Load this many pages, int. * - **thumbnail** -- Fetch thumbnail image, bool. + * - **unlimited** -- Remove all denial of service limits, bool. * - **memory** -- Force open via memory, bool. * - **access** -- Required access pattern for this file, VipsAccess. * - **fail_on** -- Error level to fail on, VipsFailOn. @@ -3158,6 +3193,7 @@ static VImage heifload_buffer( VipsBlob *buffer, VOption *options = 0 ); * - **page** -- Load this page from the file, int. * - **n** -- Load this many pages, int. * - **thumbnail** -- Fetch thumbnail image, bool. + * - **unlimited** -- Remove all denial of service limits, bool. * - **memory** -- Force open via memory, bool. * - **access** -- Required access pattern for this file, VipsAccess. * - **fail_on** -- Error level to fail on, VipsFailOn. @@ -3173,6 +3209,7 @@ static VImage heifload_source( VSource source, VOption *options = 0 ); * * **Optional parameters** * - **Q** -- Q factor, int. + * - **bitdepth** -- Number of bits per pixel, int. * - **lossless** -- Enable lossless compression, bool. * - **compression** -- Compression format, VipsForeignHeifCompression. * - **effort** -- CPU effort, int. @@ -3191,6 +3228,7 @@ void heifsave( const char *filename, VOption *options = 0 ) const; * * **Optional parameters** * - **Q** -- Q factor, int. + * - **bitdepth** -- Number of bits per pixel, int. * - **lossless** -- Enable lossless compression, bool. * - **compression** -- Compression format, VipsForeignHeifCompression. * - **effort** -- CPU effort, int. @@ -3209,6 +3247,7 @@ VipsBlob *heifsave_buffer( VOption *options = 0 ) const; * * **Optional parameters** * - **Q** -- Q factor, int. + * - **bitdepth** -- Number of bits per pixel, int. * - **lossless** -- Enable lossless compression, bool. * - **compression** -- Compression format, VipsForeignHeifCompression. * - **effort** -- CPU effort, int. @@ -3340,7 +3379,7 @@ VImage hough_circle( VOption *options = 0 ) const; * Find hough line transform. * * **Optional parameters** - * - **width** -- horizontal size of parameter space, int. + * - **width** -- Horizontal size of parameter space, int. * - **height** -- Vertical size of parameter space, int. * * @param options Set of options. @@ -3853,11 +3892,11 @@ VImage linecache( VOption *options = 0 ) const; * Make a laplacian of gaussian image. * * **Optional parameters** - * - **separable** -- Generate separable Logmatian, bool. + * - **separable** -- Generate separable Gaussian, bool. * - **precision** -- Generate with this precision, VipsPrecision. * - * @param sigma Radius of Logmatian. - * @param min_ampl Minimum amplitude of Logmatian. + * @param sigma Radius of Gaussian. + * @param min_ampl Minimum amplitude of Gaussian. * @param options Set of options. * @return Output image. */ @@ -3905,6 +3944,7 @@ static VImage magickload_buffer( VipsBlob *buffer, VOption *options = 0 ); * - **quality** -- Quality to use, int. * - **optimize_gif_frames** -- Apply GIF frames optimization, bool. * - **optimize_gif_transparency** -- Apply GIF transparency optimization, bool. + * - **bitdepth** -- Number of bits per pixel, int. * - **strip** -- Strip all metadata from image, bool. * - **background** -- Background value, std::vector. * - **page_height** -- Set page height for multipage save, int. @@ -3922,6 +3962,7 @@ void magicksave( const char *filename, VOption *options = 0 ) const; * - **quality** -- Quality to use, int. * - **optimize_gif_frames** -- Apply GIF frames optimization, bool. * - **optimize_gif_transparency** -- Apply GIF transparency optimization, bool. + * - **bitdepth** -- Number of bits per pixel, int. * - **strip** -- Strip all metadata from image, bool. * - **background** -- Background value, std::vector. * - **page_height** -- Set page height for multipage save, int. @@ -3936,6 +3977,9 @@ VipsBlob *magicksave_buffer( VOption *options = 0 ) const; * * **Optional parameters** * - **interpolate** -- Interpolate pixels with this, VInterpolate. + * - **background** -- Background value, std::vector. + * - **premultiplied** -- Images have premultiplied alpha, bool. + * - **extend** -- How to generate the extra pixels, VipsExtend. * * @param index Index pixels with this. * @param options Set of options. @@ -3947,7 +3991,7 @@ VImage mapim( VImage index, VOption *options = 0 ) const; * Map an image though a lut. * * **Optional parameters** - * - **band** -- apply one-band lut to this band of in, int. + * - **band** -- Apply one-band lut to this band of in, int. * * @param lut Look-up table image. * @param options Set of options. @@ -3988,7 +4032,7 @@ static VImage mask_butterworth( int width, int height, double order, double freq * @param order Filter order. * @param frequency_cutoff_x Frequency cutoff x. * @param frequency_cutoff_y Frequency cutoff y. - * @param radius radius of circle. + * @param radius Radius of circle. * @param amplitude_cutoff Amplitude cutoff. * @param options Set of options. * @return Output image. @@ -4063,7 +4107,7 @@ static VImage mask_gaussian( int width, int height, double frequency_cutoff, dou * @param height Image height in pixels. * @param frequency_cutoff_x Frequency cutoff x. * @param frequency_cutoff_y Frequency cutoff y. - * @param radius radius of circle. + * @param radius Radius of circle. * @param amplitude_cutoff Amplitude cutoff. * @param options Set of options. * @return Output image. @@ -4119,7 +4163,7 @@ static VImage mask_ideal( int width, int height, double frequency_cutoff, VOptio * @param height Image height in pixels. * @param frequency_cutoff_x Frequency cutoff x. * @param frequency_cutoff_y Frequency cutoff y. - * @param radius radius of circle. + * @param radius Radius of circle. * @param options Set of options. * @return Output image. */ @@ -4168,7 +4212,7 @@ VImage match( VImage sec, int xr1, int yr1, int xs1, int ys1, int xr2, int yr2, /** * Apply a math operation to an image. - * @param math math to perform. + * @param math Math to perform. * @param options Set of options. * @return Output image. */ @@ -4177,7 +4221,7 @@ VImage math( VipsOperationMath math, VOption *options = 0 ) const; /** * Binary math operations. * @param right Right-hand image argument. - * @param math2 math to perform. + * @param math2 Math to perform. * @param options Set of options. * @return Output image. */ @@ -4185,7 +4229,7 @@ VImage math2( VImage right, VipsOperationMath2 math2, VOption *options = 0 ) con /** * Binary math operations with a constant. - * @param math2 math to perform. + * @param math2 Math to perform. * @param c Array of constants. * @param options Set of options. * @return Output image. @@ -4505,6 +4549,7 @@ static VImage openslideload_source( VSource source, VOption *options = 0 ); * - **dpi** -- Render at this DPI, double. * - **scale** -- Scale output by this factor, double. * - **background** -- Background value, std::vector. + * - **password** -- Decrypt with this password, const char *. * - **memory** -- Force open via memory, bool. * - **access** -- Required access pattern for this file, VipsAccess. * - **fail_on** -- Error level to fail on, VipsFailOn. @@ -4524,6 +4569,7 @@ static VImage pdfload( const char *filename, VOption *options = 0 ); * - **dpi** -- Render at this DPI, double. * - **scale** -- Scale output by this factor, double. * - **background** -- Background value, std::vector. + * - **password** -- Decrypt with this password, const char *. * - **memory** -- Force open via memory, bool. * - **access** -- Required access pattern for this file, VipsAccess. * - **fail_on** -- Error level to fail on, VipsFailOn. @@ -4543,6 +4589,7 @@ static VImage pdfload_buffer( VipsBlob *buffer, VOption *options = 0 ); * - **dpi** -- Render at this DPI, double. * - **scale** -- Scale output by this factor, double. * - **background** -- Background value, std::vector. + * - **password** -- Decrypt with this password, const char *. * - **memory** -- Force open via memory, bool. * - **access** -- Required access pattern for this file, VipsAccess. * - **fail_on** -- Error level to fail on, VipsFailOn. @@ -4630,17 +4677,17 @@ static VImage pngload_buffer( VipsBlob *buffer, VOption *options = 0 ); static VImage pngload_source( VSource source, VOption *options = 0 ); /** - * Save image to png file. + * Save image to file as png. * * **Optional parameters** * - **compression** -- Compression factor, int. * - **interlace** -- Interlace image, bool. * - **profile** -- ICC profile to embed, const char *. - * - **filter** -- libpng row filter flag(s), int. + * - **filter** -- libspng row filter flag(s), int. * - **palette** -- Quantise to 8bpp palette, bool. * - **Q** -- Quantisation quality, int. * - **dither** -- Amount of dithering, double. - * - **bitdepth** -- Write as a 1, 2, 4 or 8 bit image, int. + * - **bitdepth** -- Write as a 1, 2, 4, 8 or 16 bit image, int. * - **effort** -- Quantisation CPU effort, int. * - **strip** -- Strip all metadata from image, bool. * - **background** -- Background value, std::vector. @@ -4652,17 +4699,17 @@ static VImage pngload_source( VSource source, VOption *options = 0 ); void pngsave( const char *filename, VOption *options = 0 ) const; /** - * Save image to png buffer. + * Save image to buffer as png. * * **Optional parameters** * - **compression** -- Compression factor, int. * - **interlace** -- Interlace image, bool. * - **profile** -- ICC profile to embed, const char *. - * - **filter** -- libpng row filter flag(s), int. + * - **filter** -- libspng row filter flag(s), int. * - **palette** -- Quantise to 8bpp palette, bool. * - **Q** -- Quantisation quality, int. * - **dither** -- Amount of dithering, double. - * - **bitdepth** -- Write as a 1, 2, 4 or 8 bit image, int. + * - **bitdepth** -- Write as a 1, 2, 4, 8 or 16 bit image, int. * - **effort** -- Quantisation CPU effort, int. * - **strip** -- Strip all metadata from image, bool. * - **background** -- Background value, std::vector. @@ -4680,11 +4727,11 @@ VipsBlob *pngsave_buffer( VOption *options = 0 ) const; * - **compression** -- Compression factor, int. * - **interlace** -- Interlace image, bool. * - **profile** -- ICC profile to embed, const char *. - * - **filter** -- libpng row filter flag(s), int. + * - **filter** -- libspng row filter flag(s), int. * - **palette** -- Quantise to 8bpp palette, bool. * - **Q** -- Quantisation quality, int. * - **dither** -- Amount of dithering, double. - * - **bitdepth** -- Write as a 1, 2, 4 or 8 bit image, int. + * - **bitdepth** -- Write as a 1, 2, 4, 8 or 16 bit image, int. * - **effort** -- Quantisation CPU effort, int. * - **strip** -- Strip all metadata from image, bool. * - **background** -- Background value, std::vector. @@ -4728,8 +4775,8 @@ static VImage ppmload_source( VSource source, VOption *options = 0 ); * * **Optional parameters** * - **format** -- Format to save in, VipsForeignPpmFormat. - * - **ascii** -- save as ascii, bool. - * - **bitdepth** -- set to 1 to write as a 1 bit image, int. + * - **ascii** -- Save as ascii, bool. + * - **bitdepth** -- Set to 1 to write as a 1 bit image, int. * - **strip** -- Strip all metadata from image, bool. * - **background** -- Background value, std::vector. * - **page_height** -- Set page height for multipage save, int. @@ -4744,8 +4791,8 @@ void ppmsave( const char *filename, VOption *options = 0 ) const; * * **Optional parameters** * - **format** -- Format to save in, VipsForeignPpmFormat. - * - **ascii** -- save as ascii, bool. - * - **bitdepth** -- set to 1 to write as a 1 bit image, int. + * - **ascii** -- Save as ascii, bool. + * - **bitdepth** -- Set to 1 to write as a 1 bit image, int. * - **strip** -- Strip all metadata from image, bool. * - **background** -- Background value, std::vector. * - **page_height** -- Set page height for multipage save, int. @@ -4948,7 +4995,7 @@ void rawsave_fd( int fd, VOption *options = 0 ) const; /** * Linear recombination with matrix. - * @param m matrix of coefficients. + * @param m Matrix of coefficients. * @param options Set of options. * @return Output image. */ @@ -4959,6 +5006,7 @@ VImage recomb( VImage m, VOption *options = 0 ) const; * * **Optional parameters** * - **kernel** -- Resampling kernel, VipsKernel. + * - **gap** -- Reducing gap, double. * * @param hshrink Horizontal shrink factor. * @param vshrink Vertical shrink factor. @@ -4972,6 +5020,7 @@ VImage reduce( double hshrink, double vshrink, VOption *options = 0 ) const; * * **Optional parameters** * - **kernel** -- Resampling kernel, VipsKernel. + * - **gap** -- Reducing gap, double. * * @param hshrink Horizontal shrink factor. * @param options Set of options. @@ -4984,6 +5033,7 @@ VImage reduceh( double hshrink, VOption *options = 0 ) const; * * **Optional parameters** * - **kernel** -- Resampling kernel, VipsKernel. + * - **gap** -- Reducing gap, double. * * @param vshrink Vertical shrink factor. * @param options Set of options. @@ -4994,7 +5044,7 @@ VImage reducev( double vshrink, VOption *options = 0 ) const; /** * Relational operation on two images. * @param right Right-hand image argument. - * @param relational relational to perform. + * @param relational Relational to perform. * @param options Set of options. * @return Output image. */ @@ -5002,7 +5052,7 @@ VImage relational( VImage right, VipsOperationRelational relational, VOption *op /** * Relational operations against a constant. - * @param relational relational to perform. + * @param relational Relational to perform. * @param c Array of constants. * @param options Set of options. * @return Output image. @@ -5039,6 +5089,7 @@ VImage replicate( int across, int down, VOption *options = 0 ) const; * * **Optional parameters** * - **kernel** -- Resampling kernel, VipsKernel. + * - **gap** -- Reducing gap, double. * - **vscale** -- Vertical scale image by this factor, double. * * @param scale Scale image by this factor. @@ -5085,7 +5136,7 @@ VImage rotate( double angle, VOption *options = 0 ) const; /** * Perform a round function on an image. - * @param round rounding operation to perform. + * @param round Rounding operation to perform. * @param options Set of options. * @return Output image. */ @@ -5175,6 +5226,10 @@ VImage sharpen( VOption *options = 0 ) const; /** * Shrink an image. + * + * **Optional parameters** + * - **ceil** -- Round-up output dimensions, bool. + * * @param hshrink Horizontal shrink factor. * @param vshrink Vertical shrink factor. * @param options Set of options. @@ -5184,6 +5239,10 @@ VImage shrink( double hshrink, double vshrink, VOption *options = 0 ) const; /** * Shrink an image horizontally. + * + * **Optional parameters** + * - **ceil** -- Round-up output dimensions, bool. + * * @param hshrink Horizontal shrink factor. * @param options Set of options. * @return Output image. @@ -5192,6 +5251,10 @@ VImage shrinkh( int hshrink, VOption *options = 0 ) const; /** * Shrink an image vertically. + * + * **Optional parameters** + * - **ceil** -- Round-up output dimensions, bool. + * * @param vshrink Vertical shrink factor. * @param options Set of options. * @return Output image. @@ -5429,6 +5492,7 @@ static VImage text( const char *text, VOption *options = 0 ); * - **import_profile** -- Fallback import profile, const char *. * - **export_profile** -- Fallback export profile, const char *. * - **intent** -- Rendering intent, VipsIntent. + * - **fail_on** -- Error level to fail on, VipsFailOn. * * @param filename Filename to read from. * @param width Size to this width. @@ -5450,6 +5514,7 @@ static VImage thumbnail( const char *filename, int width, VOption *options = 0 ) * - **import_profile** -- Fallback import profile, const char *. * - **export_profile** -- Fallback export profile, const char *. * - **intent** -- Rendering intent, VipsIntent. + * - **fail_on** -- Error level to fail on, VipsFailOn. * * @param buffer Buffer to load from. * @param width Size to this width. @@ -5470,6 +5535,7 @@ static VImage thumbnail_buffer( VipsBlob *buffer, int width, VOption *options = * - **import_profile** -- Fallback import profile, const char *. * - **export_profile** -- Fallback export profile, const char *. * - **intent** -- Rendering intent, VipsIntent. + * - **fail_on** -- Error level to fail on, VipsFailOn. * * @param width Size to this width. * @param options Set of options. @@ -5490,6 +5556,7 @@ VImage thumbnail_image( int width, VOption *options = 0 ) const; * - **import_profile** -- Fallback import profile, const char *. * - **export_profile** -- Fallback export profile, const char *. * - **intent** -- Rendering intent, VipsIntent. + * - **fail_on** -- Error level to fail on, VipsFailOn. * * @param source Source to load from. * @param width Size to this width. @@ -5620,6 +5687,40 @@ void tiffsave( const char *filename, VOption *options = 0 ) const; */ VipsBlob *tiffsave_buffer( VOption *options = 0 ) const; +/** + * Save image to tiff target. + * + * **Optional parameters** + * - **compression** -- Compression for this file, VipsForeignTiffCompression. + * - **Q** -- Q factor, int. + * - **predictor** -- Compression prediction, VipsForeignTiffPredictor. + * - **profile** -- ICC profile to embed, const char *. + * - **tile** -- Write a tiled tiff, bool. + * - **tile_width** -- Tile width in pixels, int. + * - **tile_height** -- Tile height in pixels, int. + * - **pyramid** -- Write a pyramidal tiff, bool. + * - **miniswhite** -- Use 0 for white in 1-bit images, bool. + * - **bitdepth** -- Write as a 1, 2, 4 or 8 bit image, int. + * - **resunit** -- Resolution unit, VipsForeignTiffResunit. + * - **xres** -- Horizontal resolution in pixels/mm, double. + * - **yres** -- Vertical resolution in pixels/mm, double. + * - **bigtiff** -- Write a bigtiff image, bool. + * - **properties** -- Write a properties document to IMAGEDESCRIPTION, bool. + * - **region_shrink** -- Method to shrink regions, VipsRegionShrink. + * - **level** -- ZSTD compression level, int. + * - **lossless** -- Enable WEBP lossless mode, bool. + * - **depth** -- Pyramid depth, VipsForeignDzDepth. + * - **subifd** -- Save pyr layers as sub-IFDs, bool. + * - **premultiply** -- Save with premultiplied alpha, bool. + * - **strip** -- Strip all metadata from image, bool. + * - **background** -- Background value, std::vector. + * - **page_height** -- Set page height for multipage save, int. + * + * @param target Target to save to. + * @param options Set of options. + */ +void tiffsave_target( VTarget target, VOption *options = 0 ) const; + /** * Cache an image as a set of tiles. * @@ -5789,7 +5890,7 @@ static VImage webpload_source( VSource source, VOption *options = 0 ); * * **Optional parameters** * - **Q** -- Q factor, int. - * - **lossless** -- enable lossless compression, bool. + * - **lossless** -- Enable lossless compression, bool. * - **preset** -- Preset for lossy compression, VipsForeignWebpPreset. * - **smart_subsample** -- Enable high quality chroma subsampling, bool. * - **near_lossless** -- Enable preprocessing in lossless mode (uses Q), bool. @@ -5814,7 +5915,7 @@ void webpsave( const char *filename, VOption *options = 0 ) const; * * **Optional parameters** * - **Q** -- Q factor, int. - * - **lossless** -- enable lossless compression, bool. + * - **lossless** -- Enable lossless compression, bool. * - **preset** -- Preset for lossy compression, VipsForeignWebpPreset. * - **smart_subsample** -- Enable high quality chroma subsampling, bool. * - **near_lossless** -- Enable preprocessing in lossless mode (uses Q), bool. @@ -5839,7 +5940,7 @@ VipsBlob *webpsave_buffer( VOption *options = 0 ) const; * * **Optional parameters** * - **Q** -- Q factor, int. - * - **lossless** -- enable lossless compression, bool. + * - **lossless** -- Enable lossless compression, bool. * - **preset** -- Preset for lossy compression, VipsForeignWebpPreset. * - **smart_subsample** -- Enable high quality chroma subsampling, bool. * - **near_lossless** -- Enable preprocessing in lossless mode (uses Q), bool. diff --git a/cplusplus/meson.build b/cplusplus/meson.build index 34e53b12..2f65d13a 100644 --- a/cplusplus/meson.build +++ b/cplusplus/meson.build @@ -35,7 +35,7 @@ custom_target('vips-operators-header', custom_target('vips-operators-source', command: [ 'gen-operators.py', '-g', 'cpp'], capture: true, - output: 'vips-operators.cc' + output: 'vips-operators.cpp' ) if get_option('doxygen') diff --git a/cplusplus/vips-operators.cpp b/cplusplus/vips-operators.cpp index 38b858b3..9360bd89 100644 --- a/cplusplus/vips-operators.cpp +++ b/cplusplus/vips-operators.cpp @@ -1,5 +1,4 @@ // bodies for vips operations -// Mon Nov 1 03:31:09 PM CET 2021 // this file is generated automatically, do not edit! VImage VImage::CMC2LCh( VOption *options ) const @@ -943,6 +942,14 @@ VipsBlob *VImage::dzsave_buffer( VOption *options ) const return( buffer ); } +void VImage::dzsave_target( VTarget target, VOption *options ) const +{ + call( "dzsave_target", + (options ? options : VImage::option())-> + set( "in", *this )-> + set( "target", target ) ); +} + VImage VImage::embed( int x, int y, int width, int height, VOption *options ) const { VImage out; @@ -3521,6 +3528,14 @@ VipsBlob *VImage::tiffsave_buffer( VOption *options ) const return( buffer ); } +void VImage::tiffsave_target( VTarget target, VOption *options ) const +{ + call( "tiffsave_target", + (options ? options : VImage::option())-> + set( "in", *this )-> + set( "target", target ) ); +} + VImage VImage::tilecache( VOption *options ) const { VImage out; diff --git a/doc/function-list.xml b/doc/function-list.xml index 23953295..b395cdb3 100644 --- a/doc/function-list.xml +++ b/doc/function-list.xml @@ -451,6 +451,11 @@ Save image to dz buffer vips_dzsave_buffer() + + dzsave_target + Save image to deepzoom target + vips_dzsave_target() + embed Embed an image in a larger image @@ -1128,12 +1133,12 @@ pngsave - Save image to png file + Save image to file as png vips_pngsave() pngsave_buffer - Save image to png buffer + Save image to buffer as png vips_pngsave_buffer() @@ -1501,6 +1506,11 @@ Save image to tiff buffer vips_tiffsave_buffer() + + tiffsave_target + Save image to tiff target + vips_tiffsave_target() + tilecache Cache an image as a set of tiles diff --git a/libvips/arithmetic/boolean.c b/libvips/arithmetic/boolean.c index 8c8ae1e7..80a66f62 100644 --- a/libvips/arithmetic/boolean.c +++ b/libvips/arithmetic/boolean.c @@ -248,7 +248,7 @@ vips_boolean_class_init( VipsBooleanClass *class ) VIPS_ARG_ENUM( class, "boolean", 200, _( "Operation" ), - _( "boolean to perform" ), + _( "Boolean to perform" ), VIPS_ARGUMENT_REQUIRED_INPUT, G_STRUCT_OFFSET( VipsBoolean, operation ), VIPS_TYPE_OPERATION_BOOLEAN, @@ -548,7 +548,7 @@ vips_boolean_const_class_init( VipsBooleanConstClass *class ) VIPS_ARG_ENUM( class, "boolean", 200, _( "Operation" ), - _( "boolean to perform" ), + _( "Boolean to perform" ), VIPS_ARGUMENT_REQUIRED_INPUT, G_STRUCT_OFFSET( VipsBooleanConst, operation ), VIPS_TYPE_OPERATION_BOOLEAN, diff --git a/libvips/arithmetic/complex.c b/libvips/arithmetic/complex.c index 6e0473c4..3795505d 100644 --- a/libvips/arithmetic/complex.c +++ b/libvips/arithmetic/complex.c @@ -258,7 +258,7 @@ vips_complex_class_init( VipsComplexClass *class ) VIPS_ARG_ENUM( class, "cmplx", 200, _( "Operation" ), - _( "complex to perform" ), + _( "Complex to perform" ), VIPS_ARGUMENT_REQUIRED_INPUT, G_STRUCT_OFFSET( VipsComplex, cmplx ), VIPS_TYPE_OPERATION_COMPLEX, VIPS_OPERATION_COMPLEX_POLAR ); @@ -551,7 +551,7 @@ vips_complex2_class_init( VipsComplex2Class *class ) VIPS_ARG_ENUM( class, "cmplx", 200, _( "Operation" ), - _( "binary complex operation to perform" ), + _( "Binary complex operation to perform" ), VIPS_ARGUMENT_REQUIRED_INPUT, G_STRUCT_OFFSET( VipsComplex2, cmplx ), VIPS_TYPE_OPERATION_COMPLEX2, @@ -766,7 +766,7 @@ vips_complexget_class_init( VipsComplexgetClass *class ) VIPS_ARG_ENUM( class, "get", 200, _( "Operation" ), - _( "complex to perform" ), + _( "Complex to perform" ), VIPS_ARGUMENT_REQUIRED_INPUT, G_STRUCT_OFFSET( VipsComplexget, get ), VIPS_TYPE_OPERATION_COMPLEXGET, diff --git a/libvips/arithmetic/find_trim.c b/libvips/arithmetic/find_trim.c index 33f18b38..79b4f402 100644 --- a/libvips/arithmetic/find_trim.c +++ b/libvips/arithmetic/find_trim.c @@ -180,7 +180,7 @@ vips_find_trim_class_init( VipsFindTrimClass *class ) //operation_class->flags = VIPS_OPERATION_SEQUENTIAL; VIPS_ARG_IMAGE( class, "in", 1, - _( "in" ), + _( "Input" ), _( "Image to find_trim" ), VIPS_ARGUMENT_REQUIRED_INPUT, G_STRUCT_OFFSET( VipsFindTrim, in ) ); diff --git a/libvips/arithmetic/getpoint.c b/libvips/arithmetic/getpoint.c index bf89f45d..8d70d4cb 100644 --- a/libvips/arithmetic/getpoint.c +++ b/libvips/arithmetic/getpoint.c @@ -139,7 +139,7 @@ vips_getpoint_class_init( VipsGetpointClass *class ) object_class->build = vips_getpoint_build; VIPS_ARG_IMAGE( class, "in", 1, - _( "in" ), + _( "Input" ), _( "Input image" ), VIPS_ARGUMENT_REQUIRED_INPUT, G_STRUCT_OFFSET( VipsGetpoint, in ) ); diff --git a/libvips/arithmetic/hough_line.c b/libvips/arithmetic/hough_line.c index 334a1de9..42e6039a 100644 --- a/libvips/arithmetic/hough_line.c +++ b/libvips/arithmetic/hough_line.c @@ -145,7 +145,7 @@ vips_hough_line_class_init( VipsHoughClass *class ) VIPS_ARG_INT( class, "width", 110, _( "Width" ), - _( "horizontal size of parameter space" ), + _( "Horizontal size of parameter space" ), VIPS_ARGUMENT_OPTIONAL_INPUT, G_STRUCT_OFFSET( VipsHoughLine, width ), 1, 100000, 256 ); diff --git a/libvips/arithmetic/math.c b/libvips/arithmetic/math.c index dec1187f..e28c8f6e 100644 --- a/libvips/arithmetic/math.c +++ b/libvips/arithmetic/math.c @@ -230,7 +230,7 @@ vips_math_class_init( VipsMathClass *class ) VIPS_ARG_ENUM( class, "math", 200, _( "Operation" ), - _( "math to perform" ), + _( "Math to perform" ), VIPS_ARGUMENT_REQUIRED_INPUT, G_STRUCT_OFFSET( VipsMath, math ), VIPS_TYPE_OPERATION_MATH, VIPS_OPERATION_MATH_SIN ); diff --git a/libvips/arithmetic/math2.c b/libvips/arithmetic/math2.c index e47b258f..9ee0815c 100644 --- a/libvips/arithmetic/math2.c +++ b/libvips/arithmetic/math2.c @@ -231,7 +231,7 @@ vips_math2_class_init( VipsMath2Class *class ) VIPS_ARG_ENUM( class, "math2", 200, _( "Operation" ), - _( "math to perform" ), + _( "Math to perform" ), VIPS_ARGUMENT_REQUIRED_INPUT, G_STRUCT_OFFSET( VipsMath2, math2 ), VIPS_TYPE_OPERATION_MATH2, VIPS_OPERATION_MATH2_POW ); @@ -462,7 +462,7 @@ vips_math2_const_class_init( VipsMath2ConstClass *class ) VIPS_ARG_ENUM( class, "math2", 200, _( "Operation" ), - _( "math to perform" ), + _( "Math to perform" ), VIPS_ARGUMENT_REQUIRED_INPUT, G_STRUCT_OFFSET( VipsMath2Const, math2 ), VIPS_TYPE_OPERATION_MATH2, VIPS_OPERATION_MATH2_POW ); diff --git a/libvips/arithmetic/measure.c b/libvips/arithmetic/measure.c index 3fea0e4f..1dd6ce20 100644 --- a/libvips/arithmetic/measure.c +++ b/libvips/arithmetic/measure.c @@ -192,7 +192,7 @@ vips_measure_class_init( VipsMeasureClass *class ) object_class->build = vips_measure_build; VIPS_ARG_IMAGE( class, "in", 1, - _( "in" ), + _( "Input" ), _( "Image to measure" ), VIPS_ARGUMENT_REQUIRED_INPUT, G_STRUCT_OFFSET( VipsMeasure, in ) ); diff --git a/libvips/arithmetic/relational.c b/libvips/arithmetic/relational.c index 607b77ce..cd017cd2 100644 --- a/libvips/arithmetic/relational.c +++ b/libvips/arithmetic/relational.c @@ -222,7 +222,7 @@ vips_relational_class_init( VipsRelationalClass *class ) VIPS_ARG_ENUM( class, "relational", 200, _( "Operation" ), - _( "relational to perform" ), + _( "Relational to perform" ), VIPS_ARGUMENT_REQUIRED_INPUT, G_STRUCT_OFFSET( VipsRelational, relational ), VIPS_TYPE_OPERATION_RELATIONAL, @@ -584,7 +584,7 @@ vips_relational_const_class_init( VipsRelationalConstClass *class ) VIPS_ARG_ENUM( class, "relational", 200, _( "Operation" ), - _( "relational to perform" ), + _( "Relational to perform" ), VIPS_ARGUMENT_REQUIRED_INPUT, G_STRUCT_OFFSET( VipsRelationalConst, relational ), VIPS_TYPE_OPERATION_RELATIONAL, diff --git a/libvips/arithmetic/round.c b/libvips/arithmetic/round.c index 81b1dc33..ae87216c 100644 --- a/libvips/arithmetic/round.c +++ b/libvips/arithmetic/round.c @@ -167,7 +167,7 @@ vips_round_class_init( VipsRoundClass *class ) VIPS_ARG_ENUM( class, "round", 200, _( "Round operation" ), - _( "rounding operation to perform" ), + _( "Rounding operation to perform" ), VIPS_ARGUMENT_REQUIRED_INPUT, G_STRUCT_OFFSET( VipsRound, round ), VIPS_TYPE_OPERATION_ROUND, VIPS_OPERATION_ROUND_RINT ); diff --git a/libvips/conversion/bandbool.c b/libvips/conversion/bandbool.c index 661e6794..987586e5 100644 --- a/libvips/conversion/bandbool.c +++ b/libvips/conversion/bandbool.c @@ -219,7 +219,7 @@ vips_bandbool_class_init( VipsBandboolClass *class ) VIPS_ARG_ENUM( class, "boolean", 200, _( "Operation" ), - _( "boolean to perform" ), + _( "Boolean to perform" ), VIPS_ARGUMENT_REQUIRED_INPUT, G_STRUCT_OFFSET( VipsBandbool, operation ), VIPS_TYPE_OPERATION_BOOLEAN, diff --git a/libvips/conversion/embed.c b/libvips/conversion/embed.c index 958250b7..c10fc778 100644 --- a/libvips/conversion/embed.c +++ b/libvips/conversion/embed.c @@ -813,7 +813,7 @@ vips_gravity_class_init( VipsGravityClass *class ) VIPS_ARG_ENUM( class, "direction", 3, _( "Direction" ), - _( "direction to place image within width/height" ), + _( "Direction to place image within width/height" ), VIPS_ARGUMENT_REQUIRED_INPUT, G_STRUCT_OFFSET( VipsGravity, direction ), VIPS_TYPE_COMPASS_DIRECTION, VIPS_COMPASS_DIRECTION_CENTRE ); diff --git a/libvips/conversion/falsecolour.c b/libvips/conversion/falsecolour.c index 79ef104d..8c95f9e6 100644 --- a/libvips/conversion/falsecolour.c +++ b/libvips/conversion/falsecolour.c @@ -378,7 +378,7 @@ vips_falsecolour_class_init( VipsFalsecolourClass *class ) operation_class->flags = VIPS_OPERATION_SEQUENTIAL; VIPS_ARG_IMAGE( class, "in", 0, - _( "in" ), + _( "Input" ), _( "Input image" ), VIPS_ARGUMENT_REQUIRED_INPUT, G_STRUCT_OFFSET( VipsFalsecolour, in ) ); diff --git a/libvips/conversion/gamma.c b/libvips/conversion/gamma.c index c19273a3..e73b0e6e 100644 --- a/libvips/conversion/gamma.c +++ b/libvips/conversion/gamma.c @@ -140,13 +140,13 @@ vips_gamma_class_init( VipsGammaClass *class ) operation_class->flags = VIPS_OPERATION_SEQUENTIAL; VIPS_ARG_IMAGE( class, "in", 1, - _( "in" ), + _( "Input" ), _( "Input image" ), VIPS_ARGUMENT_REQUIRED_INPUT, G_STRUCT_OFFSET( VipsGamma, in ) ); VIPS_ARG_DOUBLE( class, "exponent", 2, - _( "exponent" ), + _( "Exponent" ), _( "Gamma factor" ), VIPS_ARGUMENT_OPTIONAL_INPUT, G_STRUCT_OFFSET( VipsGamma, exponent ), diff --git a/libvips/conversion/grid.c b/libvips/conversion/grid.c index fa232899..b61246e0 100644 --- a/libvips/conversion/grid.c +++ b/libvips/conversion/grid.c @@ -203,21 +203,21 @@ vips_grid_class_init( VipsGridClass *class ) VIPS_ARG_INT( class, "tile_height", 3, _( "Tile height" ), - _( "chop into tiles this high" ), + _( "Chop into tiles this high" ), VIPS_ARGUMENT_REQUIRED_INPUT, G_STRUCT_OFFSET( VipsGrid, tile_height ), 1, 10000000, 128 ); VIPS_ARG_INT( class, "across", 4, _( "Across" ), - _( "number of tiles across" ), + _( "Number of tiles across" ), VIPS_ARGUMENT_REQUIRED_INPUT, G_STRUCT_OFFSET( VipsGrid, across ), 1, 10000000, 1 ); VIPS_ARG_INT( class, "down", 5, _( "Down" ), - _( "number of tiles down" ), + _( "Number of tiles down" ), VIPS_ARGUMENT_REQUIRED_INPUT, G_STRUCT_OFFSET( VipsGrid, down ), 1, 10000000, 1 ); diff --git a/libvips/conversion/ifthenelse.c b/libvips/conversion/ifthenelse.c index eeb58e56..169d7ee1 100644 --- a/libvips/conversion/ifthenelse.c +++ b/libvips/conversion/ifthenelse.c @@ -498,7 +498,7 @@ vips_ifthenelse_class_init( VipsIfthenelseClass *class ) G_STRUCT_OFFSET( VipsIfthenelse, in2 ) ); VIPS_ARG_BOOL( class, "blend", 4, - _( "blend" ), + _( "Blend" ), _( "Blend smoothly between then and else parts" ), VIPS_ARGUMENT_OPTIONAL_INPUT, G_STRUCT_OFFSET( VipsIfthenelse, blend ), diff --git a/libvips/conversion/join.c b/libvips/conversion/join.c index 1f1f0f63..f1e8b5bf 100644 --- a/libvips/conversion/join.c +++ b/libvips/conversion/join.c @@ -246,7 +246,7 @@ vips_join_class_init( VipsJoinClass *class ) G_STRUCT_OFFSET( VipsJoin, in2 ) ); VIPS_ARG_ENUM( class, "direction", 3, - _( "direction" ), + _( "Direction" ), _( "Join left-right or up-down" ), VIPS_ARGUMENT_REQUIRED_INPUT, G_STRUCT_OFFSET( VipsJoin, direction ), diff --git a/libvips/conversion/recomb.c b/libvips/conversion/recomb.c index 4119592f..06ac9505 100644 --- a/libvips/conversion/recomb.c +++ b/libvips/conversion/recomb.c @@ -211,7 +211,7 @@ vips_recomb_class_init( VipsRecombClass *class ) VIPS_ARG_IMAGE( class, "m", 102, _( "M" ), - _( "matrix of coefficients" ), + _( "Matrix of coefficients" ), VIPS_ARGUMENT_REQUIRED_INPUT, G_STRUCT_OFFSET( VipsRecomb, m ) ); } diff --git a/libvips/conversion/sequential.c b/libvips/conversion/sequential.c index 5211beb1..1b3bce4a 100644 --- a/libvips/conversion/sequential.c +++ b/libvips/conversion/sequential.c @@ -258,8 +258,8 @@ vips_sequential_class_init( VipsSequentialClass *class ) VIPS_TYPE_ACCESS, VIPS_ACCESS_SEQUENTIAL ); VIPS_ARG_BOOL( class, "trace", 2, - _( "trace" ), - _( "trace pixel requests" ), + _( "Trace" ), + _( "Trace pixel requests" ), VIPS_ARGUMENT_OPTIONAL_INPUT | VIPS_ARGUMENT_DEPRECATED, G_STRUCT_OFFSET( VipsSequential, trace ), TRUE ); diff --git a/libvips/convolution/sharpen.c b/libvips/convolution/sharpen.c index 5126f613..596d2b12 100644 --- a/libvips/convolution/sharpen.c +++ b/libvips/convolution/sharpen.c @@ -371,7 +371,7 @@ vips_sharpen_class_init( VipsSharpenClass *class ) */ VIPS_ARG_INT( class, "radius", 3, _( "Radius" ), - _( "radius of Gaussian" ), + _( "Radius of Gaussian" ), VIPS_ARGUMENT_OPTIONAL_INPUT | VIPS_ARGUMENT_DEPRECATED, G_STRUCT_OFFSET( VipsSharpen, radius ), 1, 100, 1 ); diff --git a/libvips/create/mask_butterworth_band.c b/libvips/create/mask_butterworth_band.c index dcb1daa5..b164a69b 100644 --- a/libvips/create/mask_butterworth_band.c +++ b/libvips/create/mask_butterworth_band.c @@ -131,8 +131,8 @@ vips_mask_butterworth_band_class_init( 0.0, 1000000.0, 0.5 ); VIPS_ARG_DOUBLE( class, "radius", 9, - _( "radius" ), - _( "radius of circle" ), + _( "Radius" ), + _( "Radius of circle" ), VIPS_ARGUMENT_REQUIRED_INPUT, G_STRUCT_OFFSET( VipsMaskButterworthBand, radius ), 0.0, 1000000.0, 0.1 ); diff --git a/libvips/create/mask_gaussian_band.c b/libvips/create/mask_gaussian_band.c index 3333dcbe..bc0a6bb2 100644 --- a/libvips/create/mask_gaussian_band.c +++ b/libvips/create/mask_gaussian_band.c @@ -118,8 +118,8 @@ vips_mask_gaussian_band_class_init( VipsMaskGaussianBandClass *class ) 0.0, 1000000.0, 0.5 ); VIPS_ARG_DOUBLE( class, "radius", 9, - _( "radius" ), - _( "radius of circle" ), + _( "Radius" ), + _( "Radius of circle" ), VIPS_ARGUMENT_REQUIRED_INPUT, G_STRUCT_OFFSET( VipsMaskGaussianBand, radius ), 0.0, 1000000.0, 0.1 ); diff --git a/libvips/create/mask_ideal_band.c b/libvips/create/mask_ideal_band.c index c835be81..38760c88 100644 --- a/libvips/create/mask_ideal_band.c +++ b/libvips/create/mask_ideal_band.c @@ -109,8 +109,8 @@ vips_mask_ideal_band_class_init( VipsMaskIdealBandClass *class ) 0.0, 1000000.0, 0.5 ); VIPS_ARG_DOUBLE( class, "radius", 8, - _( "radius" ), - _( "radius of circle" ), + _( "Radius" ), + _( "Radius of circle" ), VIPS_ARGUMENT_REQUIRED_INPUT, G_STRUCT_OFFSET( VipsMaskIdealBand, radius ), 0.0, 1000000.0, 0.1 ); diff --git a/libvips/draw/draw_flood.c b/libvips/draw/draw_flood.c index 7f433677..800f3873 100644 --- a/libvips/draw/draw_flood.c +++ b/libvips/draw/draw_flood.c @@ -598,21 +598,21 @@ vips_draw_flood_class_init( VipsDrawFloodClass *class ) VIPS_ARG_INT( class, "top", 8, _( "Top" ), - _( "top edge of modified area" ), + _( "Top edge of modified area" ), VIPS_ARGUMENT_OPTIONAL_OUTPUT, G_STRUCT_OFFSET( VipsDrawFlood, top ), 0, 1000000000, 0 ); VIPS_ARG_INT( class, "width", 9, _( "Width" ), - _( "width of modified area" ), + _( "Width of modified area" ), VIPS_ARGUMENT_OPTIONAL_OUTPUT, G_STRUCT_OFFSET( VipsDrawFlood, width ), 0, 1000000000, 0 ); VIPS_ARG_INT( class, "height", 10, _( "Height" ), - _( "height of modified area" ), + _( "Height of modified area" ), VIPS_ARGUMENT_OPTIONAL_OUTPUT, G_STRUCT_OFFSET( VipsDrawFlood, height ), 0, 1000000000, 0 ); diff --git a/libvips/draw/draw_rect.c b/libvips/draw/draw_rect.c index ca75e146..59b9475c 100644 --- a/libvips/draw/draw_rect.c +++ b/libvips/draw/draw_rect.c @@ -177,21 +177,21 @@ vips_draw_rect_class_init( VipsDrawRectClass *class ) -1000000000, 1000000000, 0 ); VIPS_ARG_INT( class, "top", 7, - _( "top" ), + _( "Top" ), _( "Rect to fill" ), VIPS_ARGUMENT_REQUIRED_INPUT, G_STRUCT_OFFSET( VipsDrawRect, top ), -1000000000, 1000000000, 0 ); VIPS_ARG_INT( class, "width", 8, - _( "width" ), + _( "Width" ), _( "Rect to fill" ), VIPS_ARGUMENT_REQUIRED_INPUT, G_STRUCT_OFFSET( VipsDrawRect, width ), -1000000000, 1000000000, 0 ); VIPS_ARG_INT( class, "height", 9, - _( "height" ), + _( "Height" ), _( "Rect to fill" ), VIPS_ARGUMENT_REQUIRED_INPUT, G_STRUCT_OFFSET( VipsDrawRect, height ), diff --git a/libvips/draw/draw_smudge.c b/libvips/draw/draw_smudge.c index f3e1846c..17df6894 100644 --- a/libvips/draw/draw_smudge.c +++ b/libvips/draw/draw_smudge.c @@ -201,21 +201,21 @@ vips_draw_smudge_class_init( VipsDrawSmudgeClass *class ) -1000000000, 1000000000, 0 ); VIPS_ARG_INT( class, "top", 7, - _( "top" ), + _( "Top" ), _( "Rect to fill" ), VIPS_ARGUMENT_REQUIRED_INPUT, G_STRUCT_OFFSET( VipsDrawSmudge, top ), -1000000000, 1000000000, 0 ); VIPS_ARG_INT( class, "width", 8, - _( "width" ), + _( "Width" ), _( "Rect to fill" ), VIPS_ARGUMENT_REQUIRED_INPUT, G_STRUCT_OFFSET( VipsDrawSmudge, width ), -1000000000, 1000000000, 0 ); VIPS_ARG_INT( class, "height", 9, - _( "height" ), + _( "Height" ), _( "Rect to fill" ), VIPS_ARGUMENT_REQUIRED_INPUT, G_STRUCT_OFFSET( VipsDrawSmudge, height ), diff --git a/libvips/foreign/dzsave.c b/libvips/foreign/dzsave.c index e06b573a..3480f4fb 100644 --- a/libvips/foreign/dzsave.c +++ b/libvips/foreign/dzsave.c @@ -2534,7 +2534,7 @@ vips_foreign_save_dz_class_init( VipsForeignSaveDzClass *class ) VIPS_TYPE_FOREIGN_DZ_LAYOUT, VIPS_FOREIGN_DZ_LAYOUT_DZ ); VIPS_ARG_STRING( class, "suffix", 9, - _( "suffix" ), + _( "Suffix" ), _( "Filename suffix for tiles" ), VIPS_ARGUMENT_OPTIONAL_INPUT, G_STRUCT_OFFSET( VipsForeignSaveDz, suffix ), @@ -2685,7 +2685,7 @@ vips_foreign_save_dz_target_build( VipsObject *object ) VipsForeignSaveDzTarget *target = (VipsForeignSaveDzTarget *) object; dz->target = target->target; - g_object_ref( target->target ); + g_object_ref( dz->target ); if( VIPS_OBJECT_CLASS( vips_foreign_save_dz_target_parent_class )-> build( object ) ) @@ -2703,7 +2703,7 @@ vips_foreign_save_dz_target_class_init( VipsForeignSaveDzTargetClass *class ) gobject_class->set_property = vips_object_set_property; gobject_class->get_property = vips_object_get_property; - object_class->nickname = "dzsave"; + object_class->nickname = "dzsave_target"; object_class->description = _( "save image to deepzoom target" ); object_class->build = vips_foreign_save_dz_target_build; diff --git a/libvips/foreign/jxlsave.c b/libvips/foreign/jxlsave.c index e11a4800..c494e450 100644 --- a/libvips/foreign/jxlsave.c +++ b/libvips/foreign/jxlsave.c @@ -503,7 +503,7 @@ vips_foreign_save_jxl_class_init( VipsForeignSaveJxlClass *class ) 0, 15, 1.0 ); VIPS_ARG_INT( class, "effort", 12, - _( "effort" ), + _( "Effort" ), _( "Encoding effort" ), VIPS_ARGUMENT_OPTIONAL_INPUT, G_STRUCT_OFFSET( VipsForeignSaveJxl, effort ), diff --git a/libvips/foreign/magick6load.c b/libvips/foreign/magick6load.c index 77419814..903d18d7 100644 --- a/libvips/foreign/magick6load.c +++ b/libvips/foreign/magick6load.c @@ -131,7 +131,7 @@ vips_foreign_load_magick_class_init( VipsForeignLoadMagickClass *class ) load_class->get_flags = vips_foreign_load_magick_get_flags; VIPS_ARG_BOOL( class, "all_frames", 20, - _( "all_frames" ), + _( "All frames" ), _( "Read all frames from an image" ), VIPS_ARGUMENT_OPTIONAL_INPUT | VIPS_ARGUMENT_DEPRECATED, G_STRUCT_OFFSET( VipsForeignLoadMagick, all_frames ), diff --git a/libvips/foreign/magick7load.c b/libvips/foreign/magick7load.c index 0ece1ce6..0e275277 100644 --- a/libvips/foreign/magick7load.c +++ b/libvips/foreign/magick7load.c @@ -393,7 +393,7 @@ vips_foreign_load_magick7_class_init( VipsForeignLoadMagick7Class *class ) -1, 100000, 1 ); VIPS_ARG_BOOL( class, "all_frames", 23, - _( "all_frames" ), + _( "All frames" ), _( "Read all frames from an image" ), VIPS_ARGUMENT_OPTIONAL_INPUT | VIPS_ARGUMENT_DEPRECATED, G_STRUCT_OFFSET( VipsForeignLoadMagick7, all_frames ), diff --git a/libvips/foreign/ppmsave.c b/libvips/foreign/ppmsave.c index b409bcb4..7f09b27d 100644 --- a/libvips/foreign/ppmsave.c +++ b/libvips/foreign/ppmsave.c @@ -473,21 +473,21 @@ vips_foreign_save_ppm_class_init( VipsForeignSavePpmClass *class ) VIPS_ARG_BOOL( class, "ascii", 10, _( "ASCII" ), - _( "save as ascii" ), + _( "Save as ascii" ), VIPS_ARGUMENT_OPTIONAL_INPUT, G_STRUCT_OFFSET( VipsForeignSavePpm, ascii ), FALSE ); VIPS_ARG_INT( class, "bitdepth", 15, - _( "bitdepth" ), - _( "set to 1 to write as a 1 bit image" ), + _( "Bit depth" ), + _( "Set to 1 to write as a 1 bit image" ), VIPS_ARGUMENT_OPTIONAL_INPUT, G_STRUCT_OFFSET( VipsForeignSavePpm, bitdepth ), 0, 1, 0 ); VIPS_ARG_BOOL( class, "squash", 11, _( "Squash" ), - _( "save as one bit" ), + _( "Save as one bit" ), VIPS_ARGUMENT_OPTIONAL_INPUT | VIPS_ARGUMENT_DEPRECATED, G_STRUCT_OFFSET( VipsForeignSavePpm, squash ), FALSE ); diff --git a/libvips/foreign/tiffsave.c b/libvips/foreign/tiffsave.c index 453c00a3..0ce7c2b3 100644 --- a/libvips/foreign/tiffsave.c +++ b/libvips/foreign/tiffsave.c @@ -274,7 +274,7 @@ vips_foreign_save_tiff_class_init( VipsForeignSaveTiffClass *class ) 1, 100, 75 ); VIPS_ARG_ENUM( class, "predictor", 8, - _( "predictor" ), + _( "Predictor" ), _( "Compression prediction" ), VIPS_ARGUMENT_OPTIONAL_INPUT, G_STRUCT_OFFSET( VipsForeignSaveTiff, predictor ), @@ -282,7 +282,7 @@ vips_foreign_save_tiff_class_init( VipsForeignSaveTiffClass *class ) VIPS_FOREIGN_TIFF_PREDICTOR_HORIZONTAL ); VIPS_ARG_STRING( class, "profile", 9, - _( "profile" ), + _( "Profile" ), _( "ICC profile to embed" ), VIPS_ARGUMENT_OPTIONAL_INPUT, G_STRUCT_OFFSET( VipsForeignSaveTiff, profile ), @@ -324,7 +324,7 @@ vips_foreign_save_tiff_class_init( VipsForeignSaveTiffClass *class ) FALSE ); VIPS_ARG_INT( class, "bitdepth", 15, - _( "bitdepth" ), + _( "Bit depth" ), _( "Write as a 1, 2, 4 or 8 bit image" ), VIPS_ARGUMENT_OPTIONAL_INPUT, G_STRUCT_OFFSET( VipsForeignSaveTiff, bitdepth ), diff --git a/libvips/foreign/vips2magick.c b/libvips/foreign/vips2magick.c index beb81625..d121974f 100644 --- a/libvips/foreign/vips2magick.c +++ b/libvips/foreign/vips2magick.c @@ -511,8 +511,8 @@ vips_foreign_save_magick_class_init( VipsForeignSaveMagickClass *class ) FALSE ); VIPS_ARG_INT( class, "bitdepth", 6, - _( "Image bitdepth" ), - _( "Image bitdepth. Default is auto bitdepth." ), + _( "Bit depth" ), + _( "Number of bits per pixel" ), VIPS_ARGUMENT_OPTIONAL_INPUT, G_STRUCT_OFFSET( VipsForeignSaveMagick, bitdepth ), 0, 8, 0); diff --git a/libvips/foreign/webpsave.c b/libvips/foreign/webpsave.c index 1553e16a..13d60ddd 100644 --- a/libvips/foreign/webpsave.c +++ b/libvips/foreign/webpsave.c @@ -154,14 +154,14 @@ vips_foreign_save_webp_class_init( VipsForeignSaveWebpClass *class ) 0, 100, 75 ); VIPS_ARG_BOOL( class, "lossless", 11, - _( "lossless" ), - _( "enable lossless compression" ), + _( "Lossless" ), + _( "Enable lossless compression" ), VIPS_ARGUMENT_OPTIONAL_INPUT, G_STRUCT_OFFSET( VipsForeignSaveWebp, lossless ), FALSE ); VIPS_ARG_ENUM( class, "preset", 12, - _( "preset" ), + _( "Preset" ), _( "Preset for lossy compression" ), VIPS_ARGUMENT_OPTIONAL_INPUT, G_STRUCT_OFFSET( VipsForeignSaveWebp, preset ), diff --git a/libvips/freqfilt/freqfilt.c b/libvips/freqfilt/freqfilt.c index d40536e7..fa6d801e 100644 --- a/libvips/freqfilt/freqfilt.c +++ b/libvips/freqfilt/freqfilt.c @@ -95,7 +95,7 @@ vips_freqfilt_class_init( VipsFreqfiltClass *class ) vobject_class->build = vips_freqfilt_build; VIPS_ARG_IMAGE( class, "in", -1, - _( "in" ), + _( "Input" ), _( "Input image" ), VIPS_ARGUMENT_REQUIRED_INPUT, G_STRUCT_OFFSET( VipsFreqfilt, in ) ); diff --git a/libvips/freqfilt/freqmult.c b/libvips/freqfilt/freqmult.c index 685b923f..2556a37f 100644 --- a/libvips/freqfilt/freqmult.c +++ b/libvips/freqfilt/freqmult.c @@ -128,7 +128,7 @@ vips_freqmult_class_init( VipsFreqmultClass *class ) vobject_class->build = vips_freqmult_build; VIPS_ARG_IMAGE( class, "mask", 0, - _( "mask" ), + _( "Mask" ), _( "Input mask image" ), VIPS_ARGUMENT_REQUIRED_INPUT, G_STRUCT_OFFSET( VipsFreqmult, mask ) ); diff --git a/libvips/histogram/case.c b/libvips/histogram/case.c index bf29794a..46f91546 100644 --- a/libvips/histogram/case.c +++ b/libvips/histogram/case.c @@ -236,13 +236,13 @@ vips_case_class_init( VipsCaseClass *class ) operation_class->flags = VIPS_OPERATION_SEQUENTIAL; VIPS_ARG_IMAGE( class, "index", 1, - _( "index" ), + _( "Index" ), _( "Index image" ), VIPS_ARGUMENT_REQUIRED_INPUT, G_STRUCT_OFFSET( VipsCase, index ) ); VIPS_ARG_BOXED( class, "cases", 2, - _( "cases" ), + _( "Cases" ), _( "Array of case images" ), VIPS_ARGUMENT_REQUIRED_INPUT, G_STRUCT_OFFSET( VipsCase, cases ), diff --git a/libvips/histogram/maplut.c b/libvips/histogram/maplut.c index b9d04dbc..d72c7bd4 100644 --- a/libvips/histogram/maplut.c +++ b/libvips/histogram/maplut.c @@ -709,8 +709,8 @@ vips_maplut_class_init( VipsMaplutClass *class ) G_STRUCT_OFFSET( VipsMaplut, lut ) ); VIPS_ARG_INT( class, "band", 4, - _( "band" ), - _( "apply one-band lut to this band of in" ), + _( "Band" ), + _( "Apply one-band lut to this band of in" ), VIPS_ARGUMENT_OPTIONAL_INPUT, G_STRUCT_OFFSET( VipsMaplut, band ), -1, 10000, -1 ); diff --git a/libvips/iofuncs/sourceginput.c b/libvips/iofuncs/sourceginput.c index 860b958f..3c0d6f33 100644 --- a/libvips/iofuncs/sourceginput.c +++ b/libvips/iofuncs/sourceginput.c @@ -225,7 +225,7 @@ vips_source_g_input_stream_class_init( VipsSourceGInputStreamClass *class ) source_class->seek = vips_source_g_input_stream_seek; VIPS_ARG_OBJECT( class, "stream", 3, - _( "stream" ), + _( "Stream" ), _( "GInputStream to read from" ), VIPS_ARGUMENT_REQUIRED_INPUT, G_STRUCT_OFFSET( VipsSourceGInputStream, stream ), diff --git a/libvips/morphology/countlines.c b/libvips/morphology/countlines.c index 61bd2d1c..2e1f59fb 100644 --- a/libvips/morphology/countlines.c +++ b/libvips/morphology/countlines.c @@ -143,7 +143,7 @@ vips_countlines_class_init( VipsCountlinesClass *class ) 0, 10000000, 0.0 ); VIPS_ARG_ENUM( class, "direction", 3, - _( "direction" ), + _( "Direction" ), _( "Countlines left-right or up-down" ), VIPS_ARGUMENT_REQUIRED_INPUT, G_STRUCT_OFFSET( VipsCountlines, direction ), diff --git a/libvips/morphology/rank.c b/libvips/morphology/rank.c index bcbaec18..f1e4ee05 100644 --- a/libvips/morphology/rank.c +++ b/libvips/morphology/rank.c @@ -561,7 +561,7 @@ vips_rank_class_init( VipsRankClass *class ) 1, 100000, 11 ); VIPS_ARG_INT( class, "index", 6, - _( "index" ), + _( "Index" ), _( "Select pixel at index" ), VIPS_ARGUMENT_REQUIRED_INPUT, G_STRUCT_OFFSET( VipsRank, index ), diff --git a/libvips/mosaicing/global_balance.c b/libvips/mosaicing/global_balance.c index b3a8c37f..86a90508 100644 --- a/libvips/mosaicing/global_balance.c +++ b/libvips/mosaicing/global_balance.c @@ -1926,7 +1926,7 @@ vips_globalbalance_class_init( VipsGlobalbalanceClass *class ) G_STRUCT_OFFSET( VipsGlobalbalance, out ) ); VIPS_ARG_DOUBLE( class, "gamma", 5, - _( "gamma" ), + _( "Gamma" ), _( "Image gamma" ), VIPS_ARGUMENT_OPTIONAL_INPUT, G_STRUCT_OFFSET( VipsGlobalbalance, gamma ), diff --git a/libvips/mosaicing/match.c b/libvips/mosaicing/match.c index abb6d59a..8bc6538f 100644 --- a/libvips/mosaicing/match.c +++ b/libvips/mosaicing/match.c @@ -281,7 +281,7 @@ vips_match_class_init( VipsMatchClass *class ) 0, 1000000000, 1 ); VIPS_ARG_BOOL( class, "search", 15, - _( "search" ), + _( "Search" ), _( "Search to improve tie-points" ), VIPS_ARGUMENT_OPTIONAL_INPUT, G_STRUCT_OFFSET( VipsMatch, search ), diff --git a/libvips/mosaicing/mosaic1.c b/libvips/mosaicing/mosaic1.c index 70f960e7..48905ff5 100644 --- a/libvips/mosaicing/mosaic1.c +++ b/libvips/mosaicing/mosaic1.c @@ -589,7 +589,7 @@ vips_mosaic1_class_init( VipsMosaic1Class *class ) 0, 1000000000, 15 ); VIPS_ARG_BOOL( class, "search", 15, - _( "search" ), + _( "Search" ), _( "Search to improve tie-points" ), VIPS_ARGUMENT_OPTIONAL_INPUT, G_STRUCT_OFFSET( VipsMosaic1, search ), diff --git a/libvips/resample/thumbnail.c b/libvips/resample/thumbnail.c index 0c96f1a0..c6aca815 100644 --- a/libvips/resample/thumbnail.c +++ b/libvips/resample/thumbnail.c @@ -972,7 +972,7 @@ vips_thumbnail_class_init( VipsThumbnailClass *class ) 1, VIPS_MAX_COORD, 1 ); VIPS_ARG_ENUM( class, "size", 114, - _( "size" ), + _( "Size" ), _( "Only upsize, only downsize, or both" ), VIPS_ARGUMENT_OPTIONAL_INPUT, G_STRUCT_OFFSET( VipsThumbnail, size ),