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

Merge pull request #149 from waldophotos/master

Browse source 
Add backwards compatibility code for older `libvips` versions.
This commit is contained in:
Tomás Aparicio 2017-05-24 20:48:33 +01:00 • committed by GitHub
commit 2394a2d77e
4 changed files with 61 additions and 119 deletions
Download patch file Download diff file Expand all files Collapse all files

11
vips.go
View file

@ -612,15 +612,12 @@ func max(x int) int {
return int(math.Max(float64(x), 0))
}
func vipsDrawWatermark(image *C.VipsImage, watermark *C.VipsImage, o WatermarkImage) (*C.VipsImage, error) {
func vipsDrawWatermark(image *C.VipsImage, o WatermarkImage) (*C.VipsImage, error) {
var out *C.VipsImage
if !vipsHasAlpha(image) {
C.vips_add_band(image, &image, C.double(255.0))
}
if !vipsHasAlpha(watermark) {
C.vips_add_band(watermark, &watermark, C.double(255.0))
watermark, _, e := vipsRead(o.Buf)
if e != nil {
return nil, e
}
opts := vipsWatermarkImageOptions{C.int(o.Left), C.int(o.Top), C.float(o.Opacity)}