highperfocused/imgproxy
1
0
Fork 0
mirror of https://github.com/imgproxy/imgproxy.git synced 2025-10-06 18:03:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix build with vips < 8.5.0

Browse Source
This commit is contained in:
DarthSim
2017-10-19 22:38:09 +06:00
parent fcf964f74e
commit c052b1f2ae
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
process.go
View File

@@ -376,7 +376,7 @@ func vipsSaveImage(img *C.struct__VipsImage, imgtype imageType) ([]byte, error)
} }
func vipsImageHasAlpha(img *C.struct__VipsImage) bool { func vipsImageHasAlpha(img *C.struct__VipsImage) bool {
return C.vips_image_hasalpha(img) > 0 return C.vips_image_hasalpha_go(img) > 0
} }
func vipsPremultiply(img **C.struct__VipsImage) (C.VipsBandFormat, error) { func vipsPremultiply(img **C.struct__VipsImage) (C.VipsBandFormat, error) {

14
vips.h
View File

@@ -5,6 +5,9 @@
#define VIPS_SUPPORT_SMARTCROP \ #define VIPS_SUPPORT_SMARTCROP \
(VIPS_MAJOR_VERSION > 8 || (VIPS_MAJOR_VERSION == 8 && VIPS_MINOR_VERSION >= 5)) (VIPS_MAJOR_VERSION > 8 || (VIPS_MAJOR_VERSION == 8 && VIPS_MINOR_VERSION >= 5))
#define VIPS_SUPPORT_HASALPHA \
(VIPS_MAJOR_VERSION > 8 || (VIPS_MAJOR_VERSION == 8 && VIPS_MINOR_VERSION >= 5))
#define VIPS_SUPPORT_GIF \ #define VIPS_SUPPORT_GIF \
VIPS_MAJOR_VERSION > 8 || (VIPS_MAJOR_VERSION == 8 && VIPS_MINOR_VERSION >= 3) VIPS_MAJOR_VERSION > 8 || (VIPS_MAJOR_VERSION == 8 && VIPS_MINOR_VERSION >= 3)
@@ -119,6 +122,17 @@ vips_band_format(VipsImage *in) {
return in->BandFmt; return in->BandFmt;
} }
gboolean
vips_image_hasalpha_go(VipsImage * in) {
#if VIPS_SUPPORT_HASALPHA
return vips_image_hasalpha(in);
#else
return( image->Bands == 2 ||
(image->Bands == 4 && image->Type != VIPS_INTERPRETATION_CMYK) ||
image->Bands > 4 );
#endif
}
int int
vips_premultiply_go(VipsImage *in, VipsImage **out) { vips_premultiply_go(VipsImage *in, VipsImage **out) {
return vips_premultiply(in, out, NULL); return vips_premultiply(in, out, NULL);