gabehf/bimg
1
0
Fork 0
mirror of https://github.com/talgo-cloud/bimg.git synced 2026-03-14 09:55:56 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "Fix for memory issue when watermarking images"

Browse source
This commit is contained in:
Tomás Aparicio 2017-04-05 09:58:54 +01:00 • committed by GitHub
parent df01dc8240
commit cd2e0bb57d
4 changed files with 118 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

11
vips.go
View file

@ -596,12 +596,15 @@ func max(x int) int {
return int(math.Max(float64(x), 0))
}
func vipsDrawWatermark(image *C.VipsImage, o WatermarkImage) (*C.VipsImage, error) {
func vipsDrawWatermark(image *C.VipsImage, watermark *C.VipsImage, o WatermarkImage) (*C.VipsImage, error) {
var out *C.VipsImage
watermark, _, e := vipsRead(o.Buf)
if e != nil {
return nil, e
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))
}
opts := vipsWatermarkImageOptions{C.int(o.Left), C.int(o.Top), C.float(o.Opacity)}