gabehf/bimg
1
0
Fork 0
mirror of https://github.com/talgo-cloud/bimg.git synced 2026-03-07 21:48:13 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(reduce): resolve conflicts with master

Browse source
This commit is contained in:
Tomas Aparicio 2017-09-10 20:30:24 +02:00
commit bd028cd5da
3 changed files with 22 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
resizer.go
View file

@ -199,7 +199,11 @@ func transformImage(image *C.VipsImage, o Options, shrink int, residual float64)
}
if o.Force || residual != 0 {
image, err = vipsAffine(image, residualx, residualy, o.Interpolator)
if residualx < 1 && residualy < 1 {
image, err = vipsReduce(image, 1/residualx, 1/residualy)
} else {
image, err = vipsAffine(image, residualx, residualy, o.Interpolator)
}
if err != nil {
return nil, err
}

12
vips.go
View file

@ -528,6 +528,18 @@ func vipsShrink(input *C.VipsImage, shrink int) (*C.VipsImage, error) {
return image, nil
}
func vipsReduce(input *C.VipsImage, xshrink float64, yshrink float64) (*C.VipsImage, error) {
var image *C.VipsImage
defer C.g_object_unref(C.gpointer(input))
err := C.vips_reduce_bridge(input, &image, C.double(xshrink), C.double(yshrink))
if err != 0 {
return nil, catchVipsError()
}
return image, nil
}
func vipsEmbed(input *C.VipsImage, left, top, width, height int, extend Extend, background Color) (*C.VipsImage, error) {
var image *C.VipsImage

5
vips.h
View file

@ -122,6 +122,11 @@ vips_shrink_bridge(VipsImage *in, VipsImage **out, double xshrink, double yshrin
return vips_shrink(in, out, xshrink, yshrink, NULL);
}
int
vips_reduce_bridge(VipsImage *in, VipsImage **out, double xshrink, double yshrink) {
return vips_reduce(in, out, xshrink, yshrink, NULL);
}
int
vips_type_find_bridge(int t) {
if (t == GIF) {