Merge branch 'master' into version/2.1

This commit is contained in:
DarthSim
2018-10-25 22:49:14 +06:00
6 changed files with 24 additions and 8 deletions

View File

@@ -341,6 +341,11 @@ func processImage(ctx context.Context) ([]byte, error) {
if err = vipsSmartCrop(&img, po.Width, po.Height); err != nil {
return nil, err
}
// Applying additional modifications after smart crop causes SIGSEGV on Alpine
// so we have to copy memory after it
if err = vipsImageCopyMemory(&img); err != nil {
return nil, err
}
} else {
left, top := calcCrop(imgWidth, imgHeight, po)
if err = vipsCrop(&img, left, top, po.Width, po.Height); err != nil {