From 7170832f93731567ff1d4812506ac44c30be92dd Mon Sep 17 00:00:00 2001 From: Henry Date: Sat, 14 May 2016 01:32:59 +0000 Subject: [PATCH 1/2] Check if there is an alpha channel before flattening --- vips.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/vips.go b/vips.go index f63c8a6..f5cdc3c 100644 --- a/vips.go +++ b/vips.go @@ -274,13 +274,14 @@ func vipsFlattenBackground(image *C.VipsImage, background Color) (*C.VipsImage, C.double(background.B), } - err := C.vips_flatten_background_brigde(image, &outImage, (*C.double)(&backgroundC[0])) - if int(err) != 0 { - return nil, catchVipsError() - } - + if vipsHasAlpha(image) { + err := C.vips_flatten_background_brigde(image, &outImage, (*C.double)(&backgroundC[0])) + if int(err) != 0 { + return nil, catchVipsError() + } C.g_object_unref(C.gpointer(image)) image = outImage + } return image, nil } From 5f7342a9aa2441deaa32734b55b913ce9584b9fd Mon Sep 17 00:00:00 2001 From: Henry Date: Sat, 14 May 2016 01:35:27 +0000 Subject: [PATCH 2/2] Fix formatting --- vips.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vips.go b/vips.go index f5cdc3c..ba68cba 100644 --- a/vips.go +++ b/vips.go @@ -279,8 +279,8 @@ func vipsFlattenBackground(image *C.VipsImage, background Color) (*C.VipsImage, if int(err) != 0 { return nil, catchVipsError() } - C.g_object_unref(C.gpointer(image)) - image = outImage + C.g_object_unref(C.gpointer(image)) + image = outImage } return image, nil