diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 139ab54..5db66e0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,7 @@ jobs: pull-requests: write env: CGO_CFLAGS_ALLOW: -Xpreprocessor - VIPS_VERSION: 8.17.3 + VIPS_VERSION: 8.16.1 V: 5 steps: diff --git a/vips/callback.go b/vips/callback.go index ef21bb2..8510c33 100644 --- a/vips/callback.go +++ b/vips/callback.go @@ -1,4 +1,4 @@ -// Code generated by github.com/cshum/vipsgen from libvips 8.17.3; DO NOT EDIT. +// Code generated by github.com/cshum/vipsgen from libvips 8.16.1; DO NOT EDIT. package vips diff --git a/vips/connection.c b/vips/connection.c index abdf1f6..c449a9f 100644 --- a/vips/connection.c +++ b/vips/connection.c @@ -1,4 +1,4 @@ -// Code generated by github.com/cshum/vipsgen from libvips 8.17.3; DO NOT EDIT. +// Code generated by github.com/cshum/vipsgen from libvips 8.16.1; DO NOT EDIT. #include "connection.h" diff --git a/vips/connection.go b/vips/connection.go index aaac522..7dead27 100644 --- a/vips/connection.go +++ b/vips/connection.go @@ -1,4 +1,4 @@ -// Code generated by github.com/cshum/vipsgen from libvips 8.17.3; DO NOT EDIT. +// Code generated by github.com/cshum/vipsgen from libvips 8.16.1; DO NOT EDIT. package vips diff --git a/vips/connection.h b/vips/connection.h index 6e4884e..abdf2ef 100644 --- a/vips/connection.h +++ b/vips/connection.h @@ -1,4 +1,4 @@ -// Code generated by github.com/cshum/vipsgen from libvips 8.17.3; DO NOT EDIT. +// Code generated by github.com/cshum/vipsgen from libvips 8.16.1; DO NOT EDIT. #include #include diff --git a/vips/image.go b/vips/image.go index b40af7b..c776bed 100644 --- a/vips/image.go +++ b/vips/image.go @@ -1,4 +1,4 @@ -// Code generated by github.com/cshum/vipsgen from libvips 8.17.3; DO NOT EDIT. +// Code generated by github.com/cshum/vipsgen from libvips 8.16.1; DO NOT EDIT. package vips @@ -249,7 +249,6 @@ type CsvloadOptions struct { // DefaultCsvloadOptions creates default value for vips_csvload optional arguments func DefaultCsvloadOptions() *CsvloadOptions { return &CsvloadOptions{ - Lines: -1, Whitespace: " ", Separator: ";,\t", } @@ -297,7 +296,6 @@ type CsvloadSourceOptions struct { // DefaultCsvloadSourceOptions creates default value for vips_csvload_source optional arguments func DefaultCsvloadSourceOptions() *CsvloadSourceOptions { return &CsvloadSourceOptions{ - Lines: -1, Whitespace: " ", Separator: ";,\t", } @@ -818,8 +816,6 @@ func NewIdentity(options *IdentityOptions) (*Image, error) { type Jp2kloadOptions struct { // Page Load this page from the image Page int - // Oneshot Load images a frame at a time - Oneshot bool // Memory Force open via memory Memory bool // Access Required access pattern for this file @@ -842,7 +838,7 @@ func DefaultJp2kloadOptions() *Jp2kloadOptions { func NewJp2kload(filename string, options *Jp2kloadOptions) (*Image, error) { Startup(nil) if options != nil { - vipsImage, err := vipsgenJp2kloadWithOptions(filename, options.Page, options.Oneshot, options.Memory, options.Access, options.FailOn, options.Revalidate) + vipsImage, err := vipsgenJp2kloadWithOptions(filename, options.Page, options.Memory, options.Access, options.FailOn, options.Revalidate) if err != nil { return nil, err } @@ -859,8 +855,6 @@ func NewJp2kload(filename string, options *Jp2kloadOptions) (*Image, error) { type Jp2kloadBufferOptions struct { // Page Load this page from the image Page int - // Oneshot Load images a frame at a time - Oneshot bool // Memory Force open via memory Memory bool // Access Required access pattern for this file @@ -884,7 +878,7 @@ func NewJp2kloadBuffer(buf []byte, options *Jp2kloadBufferOptions) (*Image, erro return nil, fmt.Errorf("jp2kload_buffer: buffer is empty") } if options != nil { - vipsImage, err := vipsgenJp2kloadBufferWithOptions(buf, options.Page, options.Oneshot, options.Memory, options.Access, options.FailOn, options.Revalidate) + vipsImage, err := vipsgenJp2kloadBufferWithOptions(buf, options.Page, options.Memory, options.Access, options.FailOn, options.Revalidate) if err != nil { return nil, err } @@ -901,8 +895,6 @@ func NewJp2kloadBuffer(buf []byte, options *Jp2kloadBufferOptions) (*Image, erro type Jp2kloadSourceOptions struct { // Page Load this page from the image Page int - // Oneshot Load images a frame at a time - Oneshot bool // Memory Force open via memory Memory bool // Access Required access pattern for this file @@ -925,7 +917,7 @@ func DefaultJp2kloadSourceOptions() *Jp2kloadSourceOptions { func NewJp2kloadSource(source *Source, options *Jp2kloadSourceOptions) (*Image, error) { Startup(nil) if options != nil { - vipsImage, err := vipsgenJp2kloadSourceWithOptions(source.src, options.Page, options.Oneshot, options.Memory, options.Access, options.FailOn, options.Revalidate) + vipsImage, err := vipsgenJp2kloadSourceWithOptions(source.src, options.Page, options.Memory, options.Access, options.FailOn, options.Revalidate) if err != nil { return nil, err } @@ -2394,44 +2386,6 @@ func NewPpmload(filename string, options *PpmloadOptions) (*Image, error) { return newImageRef(vipsImage, ImageTypePpm, nil), nil } -// PpmloadBufferOptions optional arguments for vips_ppmload_buffer -type PpmloadBufferOptions struct { - // Memory Force open via memory - Memory bool - // Access Required access pattern for this file - Access Access - // FailOn Error level to fail on - FailOn FailOn - // Revalidate Don't use a cached result for this operation - Revalidate bool -} - -// DefaultPpmloadBufferOptions creates default value for vips_ppmload_buffer optional arguments -func DefaultPpmloadBufferOptions() *PpmloadBufferOptions { - return &PpmloadBufferOptions{ - } -} - -// NewPpmloadBuffer vips_ppmload_buffer load ppm from buffer -func NewPpmloadBuffer(buf []byte, options *PpmloadBufferOptions) (*Image, error) { - Startup(nil) - if len(buf) == 0 { - return nil, fmt.Errorf("ppmload_buffer: buffer is empty") - } - if options != nil { - vipsImage, err := vipsgenPpmloadBufferWithOptions(buf, options.Memory, options.Access, options.FailOn, options.Revalidate) - if err != nil { - return nil, err - } - return newImageRef(vipsImage, ImageTypePpm, buf), nil - } - vipsImage, err := vipsgenPpmloadBuffer(buf) - if err != nil { - return nil, err - } - return newImageRef(vipsImage, ImageTypePpm, buf), nil -} - // PpmloadSourceOptions optional arguments for vips_ppmload_source type PpmloadSourceOptions struct { // Memory Force open via memory @@ -2450,7 +2404,7 @@ func DefaultPpmloadSourceOptions() *PpmloadSourceOptions { } } -// NewPpmloadSource vips_ppmload_source load ppm from source +// NewPpmloadSource vips_ppmload_source load ppm base class // // The source specifies source to load from. func NewPpmloadSource(source *Source, options *PpmloadSourceOptions) (*Image, error) { @@ -2726,10 +2680,6 @@ type SvgloadOptions struct { Scale float64 // Unlimited Allow SVG of any size Unlimited bool - // Stylesheet Custom CSS - Stylesheet string - // HighBitdepth Enable scRGB 128-bit output (32-bit per channel) - HighBitdepth bool // Memory Force open via memory Memory bool // Access Required access pattern for this file @@ -2754,7 +2704,7 @@ func DefaultSvgloadOptions() *SvgloadOptions { func NewSvgload(filename string, options *SvgloadOptions) (*Image, error) { Startup(nil) if options != nil { - vipsImage, err := vipsgenSvgloadWithOptions(filename, options.Dpi, options.Scale, options.Unlimited, options.Stylesheet, options.HighBitdepth, options.Memory, options.Access, options.FailOn, options.Revalidate) + vipsImage, err := vipsgenSvgloadWithOptions(filename, options.Dpi, options.Scale, options.Unlimited, options.Memory, options.Access, options.FailOn, options.Revalidate) if err != nil { return nil, err } @@ -2775,10 +2725,6 @@ type SvgloadBufferOptions struct { Scale float64 // Unlimited Allow SVG of any size Unlimited bool - // Stylesheet Custom CSS - Stylesheet string - // HighBitdepth Enable scRGB 128-bit output (32-bit per channel) - HighBitdepth bool // Memory Force open via memory Memory bool // Access Required access pattern for this file @@ -2804,7 +2750,7 @@ func NewSvgloadBuffer(buf []byte, options *SvgloadBufferOptions) (*Image, error) return nil, fmt.Errorf("svgload_buffer: buffer is empty") } if options != nil { - vipsImage, err := vipsgenSvgloadBufferWithOptions(buf, options.Dpi, options.Scale, options.Unlimited, options.Stylesheet, options.HighBitdepth, options.Memory, options.Access, options.FailOn, options.Revalidate) + vipsImage, err := vipsgenSvgloadBufferWithOptions(buf, options.Dpi, options.Scale, options.Unlimited, options.Memory, options.Access, options.FailOn, options.Revalidate) if err != nil { return nil, err } @@ -2825,10 +2771,6 @@ type SvgloadSourceOptions struct { Scale float64 // Unlimited Allow SVG of any size Unlimited bool - // Stylesheet Custom CSS - Stylesheet string - // HighBitdepth Enable scRGB 128-bit output (32-bit per channel) - HighBitdepth bool // Memory Force open via memory Memory bool // Access Required access pattern for this file @@ -2853,7 +2795,7 @@ func DefaultSvgloadSourceOptions() *SvgloadSourceOptions { func NewSvgloadSource(source *Source, options *SvgloadSourceOptions) (*Image, error) { Startup(nil) if options != nil { - vipsImage, err := vipsgenSvgloadSourceWithOptions(source.src, options.Dpi, options.Scale, options.Unlimited, options.Stylesheet, options.HighBitdepth, options.Memory, options.Access, options.FailOn, options.Revalidate) + vipsImage, err := vipsgenSvgloadSourceWithOptions(source.src, options.Dpi, options.Scale, options.Unlimited, options.Memory, options.Access, options.FailOn, options.Revalidate) if err != nil { return nil, err } @@ -2978,10 +2920,10 @@ type ThumbnailOptions struct { Crop Interesting // Linear Reduce in linear light Linear bool - // InputProfile Fallback input profile - InputProfile string - // OutputProfile Fallback output profile - OutputProfile string + // ImportProfile Fallback import profile + ImportProfile string + // ExportProfile Fallback export profile + ExportProfile string // Intent Rendering intent Intent Intent // FailOn Error level to fail on @@ -3003,7 +2945,7 @@ func DefaultThumbnailOptions() *ThumbnailOptions { func NewThumbnail(filename string, width int, options *ThumbnailOptions) (*Image, error) { Startup(nil) if options != nil { - vipsImage, err := vipsgenThumbnailWithOptions(filename, width, options.Height, options.Size, options.NoRotate, options.Crop, options.Linear, options.InputProfile, options.OutputProfile, options.Intent, options.FailOn) + vipsImage, err := vipsgenThumbnailWithOptions(filename, width, options.Height, options.Size, options.NoRotate, options.Crop, options.Linear, options.ImportProfile, options.ExportProfile, options.Intent, options.FailOn) if err != nil { return nil, err } @@ -3030,10 +2972,10 @@ type ThumbnailBufferOptions struct { Crop Interesting // Linear Reduce in linear light Linear bool - // InputProfile Fallback input profile - InputProfile string - // OutputProfile Fallback output profile - OutputProfile string + // ImportProfile Fallback import profile + ImportProfile string + // ExportProfile Fallback export profile + ExportProfile string // Intent Rendering intent Intent Intent // FailOn Error level to fail on @@ -3057,7 +2999,7 @@ func NewThumbnailBuffer(buf []byte, width int, options *ThumbnailBufferOptions) return nil, fmt.Errorf("thumbnail_buffer: buffer is empty") } if options != nil { - vipsImage, err := vipsgenThumbnailBufferWithOptions(buf, width, options.OptionString, options.Height, options.Size, options.NoRotate, options.Crop, options.Linear, options.InputProfile, options.OutputProfile, options.Intent, options.FailOn) + vipsImage, err := vipsgenThumbnailBufferWithOptions(buf, width, options.OptionString, options.Height, options.Size, options.NoRotate, options.Crop, options.Linear, options.ImportProfile, options.ExportProfile, options.Intent, options.FailOn) if err != nil { return nil, err } @@ -3084,10 +3026,10 @@ type ThumbnailSourceOptions struct { Crop Interesting // Linear Reduce in linear light Linear bool - // InputProfile Fallback input profile - InputProfile string - // OutputProfile Fallback output profile - OutputProfile string + // ImportProfile Fallback import profile + ImportProfile string + // ExportProfile Fallback export profile + ExportProfile string // Intent Rendering intent Intent Intent // FailOn Error level to fail on @@ -3109,7 +3051,7 @@ func DefaultThumbnailSourceOptions() *ThumbnailSourceOptions { func NewThumbnailSource(source *Source, width int, options *ThumbnailSourceOptions) (*Image, error) { Startup(nil) if options != nil { - vipsImage, err := vipsgenThumbnailSourceWithOptions(source.src, width, options.OptionString, options.Height, options.Size, options.NoRotate, options.Crop, options.Linear, options.InputProfile, options.OutputProfile, options.Intent, options.FailOn) + vipsImage, err := vipsgenThumbnailSourceWithOptions(source.src, width, options.OptionString, options.Height, options.Size, options.NoRotate, options.Crop, options.Linear, options.ImportProfile, options.ExportProfile, options.Intent, options.FailOn) if err != nil { return nil, err } @@ -3126,14 +3068,12 @@ func NewThumbnailSource(source *Source, width int, options *ThumbnailSourceOptio type TiffloadOptions struct { // Page First page to load Page int + // Subifd Subifd index + Subifd int // N Number of pages to load, -1 for all N int // Autorotate Rotate image using orientation tag Autorotate bool - // Subifd Subifd index - Subifd int - // Unlimited Remove all denial of service limits - Unlimited bool // Memory Force open via memory Memory bool // Access Required access pattern for this file @@ -3147,8 +3087,8 @@ type TiffloadOptions struct { // DefaultTiffloadOptions creates default value for vips_tiffload optional arguments func DefaultTiffloadOptions() *TiffloadOptions { return &TiffloadOptions{ - N: 1, Subifd: -1, + N: 1, } } @@ -3158,7 +3098,7 @@ func DefaultTiffloadOptions() *TiffloadOptions { func NewTiffload(filename string, options *TiffloadOptions) (*Image, error) { Startup(nil) if options != nil { - vipsImage, err := vipsgenTiffloadWithOptions(filename, options.Page, options.N, options.Autorotate, options.Subifd, options.Unlimited, options.Memory, options.Access, options.FailOn, options.Revalidate) + vipsImage, err := vipsgenTiffloadWithOptions(filename, options.Page, options.Subifd, options.N, options.Autorotate, options.Memory, options.Access, options.FailOn, options.Revalidate) if err != nil { return nil, err } @@ -3175,14 +3115,12 @@ func NewTiffload(filename string, options *TiffloadOptions) (*Image, error) { type TiffloadBufferOptions struct { // Page First page to load Page int + // Subifd Subifd index + Subifd int // N Number of pages to load, -1 for all N int // Autorotate Rotate image using orientation tag Autorotate bool - // Subifd Subifd index - Subifd int - // Unlimited Remove all denial of service limits - Unlimited bool // Memory Force open via memory Memory bool // Access Required access pattern for this file @@ -3196,8 +3134,8 @@ type TiffloadBufferOptions struct { // DefaultTiffloadBufferOptions creates default value for vips_tiffload_buffer optional arguments func DefaultTiffloadBufferOptions() *TiffloadBufferOptions { return &TiffloadBufferOptions{ - N: 1, Subifd: -1, + N: 1, } } @@ -3208,7 +3146,7 @@ func NewTiffloadBuffer(buf []byte, options *TiffloadBufferOptions) (*Image, erro return nil, fmt.Errorf("tiffload_buffer: buffer is empty") } if options != nil { - vipsImage, err := vipsgenTiffloadBufferWithOptions(buf, options.Page, options.N, options.Autorotate, options.Subifd, options.Unlimited, options.Memory, options.Access, options.FailOn, options.Revalidate) + vipsImage, err := vipsgenTiffloadBufferWithOptions(buf, options.Page, options.Subifd, options.N, options.Autorotate, options.Memory, options.Access, options.FailOn, options.Revalidate) if err != nil { return nil, err } @@ -3225,14 +3163,12 @@ func NewTiffloadBuffer(buf []byte, options *TiffloadBufferOptions) (*Image, erro type TiffloadSourceOptions struct { // Page First page to load Page int + // Subifd Subifd index + Subifd int // N Number of pages to load, -1 for all N int // Autorotate Rotate image using orientation tag Autorotate bool - // Subifd Subifd index - Subifd int - // Unlimited Remove all denial of service limits - Unlimited bool // Memory Force open via memory Memory bool // Access Required access pattern for this file @@ -3246,8 +3182,8 @@ type TiffloadSourceOptions struct { // DefaultTiffloadSourceOptions creates default value for vips_tiffload_source optional arguments func DefaultTiffloadSourceOptions() *TiffloadSourceOptions { return &TiffloadSourceOptions{ - N: 1, Subifd: -1, + N: 1, } } @@ -3257,7 +3193,7 @@ func DefaultTiffloadSourceOptions() *TiffloadSourceOptions { func NewTiffloadSource(source *Source, options *TiffloadSourceOptions) (*Image, error) { Startup(nil) if options != nil { - vipsImage, err := vipsgenTiffloadSourceWithOptions(source.src, options.Page, options.N, options.Autorotate, options.Subifd, options.Unlimited, options.Memory, options.Access, options.FailOn, options.Revalidate) + vipsImage, err := vipsgenTiffloadSourceWithOptions(source.src, options.Page, options.Subifd, options.N, options.Autorotate, options.Memory, options.Access, options.FailOn, options.Revalidate) if err != nil { return nil, err } @@ -4252,7 +4188,6 @@ type ClampOptions struct { // DefaultClampOptions creates default value for vips_clamp optional arguments func DefaultClampOptions() *ClampOptions { return &ClampOptions{ - Max: 1, } } @@ -5495,7 +5430,7 @@ type GammaOptions struct { // DefaultGammaOptions creates default value for vips_gamma optional arguments func DefaultGammaOptions() *GammaOptions { return &GammaOptions{ - Exponent: 0.4166666666666667, + Exponent: 2.4, } } @@ -5599,8 +5534,6 @@ type GifsaveOptions struct { InterpaletteMaxerror float64 // Interlace Generate an interlaced (progressive) GIF Interlace bool - // KeepDuplicateFrames Keep duplicate frames in the output instead of combining them - KeepDuplicateFrames bool // Keep Which metadata to retain Keep Keep // Background Background value @@ -5626,7 +5559,7 @@ func DefaultGifsaveOptions() *GifsaveOptions { // The filename specifies filename to save to. func (r *Image) Gifsave(filename string, options *GifsaveOptions) (error) { if options != nil { - err := vipsgenGifsaveWithOptions(r.image, filename, options.Dither, options.Effort, options.Bitdepth, options.InterframeMaxerror, options.Reuse, options.InterpaletteMaxerror, options.Interlace, options.KeepDuplicateFrames, options.Keep, options.Background, options.PageHeight, options.Profile) + err := vipsgenGifsaveWithOptions(r.image, filename, options.Dither, options.Effort, options.Bitdepth, options.InterframeMaxerror, options.Reuse, options.InterpaletteMaxerror, options.Interlace, options.Keep, options.Background, options.PageHeight, options.Profile) if err != nil { return err } @@ -5655,8 +5588,6 @@ type GifsaveBufferOptions struct { InterpaletteMaxerror float64 // Interlace Generate an interlaced (progressive) GIF Interlace bool - // KeepDuplicateFrames Keep duplicate frames in the output instead of combining them - KeepDuplicateFrames bool // Keep Which metadata to retain Keep Keep // Background Background value @@ -5680,7 +5611,7 @@ func DefaultGifsaveBufferOptions() *GifsaveBufferOptions { // GifsaveBuffer vips_gifsave_buffer save as gif func (r *Image) GifsaveBuffer(options *GifsaveBufferOptions) ([]byte, error) { if options != nil { - buf, err := vipsgenGifsaveBufferWithOptions(r.image, options.Dither, options.Effort, options.Bitdepth, options.InterframeMaxerror, options.Reuse, options.InterpaletteMaxerror, options.Interlace, options.KeepDuplicateFrames, options.Keep, options.Background, options.PageHeight, options.Profile) + buf, err := vipsgenGifsaveBufferWithOptions(r.image, options.Dither, options.Effort, options.Bitdepth, options.InterframeMaxerror, options.Reuse, options.InterpaletteMaxerror, options.Interlace, options.Keep, options.Background, options.PageHeight, options.Profile) if err != nil { return nil, err } @@ -5709,8 +5640,6 @@ type GifsaveTargetOptions struct { InterpaletteMaxerror float64 // Interlace Generate an interlaced (progressive) GIF Interlace bool - // KeepDuplicateFrames Keep duplicate frames in the output instead of combining them - KeepDuplicateFrames bool // Keep Which metadata to retain Keep Keep // Background Background value @@ -5736,7 +5665,7 @@ func DefaultGifsaveTargetOptions() *GifsaveTargetOptions { // The target specifies target to save to. func (r *Image) GifsaveTarget(target *Target, options *GifsaveTargetOptions) (error) { if options != nil { - err := vipsgenGifsaveTargetWithOptions(r.image, target.target, options.Dither, options.Effort, options.Bitdepth, options.InterframeMaxerror, options.Reuse, options.InterpaletteMaxerror, options.Interlace, options.KeepDuplicateFrames, options.Keep, options.Background, options.PageHeight, options.Profile) + err := vipsgenGifsaveTargetWithOptions(r.image, target.target, options.Dither, options.Effort, options.Bitdepth, options.InterframeMaxerror, options.Reuse, options.InterpaletteMaxerror, options.Interlace, options.Keep, options.Background, options.PageHeight, options.Profile) if err != nil { return err } @@ -6231,7 +6160,7 @@ type HoughCircleOptions struct { // DefaultHoughCircleOptions creates default value for vips_hough_circle optional arguments func DefaultHoughCircleOptions() *HoughCircleOptions { return &HoughCircleOptions{ - Scale: 1, + Scale: 3, MinRadius: 10, MaxRadius: 20, } @@ -7325,8 +7254,8 @@ type MatchOptions struct { // DefaultMatchOptions creates default value for vips_match optional arguments func DefaultMatchOptions() *MatchOptions { return &MatchOptions{ - Hwindow: 5, - Harea: 15, + Hwindow: 1, + Harea: 1, } } @@ -7400,7 +7329,7 @@ func (r *Image) Math2Const(math2 OperationMath2, c []float64) (error) { } -// Matrixinvert vips_matrixinvert invert a matrix +// Matrixinvert vips_matrixinvert invert an matrix func (r *Image) Matrixinvert() (error) { out, err := vipsgenMatrixinvert(r.image) if err != nil { @@ -7410,19 +7339,6 @@ func (r *Image) Matrixinvert() (error) { return nil } - -// Matrixmultiply vips_matrixmultiply multiply two matrices -// -// The right specifies second matrix to multiply. -func (r *Image) Matrixmultiply(right *Image) (error) { - out, err := vipsgenMatrixmultiply(r.image, right.image) - if err != nil { - return err - } - r.setImage(out) - return nil -} - // MatrixprintOptions optional arguments for vips_matrixprint type MatrixprintOptions struct { // Keep Which metadata to retain @@ -7542,7 +7458,7 @@ type MaxOptions struct { // DefaultMaxOptions creates default value for vips_max optional arguments func DefaultMaxOptions() *MaxOptions { return &MaxOptions{ - Size: 1, + Size: 10, } } @@ -7665,7 +7581,7 @@ type MinOptions struct { // DefaultMinOptions creates default value for vips_min optional arguments func DefaultMinOptions() *MinOptions { return &MinOptions{ - Size: 1, + Size: 10, } } @@ -7831,7 +7747,6 @@ type MsbOptions struct { // DefaultMsbOptions creates default value for vips_msb optional arguments func DefaultMsbOptions() *MsbOptions { return &MsbOptions{ - Band: -1, } } @@ -8692,20 +8607,6 @@ func (r *Image) RemainderConst(c []float64) (error) { } -// Remosaic vips_remosaic rebuild an mosaiced image -// -// The oldStr specifies search for this string. -// The newStr specifies and swap for this string. -func (r *Image) Remosaic(oldStr string, newStr string) (error) { - out, err := vipsgenRemosaic(r.image, oldStr, newStr) - if err != nil { - return err - } - r.setImage(out) - return nil -} - - // Replicate vips_replicate replicate an image // // The across specifies repeat this many times horizontally. @@ -8933,7 +8834,7 @@ func DefaultScRGB2sRGBOptions() *ScRGB2sRGBOptions { } } -// ScRGB2sRGB vips_scRGB2sRGB convert scRGB to sRGB +// ScRGB2sRGB vips_scRGB2sRGB convert an scRGB image to sRGB func (r *Image) ScRGB2sRGB(options *ScRGB2sRGBOptions) (error) { if options != nil { out, err := vipsgenScRGB2sRGBWithOptions(r.image, options.Depth) @@ -9411,10 +9312,10 @@ type ThumbnailImageOptions struct { Crop Interesting // Linear Reduce in linear light Linear bool - // InputProfile Fallback input profile - InputProfile string - // OutputProfile Fallback output profile - OutputProfile string + // ImportProfile Fallback import profile + ImportProfile string + // ExportProfile Fallback export profile + ExportProfile string // Intent Rendering intent Intent Intent // FailOn Error level to fail on @@ -9434,7 +9335,7 @@ func DefaultThumbnailImageOptions() *ThumbnailImageOptions { // The width specifies size to this width. func (r *Image) ThumbnailImage(width int, options *ThumbnailImageOptions) (error) { if options != nil { - out, err := vipsgenThumbnailImageWithOptions(r.image, width, options.Height, options.Size, options.NoRotate, options.Crop, options.Linear, options.InputProfile, options.OutputProfile, options.Intent, options.FailOn) + out, err := vipsgenThumbnailImageWithOptions(r.image, width, options.Height, options.Size, options.NoRotate, options.Crop, options.Linear, options.ImportProfile, options.ExportProfile, options.Intent, options.FailOn) if err != nil { return err } @@ -9510,6 +9411,7 @@ func DefaultTiffsaveOptions() *TiffsaveOptions { TileHeight: 128, Xres: 1, Yres: 1, + Level: 6, Depth: DzDepth(1), } } @@ -9593,6 +9495,7 @@ func DefaultTiffsaveBufferOptions() *TiffsaveBufferOptions { TileHeight: 128, Xres: 1, Yres: 1, + Level: 6, Depth: DzDepth(1), } } @@ -9674,6 +9577,7 @@ func DefaultTiffsaveTargetOptions() *TiffsaveTargetOptions { TileHeight: 128, Xres: 1, Yres: 1, + Level: 6, Depth: DzDepth(1), } } diff --git a/vips/types.go b/vips/types.go index 23b0be1..97e23a1 100644 --- a/vips/types.go +++ b/vips/types.go @@ -1,4 +1,4 @@ -// Code generated by github.com/cshum/vipsgen from libvips 8.17.3; DO NOT EDIT. +// Code generated by github.com/cshum/vipsgen from libvips 8.16.1; DO NOT EDIT. package vips @@ -415,7 +415,6 @@ const ( IntentRelative Intent = C.VIPS_INTENT_RELATIVE IntentSaturation Intent = C.VIPS_INTENT_SATURATION IntentAbsolute Intent = C.VIPS_INTENT_ABSOLUTE - IntentAuto Intent = C.VIPS_INTENT_AUTO IntentLast Intent = C.VIPS_INTENT_LAST ) @@ -473,8 +472,6 @@ const ( KernelMitchell Kernel = C.VIPS_KERNEL_MITCHELL KernelLanczos2 Kernel = C.VIPS_KERNEL_LANCZOS2 KernelLanczos3 Kernel = C.VIPS_KERNEL_LANCZOS3 - KernelMks2013 Kernel = C.VIPS_KERNEL_MKS2013 - KernelMks2021 Kernel = C.VIPS_KERNEL_MKS2021 KernelLast Kernel = C.VIPS_KERNEL_LAST ) diff --git a/vips/util.c b/vips/util.c index a5a0afb..1c1f7f3 100644 --- a/vips/util.c +++ b/vips/util.c @@ -1,4 +1,4 @@ -// Code generated by github.com/cshum/vipsgen from libvips 8.17.3; DO NOT EDIT. +// Code generated by github.com/cshum/vipsgen from libvips 8.16.1; DO NOT EDIT. #include "util.h" diff --git a/vips/util.go b/vips/util.go index 478ef07..095aca6 100644 --- a/vips/util.go +++ b/vips/util.go @@ -1,4 +1,4 @@ -// Code generated by github.com/cshum/vipsgen from libvips 8.17.3; DO NOT EDIT. +// Code generated by github.com/cshum/vipsgen from libvips 8.16.1; DO NOT EDIT. package vips diff --git a/vips/util.h b/vips/util.h index 020d007..1ee211d 100644 --- a/vips/util.h +++ b/vips/util.h @@ -1,4 +1,4 @@ -// Code generated by github.com/cshum/vipsgen from libvips 8.17.3; DO NOT EDIT. +// Code generated by github.com/cshum/vipsgen from libvips 8.16.1; DO NOT EDIT. // clang-format off // include order matters diff --git a/vips/vips.c b/vips/vips.c index b281baf..4d99254 100644 --- a/vips/vips.c +++ b/vips/vips.c @@ -1,4 +1,4 @@ -// Code generated by github.com/cshum/vipsgen from libvips 8.17.3; DO NOT EDIT. +// Code generated by github.com/cshum/vipsgen from libvips 8.16.1; DO NOT EDIT. #include "vips.h" #include @@ -1479,7 +1479,7 @@ int vipsgen_gifsave(VipsImage* in, const char* filename) { return vips_gifsave(in, filename, NULL); } -int vipsgen_gifsave_with_options(VipsImage* in, const char* filename, double dither, gint effort, gint bitdepth, double interframe_maxerror, gboolean reuse, double interpalette_maxerror, gboolean interlace, gboolean keep_duplicate_frames, VipsForeignKeep keep, double* background, int background_n, gint page_height, const char* profile) { +int vipsgen_gifsave_with_options(VipsImage* in, const char* filename, double dither, gint effort, gint bitdepth, double interframe_maxerror, gboolean reuse, double interpalette_maxerror, gboolean interlace, VipsForeignKeep keep, double* background, int background_n, gint page_height, const char* profile) { VipsOperation *operation = vips_operation_new("gifsave"); if (!operation) return 1; VipsArrayDouble *background_array = NULL; @@ -1494,7 +1494,6 @@ int vipsgen_gifsave_with_options(VipsImage* in, const char* filename, double dit vipsgen_set_bool(operation, "reuse", reuse) || vipsgen_set_double(operation, "interpalette_maxerror", interpalette_maxerror) || vipsgen_set_bool(operation, "interlace", interlace) || - vipsgen_set_bool(operation, "keep_duplicate_frames", keep_duplicate_frames) || vipsgen_set_int(operation, "keep", keep) || vipsgen_set_array_double(operation, "background", background_array) || vipsgen_set_int(operation, "page_height", page_height) || @@ -1513,7 +1512,7 @@ int vipsgen_gifsave_buffer(VipsImage* in, void** buf, size_t* len) { return vips_gifsave_buffer(in, buf, len, NULL); } -int vipsgen_gifsave_buffer_with_options(VipsImage* in, void** buf, size_t* len, double dither, gint effort, gint bitdepth, double interframe_maxerror, gboolean reuse, double interpalette_maxerror, gboolean interlace, gboolean keep_duplicate_frames, VipsForeignKeep keep, double* background, int background_n, gint page_height, const char* profile) { +int vipsgen_gifsave_buffer_with_options(VipsImage* in, void** buf, size_t* len, double dither, gint effort, gint bitdepth, double interframe_maxerror, gboolean reuse, double interpalette_maxerror, gboolean interlace, VipsForeignKeep keep, double* background, int background_n, gint page_height, const char* profile) { VipsOperation *operation = vips_operation_new("gifsave_buffer"); if (!operation) return 1; VipsArrayDouble *background_array = NULL; @@ -1527,7 +1526,6 @@ int vipsgen_gifsave_buffer_with_options(VipsImage* in, void** buf, size_t* len, vipsgen_set_bool(operation, "reuse", reuse) || vipsgen_set_double(operation, "interpalette_maxerror", interpalette_maxerror) || vipsgen_set_bool(operation, "interlace", interlace) || - vipsgen_set_bool(operation, "keep_duplicate_frames", keep_duplicate_frames) || vipsgen_set_int(operation, "keep", keep) || vipsgen_set_array_double(operation, "background", background_array) || vipsgen_set_int(operation, "page_height", page_height) || @@ -1546,7 +1544,7 @@ int vipsgen_gifsave_target(VipsImage* in, VipsTargetCustom* target) { return vips_gifsave_target(in, (VipsTarget*) target, NULL); } -int vipsgen_gifsave_target_with_options(VipsImage* in, VipsTargetCustom* target, double dither, gint effort, gint bitdepth, double interframe_maxerror, gboolean reuse, double interpalette_maxerror, gboolean interlace, gboolean keep_duplicate_frames, VipsForeignKeep keep, double* background, int background_n, gint page_height, const char* profile) { +int vipsgen_gifsave_target_with_options(VipsImage* in, VipsTargetCustom* target, double dither, gint effort, gint bitdepth, double interframe_maxerror, gboolean reuse, double interpalette_maxerror, gboolean interlace, VipsForeignKeep keep, double* background, int background_n, gint page_height, const char* profile) { VipsOperation *operation = vips_operation_new("gifsave_target"); if (!operation) return 1; VipsArrayDouble *background_array = NULL; @@ -1561,7 +1559,6 @@ int vipsgen_gifsave_target_with_options(VipsImage* in, VipsTargetCustom* target, vipsgen_set_bool(operation, "reuse", reuse) || vipsgen_set_double(operation, "interpalette_maxerror", interpalette_maxerror) || vipsgen_set_bool(operation, "interlace", interlace) || - vipsgen_set_bool(operation, "keep_duplicate_frames", keep_duplicate_frames) || vipsgen_set_int(operation, "keep", keep) || vipsgen_set_array_double(operation, "background", background_array) || vipsgen_set_int(operation, "page_height", page_height) || @@ -2181,13 +2178,12 @@ int vipsgen_jp2kload(const char* filename, VipsImage** out) { return vips_jp2kload(filename, out, NULL); } -int vipsgen_jp2kload_with_options(const char* filename, VipsImage** out, gint page, gboolean oneshot, gboolean memory, VipsAccess access, VipsFailOn fail_on, gboolean revalidate) { +int vipsgen_jp2kload_with_options(const char* filename, VipsImage** out, gint page, gboolean memory, VipsAccess access, VipsFailOn fail_on, gboolean revalidate) { VipsOperation *operation = vips_operation_new("jp2kload"); if (!operation) return 1; if ( vips_object_set(VIPS_OBJECT(operation), "filename", filename, NULL) || vipsgen_set_int(operation, "page", page) || - vipsgen_set_bool(operation, "oneshot", oneshot) || vipsgen_set_bool(operation, "memory", memory) || vipsgen_set_int(operation, "access", access) || vipsgen_set_int(operation, "fail_on", fail_on) || @@ -2204,7 +2200,7 @@ int vipsgen_jp2kload_buffer(void* buf, size_t len, VipsImage** out) { return vips_jp2kload_buffer(buf, len, out, NULL); } -int vipsgen_jp2kload_buffer_with_options(void* buf, size_t len, VipsImage** out, gint page, gboolean oneshot, gboolean memory, VipsAccess access, VipsFailOn fail_on, gboolean revalidate) { +int vipsgen_jp2kload_buffer_with_options(void* buf, size_t len, VipsImage** out, gint page, gboolean memory, VipsAccess access, VipsFailOn fail_on, gboolean revalidate) { VipsOperation *operation = vips_operation_new("jp2kload_buffer"); if (!operation) return 1; VipsBlob *blob = vips_blob_new(NULL, buf, len); @@ -2212,7 +2208,6 @@ int vipsgen_jp2kload_buffer_with_options(void* buf, size_t len, VipsImage** out, if ( vips_object_set(VIPS_OBJECT(operation), "buffer", blob, NULL) || vipsgen_set_int(operation, "page", page) || - vipsgen_set_bool(operation, "oneshot", oneshot) || vipsgen_set_bool(operation, "memory", memory) || vipsgen_set_int(operation, "access", access) || vipsgen_set_int(operation, "fail_on", fail_on) || @@ -2231,13 +2226,12 @@ int vipsgen_jp2kload_source(VipsSourceCustom* source, VipsImage** out) { return vips_jp2kload_source((VipsSource*) source, out, NULL); } -int vipsgen_jp2kload_source_with_options(VipsSourceCustom* source, VipsImage** out, gint page, gboolean oneshot, gboolean memory, VipsAccess access, VipsFailOn fail_on, gboolean revalidate) { +int vipsgen_jp2kload_source_with_options(VipsSourceCustom* source, VipsImage** out, gint page, gboolean memory, VipsAccess access, VipsFailOn fail_on, gboolean revalidate) { VipsOperation *operation = vips_operation_new("jp2kload_source"); if (!operation) return 1; if ( vips_object_set(VIPS_OBJECT(operation), "source", (VipsSource*)source, NULL) || vipsgen_set_int(operation, "page", page) || - vipsgen_set_bool(operation, "oneshot", oneshot) || vipsgen_set_bool(operation, "memory", memory) || vipsgen_set_int(operation, "access", access) || vipsgen_set_int(operation, "fail_on", fail_on) || @@ -3288,10 +3282,6 @@ int vipsgen_matrixload_source_with_options(VipsSourceCustom* source, VipsImage** return result; } -int vipsgen_matrixmultiply(VipsImage* left, VipsImage* right, VipsImage** out) { - return vips_matrixmultiply(left, right, out, NULL); -} - int vipsgen_matrixprint(VipsImage* in) { return vips_matrixprint(in, NULL); } @@ -4002,31 +3992,6 @@ int vipsgen_ppmload_with_options(const char* filename, VipsImage** out, gboolean return result; } -int vipsgen_ppmload_buffer(void* buf, size_t len, VipsImage** out) { - return vips_ppmload_buffer(buf, len, out, NULL); -} - -int vipsgen_ppmload_buffer_with_options(void* buf, size_t len, VipsImage** out, gboolean memory, VipsAccess access, VipsFailOn fail_on, gboolean revalidate) { - VipsOperation *operation = vips_operation_new("ppmload_buffer"); - if (!operation) return 1; - VipsBlob *blob = vips_blob_new(NULL, buf, len); - if (!blob) { g_object_unref(operation); return 1; } - if ( - vips_object_set(VIPS_OBJECT(operation), "buffer", blob, NULL) || - vipsgen_set_bool(operation, "memory", memory) || - vipsgen_set_int(operation, "access", access) || - vipsgen_set_int(operation, "fail_on", fail_on) || - vipsgen_set_bool(operation, "revalidate", revalidate) - ) { - vips_area_unref((VipsArea *)blob); - g_object_unref(operation); - return 1; - } - vips_area_unref((VipsArea *)blob); - int result = vipsgen_operation_execute(operation, "out", out, NULL); - return result; -} - int vipsgen_ppmload_source(VipsSourceCustom* source, VipsImage** out) { return vips_ppmload_source((VipsSource*) source, out, NULL); } @@ -4496,10 +4461,6 @@ int vipsgen_remainder_const(VipsImage* in, VipsImage** out, double* c, int n) { return vips_remainder_const(in, out, c, n, NULL); } -int vipsgen_remosaic(VipsImage* in, VipsImage** out, const char* old_str, const char* new_str) { - return vips_remosaic(in, out, old_str, new_str, NULL); -} - int vipsgen_replicate(VipsImage* in, VipsImage** out, gint across, gint down) { return vips_replicate(in, out, across, down, NULL); } @@ -4930,7 +4891,7 @@ int vipsgen_svgload(const char* filename, VipsImage** out) { return vips_svgload(filename, out, NULL); } -int vipsgen_svgload_with_options(const char* filename, VipsImage** out, double dpi, double scale, gboolean unlimited, const char* stylesheet, gboolean high_bitdepth, gboolean memory, VipsAccess access, VipsFailOn fail_on, gboolean revalidate) { +int vipsgen_svgload_with_options(const char* filename, VipsImage** out, double dpi, double scale, gboolean unlimited, gboolean memory, VipsAccess access, VipsFailOn fail_on, gboolean revalidate) { VipsOperation *operation = vips_operation_new("svgload"); if (!operation) return 1; if ( @@ -4938,8 +4899,6 @@ int vipsgen_svgload_with_options(const char* filename, VipsImage** out, double d vipsgen_set_double(operation, "dpi", dpi) || vipsgen_set_double(operation, "scale", scale) || vipsgen_set_bool(operation, "unlimited", unlimited) || - vipsgen_set_string(operation, "stylesheet", stylesheet) || - vipsgen_set_bool(operation, "high_bitdepth", high_bitdepth) || vipsgen_set_bool(operation, "memory", memory) || vipsgen_set_int(operation, "access", access) || vipsgen_set_int(operation, "fail_on", fail_on) || @@ -4956,7 +4915,7 @@ int vipsgen_svgload_buffer(void* buf, size_t len, VipsImage** out) { return vips_svgload_buffer(buf, len, out, NULL); } -int vipsgen_svgload_buffer_with_options(void* buf, size_t len, VipsImage** out, double dpi, double scale, gboolean unlimited, const char* stylesheet, gboolean high_bitdepth, gboolean memory, VipsAccess access, VipsFailOn fail_on, gboolean revalidate) { +int vipsgen_svgload_buffer_with_options(void* buf, size_t len, VipsImage** out, double dpi, double scale, gboolean unlimited, gboolean memory, VipsAccess access, VipsFailOn fail_on, gboolean revalidate) { VipsOperation *operation = vips_operation_new("svgload_buffer"); if (!operation) return 1; VipsBlob *blob = vips_blob_new(NULL, buf, len); @@ -4966,8 +4925,6 @@ int vipsgen_svgload_buffer_with_options(void* buf, size_t len, VipsImage** out, vipsgen_set_double(operation, "dpi", dpi) || vipsgen_set_double(operation, "scale", scale) || vipsgen_set_bool(operation, "unlimited", unlimited) || - vipsgen_set_string(operation, "stylesheet", stylesheet) || - vipsgen_set_bool(operation, "high_bitdepth", high_bitdepth) || vipsgen_set_bool(operation, "memory", memory) || vipsgen_set_int(operation, "access", access) || vipsgen_set_int(operation, "fail_on", fail_on) || @@ -4986,7 +4943,7 @@ int vipsgen_svgload_source(VipsSourceCustom* source, VipsImage** out) { return vips_svgload_source((VipsSource*) source, out, NULL); } -int vipsgen_svgload_source_with_options(VipsSourceCustom* source, VipsImage** out, double dpi, double scale, gboolean unlimited, const char* stylesheet, gboolean high_bitdepth, gboolean memory, VipsAccess access, VipsFailOn fail_on, gboolean revalidate) { +int vipsgen_svgload_source_with_options(VipsSourceCustom* source, VipsImage** out, double dpi, double scale, gboolean unlimited, gboolean memory, VipsAccess access, VipsFailOn fail_on, gboolean revalidate) { VipsOperation *operation = vips_operation_new("svgload_source"); if (!operation) return 1; if ( @@ -4994,8 +4951,6 @@ int vipsgen_svgload_source_with_options(VipsSourceCustom* source, VipsImage** ou vipsgen_set_double(operation, "dpi", dpi) || vipsgen_set_double(operation, "scale", scale) || vipsgen_set_bool(operation, "unlimited", unlimited) || - vipsgen_set_string(operation, "stylesheet", stylesheet) || - vipsgen_set_bool(operation, "high_bitdepth", high_bitdepth) || vipsgen_set_bool(operation, "memory", memory) || vipsgen_set_int(operation, "access", access) || vipsgen_set_int(operation, "fail_on", fail_on) || @@ -5067,7 +5022,7 @@ int vipsgen_thumbnail(const char* filename, VipsImage** out, gint width) { return vips_thumbnail(filename, out, width, NULL); } -int vipsgen_thumbnail_with_options(const char* filename, VipsImage** out, gint width, gint height, VipsSize size, gboolean no_rotate, VipsInteresting crop, gboolean linear, const char* input_profile, const char* output_profile, VipsIntent intent, VipsFailOn fail_on) { +int vipsgen_thumbnail_with_options(const char* filename, VipsImage** out, gint width, gint height, VipsSize size, gboolean no_rotate, VipsInteresting crop, gboolean linear, const char* import_profile, const char* export_profile, VipsIntent intent, VipsFailOn fail_on) { VipsOperation *operation = vips_operation_new("thumbnail"); if (!operation) return 1; if ( @@ -5078,8 +5033,8 @@ int vipsgen_thumbnail_with_options(const char* filename, VipsImage** out, gint w vipsgen_set_bool(operation, "no_rotate", no_rotate) || vipsgen_set_int(operation, "crop", crop) || vipsgen_set_bool(operation, "linear", linear) || - vipsgen_set_string(operation, "input_profile", input_profile) || - vipsgen_set_string(operation, "output_profile", output_profile) || + vipsgen_set_string(operation, "import_profile", import_profile) || + vipsgen_set_string(operation, "export_profile", export_profile) || vipsgen_set_int(operation, "intent", intent) || vipsgen_set_int(operation, "fail_on", fail_on) ) { @@ -5094,7 +5049,7 @@ int vipsgen_thumbnail_buffer(void* buf, size_t len, VipsImage** out, gint width) return vips_thumbnail_buffer(buf, len, out, width, NULL); } -int vipsgen_thumbnail_buffer_with_options(void* buf, size_t len, VipsImage** out, gint width, const char* option_string, gint height, VipsSize size, gboolean no_rotate, VipsInteresting crop, gboolean linear, const char* input_profile, const char* output_profile, VipsIntent intent, VipsFailOn fail_on) { +int vipsgen_thumbnail_buffer_with_options(void* buf, size_t len, VipsImage** out, gint width, const char* option_string, gint height, VipsSize size, gboolean no_rotate, VipsInteresting crop, gboolean linear, const char* import_profile, const char* export_profile, VipsIntent intent, VipsFailOn fail_on) { VipsOperation *operation = vips_operation_new("thumbnail_buffer"); if (!operation) return 1; VipsBlob *blob = vips_blob_new(NULL, buf, len); @@ -5108,8 +5063,8 @@ int vipsgen_thumbnail_buffer_with_options(void* buf, size_t len, VipsImage** out vipsgen_set_bool(operation, "no_rotate", no_rotate) || vipsgen_set_int(operation, "crop", crop) || vipsgen_set_bool(operation, "linear", linear) || - vipsgen_set_string(operation, "input_profile", input_profile) || - vipsgen_set_string(operation, "output_profile", output_profile) || + vipsgen_set_string(operation, "import_profile", import_profile) || + vipsgen_set_string(operation, "export_profile", export_profile) || vipsgen_set_int(operation, "intent", intent) || vipsgen_set_int(operation, "fail_on", fail_on) ) { @@ -5126,7 +5081,7 @@ int vipsgen_thumbnail_image(VipsImage* in, VipsImage** out, gint width) { return vips_thumbnail_image(in, out, width, NULL); } -int vipsgen_thumbnail_image_with_options(VipsImage* in, VipsImage** out, gint width, gint height, VipsSize size, gboolean no_rotate, VipsInteresting crop, gboolean linear, const char* input_profile, const char* output_profile, VipsIntent intent, VipsFailOn fail_on) { +int vipsgen_thumbnail_image_with_options(VipsImage* in, VipsImage** out, gint width, gint height, VipsSize size, gboolean no_rotate, VipsInteresting crop, gboolean linear, const char* import_profile, const char* export_profile, VipsIntent intent, VipsFailOn fail_on) { VipsOperation *operation = vips_operation_new("thumbnail_image"); if (!operation) return 1; if ( @@ -5137,8 +5092,8 @@ int vipsgen_thumbnail_image_with_options(VipsImage* in, VipsImage** out, gint wi vipsgen_set_bool(operation, "no_rotate", no_rotate) || vipsgen_set_int(operation, "crop", crop) || vipsgen_set_bool(operation, "linear", linear) || - vipsgen_set_string(operation, "input_profile", input_profile) || - vipsgen_set_string(operation, "output_profile", output_profile) || + vipsgen_set_string(operation, "import_profile", import_profile) || + vipsgen_set_string(operation, "export_profile", export_profile) || vipsgen_set_int(operation, "intent", intent) || vipsgen_set_int(operation, "fail_on", fail_on) ) { @@ -5153,7 +5108,7 @@ int vipsgen_thumbnail_source(VipsSourceCustom* source, VipsImage** out, gint wid return vips_thumbnail_source((VipsSource*) source, out, width, NULL); } -int vipsgen_thumbnail_source_with_options(VipsSourceCustom* source, VipsImage** out, gint width, const char* option_string, gint height, VipsSize size, gboolean no_rotate, VipsInteresting crop, gboolean linear, const char* input_profile, const char* output_profile, VipsIntent intent, VipsFailOn fail_on) { +int vipsgen_thumbnail_source_with_options(VipsSourceCustom* source, VipsImage** out, gint width, const char* option_string, gint height, VipsSize size, gboolean no_rotate, VipsInteresting crop, gboolean linear, const char* import_profile, const char* export_profile, VipsIntent intent, VipsFailOn fail_on) { VipsOperation *operation = vips_operation_new("thumbnail_source"); if (!operation) return 1; if ( @@ -5165,8 +5120,8 @@ int vipsgen_thumbnail_source_with_options(VipsSourceCustom* source, VipsImage** vipsgen_set_bool(operation, "no_rotate", no_rotate) || vipsgen_set_int(operation, "crop", crop) || vipsgen_set_bool(operation, "linear", linear) || - vipsgen_set_string(operation, "input_profile", input_profile) || - vipsgen_set_string(operation, "output_profile", output_profile) || + vipsgen_set_string(operation, "import_profile", import_profile) || + vipsgen_set_string(operation, "export_profile", export_profile) || vipsgen_set_int(operation, "intent", intent) || vipsgen_set_int(operation, "fail_on", fail_on) ) { @@ -5181,16 +5136,15 @@ int vipsgen_tiffload(const char* filename, VipsImage** out) { return vips_tiffload(filename, out, NULL); } -int vipsgen_tiffload_with_options(const char* filename, VipsImage** out, gint page, gint n, gboolean autorotate, gint subifd, gboolean unlimited, gboolean memory, VipsAccess access, VipsFailOn fail_on, gboolean revalidate) { +int vipsgen_tiffload_with_options(const char* filename, VipsImage** out, gint page, gint subifd, gint n, gboolean autorotate, gboolean memory, VipsAccess access, VipsFailOn fail_on, gboolean revalidate) { VipsOperation *operation = vips_operation_new("tiffload"); if (!operation) return 1; if ( vips_object_set(VIPS_OBJECT(operation), "filename", filename, NULL) || vipsgen_set_int(operation, "page", page) || + vipsgen_set_int(operation, "subifd", subifd) || vipsgen_set_int(operation, "n", n) || vipsgen_set_bool(operation, "autorotate", autorotate) || - vipsgen_set_int(operation, "subifd", subifd) || - vipsgen_set_bool(operation, "unlimited", unlimited) || vipsgen_set_bool(operation, "memory", memory) || vipsgen_set_int(operation, "access", access) || vipsgen_set_int(operation, "fail_on", fail_on) || @@ -5207,7 +5161,7 @@ int vipsgen_tiffload_buffer(void* buf, size_t len, VipsImage** out) { return vips_tiffload_buffer(buf, len, out, NULL); } -int vipsgen_tiffload_buffer_with_options(void* buf, size_t len, VipsImage** out, gint page, gint n, gboolean autorotate, gint subifd, gboolean unlimited, gboolean memory, VipsAccess access, VipsFailOn fail_on, gboolean revalidate) { +int vipsgen_tiffload_buffer_with_options(void* buf, size_t len, VipsImage** out, gint page, gint subifd, gint n, gboolean autorotate, gboolean memory, VipsAccess access, VipsFailOn fail_on, gboolean revalidate) { VipsOperation *operation = vips_operation_new("tiffload_buffer"); if (!operation) return 1; VipsBlob *blob = vips_blob_new(NULL, buf, len); @@ -5215,10 +5169,9 @@ int vipsgen_tiffload_buffer_with_options(void* buf, size_t len, VipsImage** out, if ( vips_object_set(VIPS_OBJECT(operation), "buffer", blob, NULL) || vipsgen_set_int(operation, "page", page) || + vipsgen_set_int(operation, "subifd", subifd) || vipsgen_set_int(operation, "n", n) || vipsgen_set_bool(operation, "autorotate", autorotate) || - vipsgen_set_int(operation, "subifd", subifd) || - vipsgen_set_bool(operation, "unlimited", unlimited) || vipsgen_set_bool(operation, "memory", memory) || vipsgen_set_int(operation, "access", access) || vipsgen_set_int(operation, "fail_on", fail_on) || @@ -5237,16 +5190,15 @@ int vipsgen_tiffload_source(VipsSourceCustom* source, VipsImage** out) { return vips_tiffload_source((VipsSource*) source, out, NULL); } -int vipsgen_tiffload_source_with_options(VipsSourceCustom* source, VipsImage** out, gint page, gint n, gboolean autorotate, gint subifd, gboolean unlimited, gboolean memory, VipsAccess access, VipsFailOn fail_on, gboolean revalidate) { +int vipsgen_tiffload_source_with_options(VipsSourceCustom* source, VipsImage** out, gint page, gint subifd, gint n, gboolean autorotate, gboolean memory, VipsAccess access, VipsFailOn fail_on, gboolean revalidate) { VipsOperation *operation = vips_operation_new("tiffload_source"); if (!operation) return 1; if ( vips_object_set(VIPS_OBJECT(operation), "source", (VipsSource*)source, NULL) || vipsgen_set_int(operation, "page", page) || + vipsgen_set_int(operation, "subifd", subifd) || vipsgen_set_int(operation, "n", n) || vipsgen_set_bool(operation, "autorotate", autorotate) || - vipsgen_set_int(operation, "subifd", subifd) || - vipsgen_set_bool(operation, "unlimited", unlimited) || vipsgen_set_bool(operation, "memory", memory) || vipsgen_set_int(operation, "access", access) || vipsgen_set_int(operation, "fail_on", fail_on) || diff --git a/vips/vips.go b/vips/vips.go index d83b6a4..f5c6c45 100644 --- a/vips/vips.go +++ b/vips/vips.go @@ -1,4 +1,4 @@ -// Code generated by github.com/cshum/vipsgen from libvips 8.17.3; DO NOT EDIT. +// Code generated by github.com/cshum/vipsgen from libvips 8.16.1; DO NOT EDIT. package vips // #include "vips.h" @@ -1803,7 +1803,7 @@ func vipsgenGifsave(in *C.VipsImage, filename string) (error) { } // vipsgenGifsaveWithOptions vips_gifsave save as gif with optional arguments -func vipsgenGifsaveWithOptions(in *C.VipsImage, filename string, dither float64, effort int, bitdepth int, interframeMaxerror float64, reuse bool, interpaletteMaxerror float64, interlace bool, keepDuplicateFrames bool, keep Keep, background []float64, pageHeight int, profile string) (error) { +func vipsgenGifsaveWithOptions(in *C.VipsImage, filename string, dither float64, effort int, bitdepth int, interframeMaxerror float64, reuse bool, interpaletteMaxerror float64, interlace bool, keep Keep, background []float64, pageHeight int, profile string) (error) { cfilename := C.CString(filename) defer freeCString(cfilename) cbackground, cbackgroundLength, err := convertToDoubleArray(background) @@ -1815,7 +1815,7 @@ func vipsgenGifsaveWithOptions(in *C.VipsImage, filename string, dither float64, } cprofile := C.CString(profile) defer freeCString(cprofile) - if err := C.vipsgen_gifsave_with_options(in, cfilename, C.double(dither), C.gint(effort), C.gint(bitdepth), C.double(interframeMaxerror), C.int(boolToInt(reuse)), C.double(interpaletteMaxerror), C.int(boolToInt(interlace)), C.int(boolToInt(keepDuplicateFrames)), C.VipsForeignKeep(keep), cbackground, cbackgroundLength, C.gint(pageHeight), cprofile); err != 0 { + if err := C.vipsgen_gifsave_with_options(in, cfilename, C.double(dither), C.gint(effort), C.gint(bitdepth), C.double(interframeMaxerror), C.int(boolToInt(reuse)), C.double(interpaletteMaxerror), C.int(boolToInt(interlace)), C.VipsForeignKeep(keep), cbackground, cbackgroundLength, C.gint(pageHeight), cprofile); err != 0 { return handleVipsError() } return nil @@ -1832,7 +1832,7 @@ func vipsgenGifsaveBuffer(in *C.VipsImage) ([]byte, error) { } // vipsgenGifsaveBufferWithOptions vips_gifsave_buffer save as gif with optional arguments -func vipsgenGifsaveBufferWithOptions(in *C.VipsImage, dither float64, effort int, bitdepth int, interframeMaxerror float64, reuse bool, interpaletteMaxerror float64, interlace bool, keepDuplicateFrames bool, keep Keep, background []float64, pageHeight int, profile string) ([]byte, error) { +func vipsgenGifsaveBufferWithOptions(in *C.VipsImage, dither float64, effort int, bitdepth int, interframeMaxerror float64, reuse bool, interpaletteMaxerror float64, interlace bool, keep Keep, background []float64, pageHeight int, profile string) ([]byte, error) { var buf unsafe.Pointer var length C.size_t cbackground, cbackgroundLength, err := convertToDoubleArray(background) @@ -1844,7 +1844,7 @@ func vipsgenGifsaveBufferWithOptions(in *C.VipsImage, dither float64, effort int } cprofile := C.CString(profile) defer freeCString(cprofile) - if err := C.vipsgen_gifsave_buffer_with_options(in, &buf, &length, C.double(dither), C.gint(effort), C.gint(bitdepth), C.double(interframeMaxerror), C.int(boolToInt(reuse)), C.double(interpaletteMaxerror), C.int(boolToInt(interlace)), C.int(boolToInt(keepDuplicateFrames)), C.VipsForeignKeep(keep), cbackground, cbackgroundLength, C.gint(pageHeight), cprofile); err != 0 { + if err := C.vipsgen_gifsave_buffer_with_options(in, &buf, &length, C.double(dither), C.gint(effort), C.gint(bitdepth), C.double(interframeMaxerror), C.int(boolToInt(reuse)), C.double(interpaletteMaxerror), C.int(boolToInt(interlace)), C.VipsForeignKeep(keep), cbackground, cbackgroundLength, C.gint(pageHeight), cprofile); err != 0 { return nil, handleVipsError() } return bufferToBytes(buf, length), nil @@ -1860,7 +1860,7 @@ func vipsgenGifsaveTarget(in *C.VipsImage, target *C.VipsTargetCustom) (error) { } // vipsgenGifsaveTargetWithOptions vips_gifsave_target save as gif with optional arguments -func vipsgenGifsaveTargetWithOptions(in *C.VipsImage, target *C.VipsTargetCustom, dither float64, effort int, bitdepth int, interframeMaxerror float64, reuse bool, interpaletteMaxerror float64, interlace bool, keepDuplicateFrames bool, keep Keep, background []float64, pageHeight int, profile string) (error) { +func vipsgenGifsaveTargetWithOptions(in *C.VipsImage, target *C.VipsTargetCustom, dither float64, effort int, bitdepth int, interframeMaxerror float64, reuse bool, interpaletteMaxerror float64, interlace bool, keep Keep, background []float64, pageHeight int, profile string) (error) { cbackground, cbackgroundLength, err := convertToDoubleArray(background) if err != nil { return err @@ -1870,7 +1870,7 @@ func vipsgenGifsaveTargetWithOptions(in *C.VipsImage, target *C.VipsTargetCustom } cprofile := C.CString(profile) defer freeCString(cprofile) - if err := C.vipsgen_gifsave_target_with_options(in, target, C.double(dither), C.gint(effort), C.gint(bitdepth), C.double(interframeMaxerror), C.int(boolToInt(reuse)), C.double(interpaletteMaxerror), C.int(boolToInt(interlace)), C.int(boolToInt(keepDuplicateFrames)), C.VipsForeignKeep(keep), cbackground, cbackgroundLength, C.gint(pageHeight), cprofile); err != 0 { + if err := C.vipsgen_gifsave_target_with_options(in, target, C.double(dither), C.gint(effort), C.gint(bitdepth), C.double(interframeMaxerror), C.int(boolToInt(reuse)), C.double(interpaletteMaxerror), C.int(boolToInt(interlace)), C.VipsForeignKeep(keep), cbackground, cbackgroundLength, C.gint(pageHeight), cprofile); err != 0 { return handleVipsError() } return nil @@ -2483,11 +2483,11 @@ func vipsgenJp2kload(filename string) (*C.VipsImage, error) { } // vipsgenJp2kloadWithOptions vips_jp2kload load JPEG2000 image with optional arguments -func vipsgenJp2kloadWithOptions(filename string, page int, oneshot bool, memory bool, access Access, failOn FailOn, revalidate bool) (*C.VipsImage, error) { +func vipsgenJp2kloadWithOptions(filename string, page int, memory bool, access Access, failOn FailOn, revalidate bool) (*C.VipsImage, error) { var out *C.VipsImage cfilename := C.CString(filename) defer freeCString(cfilename) - if err := C.vipsgen_jp2kload_with_options(cfilename, &out, C.gint(page), C.int(boolToInt(oneshot)), C.int(boolToInt(memory)), C.VipsAccess(access), C.VipsFailOn(failOn), C.int(boolToInt(revalidate))); err != 0 { + if err := C.vipsgen_jp2kload_with_options(cfilename, &out, C.gint(page), C.int(boolToInt(memory)), C.VipsAccess(access), C.VipsFailOn(failOn), C.int(boolToInt(revalidate))); err != 0 { return nil, handleImageError(out) } return out, nil @@ -2506,12 +2506,12 @@ func vipsgenJp2kloadBuffer(buf []byte) (*C.VipsImage, error) { } // vipsgenJp2kloadBufferWithOptions vips_jp2kload_buffer load JPEG2000 image with optional arguments -func vipsgenJp2kloadBufferWithOptions(buf []byte, page int, oneshot bool, memory bool, access Access, failOn FailOn, revalidate bool) (*C.VipsImage, error) { +func vipsgenJp2kloadBufferWithOptions(buf []byte, page int, memory bool, access Access, failOn FailOn, revalidate bool) (*C.VipsImage, error) { src := buf // Reference src here so it's not garbage collected during image initialization. defer runtime.KeepAlive(src) var out *C.VipsImage - if err := C.vipsgen_jp2kload_buffer_with_options(unsafe.Pointer(&src[0]), C.size_t(len(src)), &out, C.gint(page), C.int(boolToInt(oneshot)), C.int(boolToInt(memory)), C.VipsAccess(access), C.VipsFailOn(failOn), C.int(boolToInt(revalidate))); err != 0 { + if err := C.vipsgen_jp2kload_buffer_with_options(unsafe.Pointer(&src[0]), C.size_t(len(src)), &out, C.gint(page), C.int(boolToInt(memory)), C.VipsAccess(access), C.VipsFailOn(failOn), C.int(boolToInt(revalidate))); err != 0 { return nil, handleImageError(out) } return out, nil @@ -2527,9 +2527,9 @@ func vipsgenJp2kloadSource(source *C.VipsSourceCustom) (*C.VipsImage, error) { } // vipsgenJp2kloadSourceWithOptions vips_jp2kload_source load JPEG2000 image with optional arguments -func vipsgenJp2kloadSourceWithOptions(source *C.VipsSourceCustom, page int, oneshot bool, memory bool, access Access, failOn FailOn, revalidate bool) (*C.VipsImage, error) { +func vipsgenJp2kloadSourceWithOptions(source *C.VipsSourceCustom, page int, memory bool, access Access, failOn FailOn, revalidate bool) (*C.VipsImage, error) { var out *C.VipsImage - if err := C.vipsgen_jp2kload_source_with_options(source, &out, C.gint(page), C.int(boolToInt(oneshot)), C.int(boolToInt(memory)), C.VipsAccess(access), C.VipsFailOn(failOn), C.int(boolToInt(revalidate))); err != 0 { + if err := C.vipsgen_jp2kload_source_with_options(source, &out, C.gint(page), C.int(boolToInt(memory)), C.VipsAccess(access), C.VipsFailOn(failOn), C.int(boolToInt(revalidate))); err != 0 { return nil, handleImageError(out) } return out, nil @@ -3447,7 +3447,7 @@ func vipsgenMatloadWithOptions(filename string, memory bool, access Access, fail return out, nil } -// vipsgenMatrixinvert vips_matrixinvert invert a matrix +// vipsgenMatrixinvert vips_matrixinvert invert an matrix func vipsgenMatrixinvert(in *C.VipsImage) (*C.VipsImage, error) { var out *C.VipsImage if err := C.vipsgen_matrixinvert(in, &out); err != 0 { @@ -3496,15 +3496,6 @@ func vipsgenMatrixloadSourceWithOptions(source *C.VipsSourceCustom, memory bool, return out, nil } -// vipsgenMatrixmultiply vips_matrixmultiply multiply two matrices -func vipsgenMatrixmultiply(left *C.VipsImage, right *C.VipsImage) (*C.VipsImage, error) { - var out *C.VipsImage - if err := C.vipsgen_matrixmultiply(left, right, &out); err != 0 { - return nil, handleImageError(out) - } - return out, nil -} - // vipsgenMatrixprint vips_matrixprint print matrix func vipsgenMatrixprint(in *C.VipsImage) (error) { @@ -4249,31 +4240,7 @@ func vipsgenPpmloadWithOptions(filename string, memory bool, access Access, fail return out, nil } -// vipsgenPpmloadBuffer vips_ppmload_buffer load ppm from buffer -func vipsgenPpmloadBuffer(buf []byte) (*C.VipsImage, error) { - src := buf - // Reference src here so it's not garbage collected during image initialization. - defer runtime.KeepAlive(src) - var out *C.VipsImage - if err := C.vipsgen_ppmload_buffer(unsafe.Pointer(&src[0]), C.size_t(len(src)), &out); err != 0 { - return nil, handleImageError(out) - } - return out, nil -} - -// vipsgenPpmloadBufferWithOptions vips_ppmload_buffer load ppm from buffer with optional arguments -func vipsgenPpmloadBufferWithOptions(buf []byte, memory bool, access Access, failOn FailOn, revalidate bool) (*C.VipsImage, error) { - src := buf - // Reference src here so it's not garbage collected during image initialization. - defer runtime.KeepAlive(src) - var out *C.VipsImage - if err := C.vipsgen_ppmload_buffer_with_options(unsafe.Pointer(&src[0]), C.size_t(len(src)), &out, C.int(boolToInt(memory)), C.VipsAccess(access), C.VipsFailOn(failOn), C.int(boolToInt(revalidate))); err != 0 { - return nil, handleImageError(out) - } - return out, nil -} - -// vipsgenPpmloadSource vips_ppmload_source load ppm from source +// vipsgenPpmloadSource vips_ppmload_source load ppm base class func vipsgenPpmloadSource(source *C.VipsSourceCustom) (*C.VipsImage, error) { var out *C.VipsImage if err := C.vipsgen_ppmload_source(source, &out); err != 0 { @@ -4282,7 +4249,7 @@ func vipsgenPpmloadSource(source *C.VipsSourceCustom) (*C.VipsImage, error) { return out, nil } -// vipsgenPpmloadSourceWithOptions vips_ppmload_source load ppm from source with optional arguments +// vipsgenPpmloadSourceWithOptions vips_ppmload_source load ppm base class with optional arguments func vipsgenPpmloadSourceWithOptions(source *C.VipsSourceCustom, memory bool, access Access, failOn FailOn, revalidate bool) (*C.VipsImage, error) { var out *C.VipsImage if err := C.vipsgen_ppmload_source_with_options(source, &out, C.int(boolToInt(memory)), C.VipsAccess(access), C.VipsFailOn(failOn), C.int(boolToInt(revalidate))); err != 0 { @@ -4813,19 +4780,6 @@ func vipsgenRemainderConst(in *C.VipsImage, c []float64) (*C.VipsImage, error) { return out, nil } -// vipsgenRemosaic vips_remosaic rebuild an mosaiced image -func vipsgenRemosaic(in *C.VipsImage, oldStr string, newStr string) (*C.VipsImage, error) { - var out *C.VipsImage - coldStr := C.CString(oldStr) - defer freeCString(coldStr) - cnewStr := C.CString(newStr) - defer freeCString(cnewStr) - if err := C.vipsgen_remosaic(in, &out, coldStr, cnewStr); err != 0 { - return nil, handleImageError(out) - } - return out, nil -} - // vipsgenReplicate vips_replicate replicate an image func vipsgenReplicate(in *C.VipsImage, across int, down int) (*C.VipsImage, error) { var out *C.VipsImage @@ -4959,7 +4913,7 @@ func vipsgenScRGB2XYZ(in *C.VipsImage) (*C.VipsImage, error) { return out, nil } -// vipsgenScRGB2sRGB vips_scRGB2sRGB convert scRGB to sRGB +// vipsgenScRGB2sRGB vips_scRGB2sRGB convert an scRGB image to sRGB func vipsgenScRGB2sRGB(in *C.VipsImage) (*C.VipsImage, error) { var out *C.VipsImage if err := C.vipsgen_scRGB2sRGB(in, &out); err != 0 { @@ -4968,7 +4922,7 @@ func vipsgenScRGB2sRGB(in *C.VipsImage) (*C.VipsImage, error) { return out, nil } -// vipsgenScRGB2sRGBWithOptions vips_scRGB2sRGB convert scRGB to sRGB with optional arguments +// vipsgenScRGB2sRGBWithOptions vips_scRGB2sRGB convert an scRGB image to sRGB with optional arguments func vipsgenScRGB2sRGBWithOptions(in *C.VipsImage, depth int) (*C.VipsImage, error) { var out *C.VipsImage if err := C.vipsgen_scRGB2sRGB_with_options(in, &out, C.gint(depth)); err != 0 { @@ -5331,13 +5285,11 @@ func vipsgenSvgload(filename string) (*C.VipsImage, error) { } // vipsgenSvgloadWithOptions vips_svgload load SVG with rsvg with optional arguments -func vipsgenSvgloadWithOptions(filename string, dpi float64, scale float64, unlimited bool, stylesheet string, highBitdepth bool, memory bool, access Access, failOn FailOn, revalidate bool) (*C.VipsImage, error) { +func vipsgenSvgloadWithOptions(filename string, dpi float64, scale float64, unlimited bool, memory bool, access Access, failOn FailOn, revalidate bool) (*C.VipsImage, error) { var out *C.VipsImage cfilename := C.CString(filename) defer freeCString(cfilename) - cstylesheet := C.CString(stylesheet) - defer freeCString(cstylesheet) - if err := C.vipsgen_svgload_with_options(cfilename, &out, C.double(dpi), C.double(scale), C.int(boolToInt(unlimited)), cstylesheet, C.int(boolToInt(highBitdepth)), C.int(boolToInt(memory)), C.VipsAccess(access), C.VipsFailOn(failOn), C.int(boolToInt(revalidate))); err != 0 { + if err := C.vipsgen_svgload_with_options(cfilename, &out, C.double(dpi), C.double(scale), C.int(boolToInt(unlimited)), C.int(boolToInt(memory)), C.VipsAccess(access), C.VipsFailOn(failOn), C.int(boolToInt(revalidate))); err != 0 { return nil, handleImageError(out) } return out, nil @@ -5356,14 +5308,12 @@ func vipsgenSvgloadBuffer(buf []byte) (*C.VipsImage, error) { } // vipsgenSvgloadBufferWithOptions vips_svgload_buffer load SVG with rsvg with optional arguments -func vipsgenSvgloadBufferWithOptions(buf []byte, dpi float64, scale float64, unlimited bool, stylesheet string, highBitdepth bool, memory bool, access Access, failOn FailOn, revalidate bool) (*C.VipsImage, error) { +func vipsgenSvgloadBufferWithOptions(buf []byte, dpi float64, scale float64, unlimited bool, memory bool, access Access, failOn FailOn, revalidate bool) (*C.VipsImage, error) { src := buf // Reference src here so it's not garbage collected during image initialization. defer runtime.KeepAlive(src) var out *C.VipsImage - cstylesheet := C.CString(stylesheet) - defer freeCString(cstylesheet) - if err := C.vipsgen_svgload_buffer_with_options(unsafe.Pointer(&src[0]), C.size_t(len(src)), &out, C.double(dpi), C.double(scale), C.int(boolToInt(unlimited)), cstylesheet, C.int(boolToInt(highBitdepth)), C.int(boolToInt(memory)), C.VipsAccess(access), C.VipsFailOn(failOn), C.int(boolToInt(revalidate))); err != 0 { + if err := C.vipsgen_svgload_buffer_with_options(unsafe.Pointer(&src[0]), C.size_t(len(src)), &out, C.double(dpi), C.double(scale), C.int(boolToInt(unlimited)), C.int(boolToInt(memory)), C.VipsAccess(access), C.VipsFailOn(failOn), C.int(boolToInt(revalidate))); err != 0 { return nil, handleImageError(out) } return out, nil @@ -5379,11 +5329,9 @@ func vipsgenSvgloadSource(source *C.VipsSourceCustom) (*C.VipsImage, error) { } // vipsgenSvgloadSourceWithOptions vips_svgload_source load svg from source with optional arguments -func vipsgenSvgloadSourceWithOptions(source *C.VipsSourceCustom, dpi float64, scale float64, unlimited bool, stylesheet string, highBitdepth bool, memory bool, access Access, failOn FailOn, revalidate bool) (*C.VipsImage, error) { +func vipsgenSvgloadSourceWithOptions(source *C.VipsSourceCustom, dpi float64, scale float64, unlimited bool, memory bool, access Access, failOn FailOn, revalidate bool) (*C.VipsImage, error) { var out *C.VipsImage - cstylesheet := C.CString(stylesheet) - defer freeCString(cstylesheet) - if err := C.vipsgen_svgload_source_with_options(source, &out, C.double(dpi), C.double(scale), C.int(boolToInt(unlimited)), cstylesheet, C.int(boolToInt(highBitdepth)), C.int(boolToInt(memory)), C.VipsAccess(access), C.VipsFailOn(failOn), C.int(boolToInt(revalidate))); err != 0 { + if err := C.vipsgen_svgload_source_with_options(source, &out, C.double(dpi), C.double(scale), C.int(boolToInt(unlimited)), C.int(boolToInt(memory)), C.VipsAccess(access), C.VipsFailOn(failOn), C.int(boolToInt(revalidate))); err != 0 { return nil, handleImageError(out) } return out, nil @@ -5487,15 +5435,15 @@ func vipsgenThumbnail(filename string, width int) (*C.VipsImage, error) { } // vipsgenThumbnailWithOptions vips_thumbnail generate thumbnail from file with optional arguments -func vipsgenThumbnailWithOptions(filename string, width int, height int, size Size, noRotate bool, crop Interesting, linear bool, inputProfile string, outputProfile string, intent Intent, failOn FailOn) (*C.VipsImage, error) { +func vipsgenThumbnailWithOptions(filename string, width int, height int, size Size, noRotate bool, crop Interesting, linear bool, importProfile string, exportProfile string, intent Intent, failOn FailOn) (*C.VipsImage, error) { var out *C.VipsImage cfilename := C.CString(filename) defer freeCString(cfilename) - cinputProfile := C.CString(inputProfile) - defer freeCString(cinputProfile) - coutputProfile := C.CString(outputProfile) - defer freeCString(coutputProfile) - if err := C.vipsgen_thumbnail_with_options(cfilename, &out, C.gint(width), C.gint(height), C.VipsSize(size), C.int(boolToInt(noRotate)), C.VipsInteresting(crop), C.int(boolToInt(linear)), cinputProfile, coutputProfile, C.VipsIntent(intent), C.VipsFailOn(failOn)); err != 0 { + cimportProfile := C.CString(importProfile) + defer freeCString(cimportProfile) + cexportProfile := C.CString(exportProfile) + defer freeCString(cexportProfile) + if err := C.vipsgen_thumbnail_with_options(cfilename, &out, C.gint(width), C.gint(height), C.VipsSize(size), C.int(boolToInt(noRotate)), C.VipsInteresting(crop), C.int(boolToInt(linear)), cimportProfile, cexportProfile, C.VipsIntent(intent), C.VipsFailOn(failOn)); err != 0 { return nil, handleImageError(out) } return out, nil @@ -5514,18 +5462,18 @@ func vipsgenThumbnailBuffer(buf []byte, width int) (*C.VipsImage, error) { } // vipsgenThumbnailBufferWithOptions vips_thumbnail_buffer generate thumbnail from buffer with optional arguments -func vipsgenThumbnailBufferWithOptions(buf []byte, width int, optionString string, height int, size Size, noRotate bool, crop Interesting, linear bool, inputProfile string, outputProfile string, intent Intent, failOn FailOn) (*C.VipsImage, error) { +func vipsgenThumbnailBufferWithOptions(buf []byte, width int, optionString string, height int, size Size, noRotate bool, crop Interesting, linear bool, importProfile string, exportProfile string, intent Intent, failOn FailOn) (*C.VipsImage, error) { src := buf // Reference src here so it's not garbage collected during image initialization. defer runtime.KeepAlive(src) var out *C.VipsImage coptionString := C.CString(optionString) defer freeCString(coptionString) - cinputProfile := C.CString(inputProfile) - defer freeCString(cinputProfile) - coutputProfile := C.CString(outputProfile) - defer freeCString(coutputProfile) - if err := C.vipsgen_thumbnail_buffer_with_options(unsafe.Pointer(&src[0]), C.size_t(len(src)), &out, C.gint(width), coptionString, C.gint(height), C.VipsSize(size), C.int(boolToInt(noRotate)), C.VipsInteresting(crop), C.int(boolToInt(linear)), cinputProfile, coutputProfile, C.VipsIntent(intent), C.VipsFailOn(failOn)); err != 0 { + cimportProfile := C.CString(importProfile) + defer freeCString(cimportProfile) + cexportProfile := C.CString(exportProfile) + defer freeCString(cexportProfile) + if err := C.vipsgen_thumbnail_buffer_with_options(unsafe.Pointer(&src[0]), C.size_t(len(src)), &out, C.gint(width), coptionString, C.gint(height), C.VipsSize(size), C.int(boolToInt(noRotate)), C.VipsInteresting(crop), C.int(boolToInt(linear)), cimportProfile, cexportProfile, C.VipsIntent(intent), C.VipsFailOn(failOn)); err != 0 { return nil, handleImageError(out) } return out, nil @@ -5541,13 +5489,13 @@ func vipsgenThumbnailImage(in *C.VipsImage, width int) (*C.VipsImage, error) { } // vipsgenThumbnailImageWithOptions vips_thumbnail_image generate thumbnail from image with optional arguments -func vipsgenThumbnailImageWithOptions(in *C.VipsImage, width int, height int, size Size, noRotate bool, crop Interesting, linear bool, inputProfile string, outputProfile string, intent Intent, failOn FailOn) (*C.VipsImage, error) { +func vipsgenThumbnailImageWithOptions(in *C.VipsImage, width int, height int, size Size, noRotate bool, crop Interesting, linear bool, importProfile string, exportProfile string, intent Intent, failOn FailOn) (*C.VipsImage, error) { var out *C.VipsImage - cinputProfile := C.CString(inputProfile) - defer freeCString(cinputProfile) - coutputProfile := C.CString(outputProfile) - defer freeCString(coutputProfile) - if err := C.vipsgen_thumbnail_image_with_options(in, &out, C.gint(width), C.gint(height), C.VipsSize(size), C.int(boolToInt(noRotate)), C.VipsInteresting(crop), C.int(boolToInt(linear)), cinputProfile, coutputProfile, C.VipsIntent(intent), C.VipsFailOn(failOn)); err != 0 { + cimportProfile := C.CString(importProfile) + defer freeCString(cimportProfile) + cexportProfile := C.CString(exportProfile) + defer freeCString(cexportProfile) + if err := C.vipsgen_thumbnail_image_with_options(in, &out, C.gint(width), C.gint(height), C.VipsSize(size), C.int(boolToInt(noRotate)), C.VipsInteresting(crop), C.int(boolToInt(linear)), cimportProfile, cexportProfile, C.VipsIntent(intent), C.VipsFailOn(failOn)); err != 0 { return nil, handleImageError(out) } return out, nil @@ -5563,15 +5511,15 @@ func vipsgenThumbnailSource(source *C.VipsSourceCustom, width int) (*C.VipsImage } // vipsgenThumbnailSourceWithOptions vips_thumbnail_source generate thumbnail from source with optional arguments -func vipsgenThumbnailSourceWithOptions(source *C.VipsSourceCustom, width int, optionString string, height int, size Size, noRotate bool, crop Interesting, linear bool, inputProfile string, outputProfile string, intent Intent, failOn FailOn) (*C.VipsImage, error) { +func vipsgenThumbnailSourceWithOptions(source *C.VipsSourceCustom, width int, optionString string, height int, size Size, noRotate bool, crop Interesting, linear bool, importProfile string, exportProfile string, intent Intent, failOn FailOn) (*C.VipsImage, error) { var out *C.VipsImage coptionString := C.CString(optionString) defer freeCString(coptionString) - cinputProfile := C.CString(inputProfile) - defer freeCString(cinputProfile) - coutputProfile := C.CString(outputProfile) - defer freeCString(coutputProfile) - if err := C.vipsgen_thumbnail_source_with_options(source, &out, C.gint(width), coptionString, C.gint(height), C.VipsSize(size), C.int(boolToInt(noRotate)), C.VipsInteresting(crop), C.int(boolToInt(linear)), cinputProfile, coutputProfile, C.VipsIntent(intent), C.VipsFailOn(failOn)); err != 0 { + cimportProfile := C.CString(importProfile) + defer freeCString(cimportProfile) + cexportProfile := C.CString(exportProfile) + defer freeCString(cexportProfile) + if err := C.vipsgen_thumbnail_source_with_options(source, &out, C.gint(width), coptionString, C.gint(height), C.VipsSize(size), C.int(boolToInt(noRotate)), C.VipsInteresting(crop), C.int(boolToInt(linear)), cimportProfile, cexportProfile, C.VipsIntent(intent), C.VipsFailOn(failOn)); err != 0 { return nil, handleImageError(out) } return out, nil @@ -5589,11 +5537,11 @@ func vipsgenTiffload(filename string) (*C.VipsImage, error) { } // vipsgenTiffloadWithOptions vips_tiffload load tiff from file with optional arguments -func vipsgenTiffloadWithOptions(filename string, page int, n int, autorotate bool, subifd int, unlimited bool, memory bool, access Access, failOn FailOn, revalidate bool) (*C.VipsImage, error) { +func vipsgenTiffloadWithOptions(filename string, page int, subifd int, n int, autorotate bool, memory bool, access Access, failOn FailOn, revalidate bool) (*C.VipsImage, error) { var out *C.VipsImage cfilename := C.CString(filename) defer freeCString(cfilename) - if err := C.vipsgen_tiffload_with_options(cfilename, &out, C.gint(page), C.gint(n), C.int(boolToInt(autorotate)), C.gint(subifd), C.int(boolToInt(unlimited)), C.int(boolToInt(memory)), C.VipsAccess(access), C.VipsFailOn(failOn), C.int(boolToInt(revalidate))); err != 0 { + if err := C.vipsgen_tiffload_with_options(cfilename, &out, C.gint(page), C.gint(subifd), C.gint(n), C.int(boolToInt(autorotate)), C.int(boolToInt(memory)), C.VipsAccess(access), C.VipsFailOn(failOn), C.int(boolToInt(revalidate))); err != 0 { return nil, handleImageError(out) } return out, nil @@ -5612,12 +5560,12 @@ func vipsgenTiffloadBuffer(buf []byte) (*C.VipsImage, error) { } // vipsgenTiffloadBufferWithOptions vips_tiffload_buffer load tiff from buffer with optional arguments -func vipsgenTiffloadBufferWithOptions(buf []byte, page int, n int, autorotate bool, subifd int, unlimited bool, memory bool, access Access, failOn FailOn, revalidate bool) (*C.VipsImage, error) { +func vipsgenTiffloadBufferWithOptions(buf []byte, page int, subifd int, n int, autorotate bool, memory bool, access Access, failOn FailOn, revalidate bool) (*C.VipsImage, error) { src := buf // Reference src here so it's not garbage collected during image initialization. defer runtime.KeepAlive(src) var out *C.VipsImage - if err := C.vipsgen_tiffload_buffer_with_options(unsafe.Pointer(&src[0]), C.size_t(len(src)), &out, C.gint(page), C.gint(n), C.int(boolToInt(autorotate)), C.gint(subifd), C.int(boolToInt(unlimited)), C.int(boolToInt(memory)), C.VipsAccess(access), C.VipsFailOn(failOn), C.int(boolToInt(revalidate))); err != 0 { + if err := C.vipsgen_tiffload_buffer_with_options(unsafe.Pointer(&src[0]), C.size_t(len(src)), &out, C.gint(page), C.gint(subifd), C.gint(n), C.int(boolToInt(autorotate)), C.int(boolToInt(memory)), C.VipsAccess(access), C.VipsFailOn(failOn), C.int(boolToInt(revalidate))); err != 0 { return nil, handleImageError(out) } return out, nil @@ -5633,9 +5581,9 @@ func vipsgenTiffloadSource(source *C.VipsSourceCustom) (*C.VipsImage, error) { } // vipsgenTiffloadSourceWithOptions vips_tiffload_source load tiff from source with optional arguments -func vipsgenTiffloadSourceWithOptions(source *C.VipsSourceCustom, page int, n int, autorotate bool, subifd int, unlimited bool, memory bool, access Access, failOn FailOn, revalidate bool) (*C.VipsImage, error) { +func vipsgenTiffloadSourceWithOptions(source *C.VipsSourceCustom, page int, subifd int, n int, autorotate bool, memory bool, access Access, failOn FailOn, revalidate bool) (*C.VipsImage, error) { var out *C.VipsImage - if err := C.vipsgen_tiffload_source_with_options(source, &out, C.gint(page), C.gint(n), C.int(boolToInt(autorotate)), C.gint(subifd), C.int(boolToInt(unlimited)), C.int(boolToInt(memory)), C.VipsAccess(access), C.VipsFailOn(failOn), C.int(boolToInt(revalidate))); err != 0 { + if err := C.vipsgen_tiffload_source_with_options(source, &out, C.gint(page), C.gint(subifd), C.gint(n), C.int(boolToInt(autorotate)), C.int(boolToInt(memory)), C.VipsAccess(access), C.VipsFailOn(failOn), C.int(boolToInt(revalidate))); err != 0 { return nil, handleImageError(out) } return out, nil diff --git a/vips/vips.h b/vips/vips.h index 88aa101..d1967ef 100644 --- a/vips/vips.h +++ b/vips/vips.h @@ -1,4 +1,4 @@ -// Code generated by github.com/cshum/vipsgen from libvips 8.17.3; DO NOT EDIT. +// Code generated by github.com/cshum/vipsgen from libvips 8.16.1; DO NOT EDIT. #include #include @@ -276,13 +276,13 @@ int vipsgen_gifload_source(VipsSourceCustom* source, VipsImage** out); int vipsgen_gifload_source_with_options(VipsSourceCustom* source, VipsImage** out, gint n, gint page, gboolean memory, VipsAccess access, VipsFailOn fail_on, gboolean revalidate); int vipsgen_gifsave(VipsImage* in, const char* filename); -int vipsgen_gifsave_with_options(VipsImage* in, const char* filename, double dither, gint effort, gint bitdepth, double interframe_maxerror, gboolean reuse, double interpalette_maxerror, gboolean interlace, gboolean keep_duplicate_frames, VipsForeignKeep keep, double* background, int background_n, gint page_height, const char* profile); +int vipsgen_gifsave_with_options(VipsImage* in, const char* filename, double dither, gint effort, gint bitdepth, double interframe_maxerror, gboolean reuse, double interpalette_maxerror, gboolean interlace, VipsForeignKeep keep, double* background, int background_n, gint page_height, const char* profile); int vipsgen_gifsave_buffer(VipsImage* in, void** buf, size_t* len); -int vipsgen_gifsave_buffer_with_options(VipsImage* in, void** buf, size_t* len, double dither, gint effort, gint bitdepth, double interframe_maxerror, gboolean reuse, double interpalette_maxerror, gboolean interlace, gboolean keep_duplicate_frames, VipsForeignKeep keep, double* background, int background_n, gint page_height, const char* profile); +int vipsgen_gifsave_buffer_with_options(VipsImage* in, void** buf, size_t* len, double dither, gint effort, gint bitdepth, double interframe_maxerror, gboolean reuse, double interpalette_maxerror, gboolean interlace, VipsForeignKeep keep, double* background, int background_n, gint page_height, const char* profile); int vipsgen_gifsave_target(VipsImage* in, VipsTargetCustom* target); -int vipsgen_gifsave_target_with_options(VipsImage* in, VipsTargetCustom* target, double dither, gint effort, gint bitdepth, double interframe_maxerror, gboolean reuse, double interpalette_maxerror, gboolean interlace, gboolean keep_duplicate_frames, VipsForeignKeep keep, double* background, int background_n, gint page_height, const char* profile); +int vipsgen_gifsave_target_with_options(VipsImage* in, VipsTargetCustom* target, double dither, gint effort, gint bitdepth, double interframe_maxerror, gboolean reuse, double interpalette_maxerror, gboolean interlace, VipsForeignKeep keep, double* background, int background_n, gint page_height, const char* profile); int vipsgen_globalbalance(VipsImage* in, VipsImage** out); int vipsgen_globalbalance_with_options(VipsImage* in, VipsImage** out, double gamma, gboolean int_output); @@ -376,13 +376,13 @@ int vipsgen_join(VipsImage* in1, VipsImage* in2, VipsImage** out, VipsDirection int vipsgen_join_with_options(VipsImage* in1, VipsImage* in2, VipsImage** out, VipsDirection direction, gboolean expand, gint shim, double* background, int background_n, VipsAlign align); int vipsgen_jp2kload(const char* filename, VipsImage** out); -int vipsgen_jp2kload_with_options(const char* filename, VipsImage** out, gint page, gboolean oneshot, gboolean memory, VipsAccess access, VipsFailOn fail_on, gboolean revalidate); +int vipsgen_jp2kload_with_options(const char* filename, VipsImage** out, gint page, gboolean memory, VipsAccess access, VipsFailOn fail_on, gboolean revalidate); int vipsgen_jp2kload_buffer(void* buf, size_t len, VipsImage** out); -int vipsgen_jp2kload_buffer_with_options(void* buf, size_t len, VipsImage** out, gint page, gboolean oneshot, gboolean memory, VipsAccess access, VipsFailOn fail_on, gboolean revalidate); +int vipsgen_jp2kload_buffer_with_options(void* buf, size_t len, VipsImage** out, gint page, gboolean memory, VipsAccess access, VipsFailOn fail_on, gboolean revalidate); int vipsgen_jp2kload_source(VipsSourceCustom* source, VipsImage** out); -int vipsgen_jp2kload_source_with_options(VipsSourceCustom* source, VipsImage** out, gint page, gboolean oneshot, gboolean memory, VipsAccess access, VipsFailOn fail_on, gboolean revalidate); +int vipsgen_jp2kload_source_with_options(VipsSourceCustom* source, VipsImage** out, gint page, gboolean memory, VipsAccess access, VipsFailOn fail_on, gboolean revalidate); int vipsgen_jp2ksave(VipsImage* in, const char* filename); int vipsgen_jp2ksave_with_options(VipsImage* in, const char* filename, gint tile_width, gint tile_height, gboolean lossless, gint Q, VipsForeignSubsample subsample_mode, VipsForeignKeep keep, double* background, int background_n, gint page_height, const char* profile); @@ -509,8 +509,6 @@ int vipsgen_matrixload_with_options(const char* filename, VipsImage** out, gbool int vipsgen_matrixload_source(VipsSourceCustom* source, VipsImage** out); int vipsgen_matrixload_source_with_options(VipsSourceCustom* source, VipsImage** out, gboolean memory, VipsAccess access, VipsFailOn fail_on, gboolean revalidate); -int vipsgen_matrixmultiply(VipsImage* left, VipsImage* right, VipsImage** out); - int vipsgen_matrixprint(VipsImage* in); int vipsgen_matrixprint_with_options(VipsImage* in, VipsForeignKeep keep, double* background, int background_n, gint page_height, const char* profile); @@ -604,9 +602,6 @@ int vipsgen_pngsave_target_with_options(VipsImage* in, VipsTargetCustom* target, int vipsgen_ppmload(const char* filename, VipsImage** out); int vipsgen_ppmload_with_options(const char* filename, VipsImage** out, gboolean memory, VipsAccess access, VipsFailOn fail_on, gboolean revalidate); -int vipsgen_ppmload_buffer(void* buf, size_t len, VipsImage** out); -int vipsgen_ppmload_buffer_with_options(void* buf, size_t len, VipsImage** out, gboolean memory, VipsAccess access, VipsFailOn fail_on, gboolean revalidate); - int vipsgen_ppmload_source(VipsSourceCustom* source, VipsImage** out); int vipsgen_ppmload_source_with_options(VipsSourceCustom* source, VipsImage** out, gboolean memory, VipsAccess access, VipsFailOn fail_on, gboolean revalidate); @@ -683,8 +678,6 @@ int vipsgen_remainder(VipsImage* left, VipsImage* right, VipsImage** out); int vipsgen_remainder_const(VipsImage* in, VipsImage** out, double* c, int n); -int vipsgen_remosaic(VipsImage* in, VipsImage** out, const char* old_str, const char* new_str); - int vipsgen_replicate(VipsImage* in, VipsImage** out, gint across, gint down); int vipsgen_resize(VipsImage* in, VipsImage** out, double scale); @@ -765,13 +758,13 @@ int vipsgen_subtract(VipsImage* left, VipsImage* right, VipsImage** out); int vipsgen_sum(VipsImage** in, VipsImage** out, int n); int vipsgen_svgload(const char* filename, VipsImage** out); -int vipsgen_svgload_with_options(const char* filename, VipsImage** out, double dpi, double scale, gboolean unlimited, const char* stylesheet, gboolean high_bitdepth, gboolean memory, VipsAccess access, VipsFailOn fail_on, gboolean revalidate); +int vipsgen_svgload_with_options(const char* filename, VipsImage** out, double dpi, double scale, gboolean unlimited, gboolean memory, VipsAccess access, VipsFailOn fail_on, gboolean revalidate); int vipsgen_svgload_buffer(void* buf, size_t len, VipsImage** out); -int vipsgen_svgload_buffer_with_options(void* buf, size_t len, VipsImage** out, double dpi, double scale, gboolean unlimited, const char* stylesheet, gboolean high_bitdepth, gboolean memory, VipsAccess access, VipsFailOn fail_on, gboolean revalidate); +int vipsgen_svgload_buffer_with_options(void* buf, size_t len, VipsImage** out, double dpi, double scale, gboolean unlimited, gboolean memory, VipsAccess access, VipsFailOn fail_on, gboolean revalidate); int vipsgen_svgload_source(VipsSourceCustom* source, VipsImage** out); -int vipsgen_svgload_source_with_options(VipsSourceCustom* source, VipsImage** out, double dpi, double scale, gboolean unlimited, const char* stylesheet, gboolean high_bitdepth, gboolean memory, VipsAccess access, VipsFailOn fail_on, gboolean revalidate); +int vipsgen_svgload_source_with_options(VipsSourceCustom* source, VipsImage** out, double dpi, double scale, gboolean unlimited, gboolean memory, VipsAccess access, VipsFailOn fail_on, gboolean revalidate); int vipsgen_switch(VipsImage** tests, VipsImage** out, int n); @@ -782,25 +775,25 @@ int vipsgen_text(VipsImage** out, const char* text); int vipsgen_text_with_options(VipsImage** out, const char* text, const char* font, gint width, gint height, VipsAlign align, gboolean justify, gint dpi, gint spacing, const char* fontfile, gboolean rgba, VipsTextWrap wrap, gint* autofit_dpi); int vipsgen_thumbnail(const char* filename, VipsImage** out, gint width); -int vipsgen_thumbnail_with_options(const char* filename, VipsImage** out, gint width, gint height, VipsSize size, gboolean no_rotate, VipsInteresting crop, gboolean linear, const char* input_profile, const char* output_profile, VipsIntent intent, VipsFailOn fail_on); +int vipsgen_thumbnail_with_options(const char* filename, VipsImage** out, gint width, gint height, VipsSize size, gboolean no_rotate, VipsInteresting crop, gboolean linear, const char* import_profile, const char* export_profile, VipsIntent intent, VipsFailOn fail_on); int vipsgen_thumbnail_buffer(void* buf, size_t len, VipsImage** out, gint width); -int vipsgen_thumbnail_buffer_with_options(void* buf, size_t len, VipsImage** out, gint width, const char* option_string, gint height, VipsSize size, gboolean no_rotate, VipsInteresting crop, gboolean linear, const char* input_profile, const char* output_profile, VipsIntent intent, VipsFailOn fail_on); +int vipsgen_thumbnail_buffer_with_options(void* buf, size_t len, VipsImage** out, gint width, const char* option_string, gint height, VipsSize size, gboolean no_rotate, VipsInteresting crop, gboolean linear, const char* import_profile, const char* export_profile, VipsIntent intent, VipsFailOn fail_on); int vipsgen_thumbnail_image(VipsImage* in, VipsImage** out, gint width); -int vipsgen_thumbnail_image_with_options(VipsImage* in, VipsImage** out, gint width, gint height, VipsSize size, gboolean no_rotate, VipsInteresting crop, gboolean linear, const char* input_profile, const char* output_profile, VipsIntent intent, VipsFailOn fail_on); +int vipsgen_thumbnail_image_with_options(VipsImage* in, VipsImage** out, gint width, gint height, VipsSize size, gboolean no_rotate, VipsInteresting crop, gboolean linear, const char* import_profile, const char* export_profile, VipsIntent intent, VipsFailOn fail_on); int vipsgen_thumbnail_source(VipsSourceCustom* source, VipsImage** out, gint width); -int vipsgen_thumbnail_source_with_options(VipsSourceCustom* source, VipsImage** out, gint width, const char* option_string, gint height, VipsSize size, gboolean no_rotate, VipsInteresting crop, gboolean linear, const char* input_profile, const char* output_profile, VipsIntent intent, VipsFailOn fail_on); +int vipsgen_thumbnail_source_with_options(VipsSourceCustom* source, VipsImage** out, gint width, const char* option_string, gint height, VipsSize size, gboolean no_rotate, VipsInteresting crop, gboolean linear, const char* import_profile, const char* export_profile, VipsIntent intent, VipsFailOn fail_on); int vipsgen_tiffload(const char* filename, VipsImage** out); -int vipsgen_tiffload_with_options(const char* filename, VipsImage** out, gint page, gint n, gboolean autorotate, gint subifd, gboolean unlimited, gboolean memory, VipsAccess access, VipsFailOn fail_on, gboolean revalidate); +int vipsgen_tiffload_with_options(const char* filename, VipsImage** out, gint page, gint subifd, gint n, gboolean autorotate, gboolean memory, VipsAccess access, VipsFailOn fail_on, gboolean revalidate); int vipsgen_tiffload_buffer(void* buf, size_t len, VipsImage** out); -int vipsgen_tiffload_buffer_with_options(void* buf, size_t len, VipsImage** out, gint page, gint n, gboolean autorotate, gint subifd, gboolean unlimited, gboolean memory, VipsAccess access, VipsFailOn fail_on, gboolean revalidate); +int vipsgen_tiffload_buffer_with_options(void* buf, size_t len, VipsImage** out, gint page, gint subifd, gint n, gboolean autorotate, gboolean memory, VipsAccess access, VipsFailOn fail_on, gboolean revalidate); int vipsgen_tiffload_source(VipsSourceCustom* source, VipsImage** out); -int vipsgen_tiffload_source_with_options(VipsSourceCustom* source, VipsImage** out, gint page, gint n, gboolean autorotate, gint subifd, gboolean unlimited, gboolean memory, VipsAccess access, VipsFailOn fail_on, gboolean revalidate); +int vipsgen_tiffload_source_with_options(VipsSourceCustom* source, VipsImage** out, gint page, gint subifd, gint n, gboolean autorotate, gboolean memory, VipsAccess access, VipsFailOn fail_on, gboolean revalidate); int vipsgen_tiffsave(VipsImage* in, const char* filename); int vipsgen_tiffsave_with_options(VipsImage* in, const char* filename, VipsForeignTiffCompression compression, gint Q, VipsForeignTiffPredictor predictor, gboolean tile, gint tile_width, gint tile_height, gboolean pyramid, gboolean miniswhite, gint bitdepth, VipsForeignTiffResunit resunit, double xres, double yres, gboolean bigtiff, gboolean properties, VipsRegionShrink region_shrink, gint level, gboolean lossless, VipsForeignDzDepth depth, gboolean subifd, gboolean premultiply, VipsForeignKeep keep, double* background, int background_n, gint page_height, const char* profile);