Revert "Fix for memory issue when watermarking images"

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

View file

@ -354,7 +354,13 @@ func watermarkImageWithAnotherImage(image *C.VipsImage, w WatermarkImage) (*C.Vi
w.Opacity = 1.0
}
image, err := vipsDrawWatermark(image, w)
watermark, _, err := loadImage(w.Buf)
if err != nil {
return nil, err
}
image, err = vipsDrawWatermark(image, watermark, w)
if err != nil {
return nil, err