refactor: drop nfnt/resize dependency (#6897)

* refactor: replace github.com/nfnt/resize usage with x/draw

* refactor: replace nfnt/resize

* fix: TestCompressToFileLimits new image size

* chore: make vendor

* fix: update test image files

* fix: manager_test

* chore: minor typo fix

* refactor: replace cutter with standard library

* chore: make vendor

* fix: update images

* test: fix TestCrop

Author: igor-sirotin

_assets/tests/elephant_expected_large.jpg

@@ -40,8 +40,6 @@ require (
 	github.com/multiformats/go-multibase v0.2.0
 	github.com/multiformats/go-multihash v0.2.3
 	github.com/multiformats/go-varint v0.0.7
-	github.com/nfnt/resize v0.0.0-00010101000000-000000000000
-	github.com/oliamb/cutter v0.2.2
 	github.com/pborman/uuid v1.2.0
 	github.com/pkg/errors v0.9.1
 	github.com/prometheus/client_golang v1.20.5

_assets/tests/elephant_expected_thumbnail.jpg

@@ -1611,8 +1611,6 @@ github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn
 github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo=
 github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec=
 github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=
-github.com/oliamb/cutter v0.2.2 h1:Lfwkya0HHNU1YLnGv2hTkzHfasrSMkgv4Dn+5rmlk3k=
-github.com/oliamb/cutter v0.2.2/go.mod h1:4BenG2/4GuRBDbVm/OPahDVqbrOemzpPiG5mi1iryBU=
 github.com/onsi/ginkgo v0.0.0-20151202141238-7f8ab55aaf3b/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
@@ -2076,8 +2074,6 @@ github.com/status-im/mvds v0.0.27-0.20241031073756-b192c603a75d h1:+eBm+aBGFgXsJ
 github.com/status-im/mvds v0.0.27-0.20241031073756-b192c603a75d/go.mod h1:2fiAx0q9XYIPKYRq2B1oiO9zZESy/n4D32gWw6lMDsE=
 github.com/status-im/notify v1.0.2-status h1:x8wev0Sh8H8KAf4bVcv+L0dVHldBESOKUlqRqRY7uL8=
 github.com/status-im/notify v1.0.2-status/go.mod h1:gF3zSOrafR9DQEWSE8TjfI9NkooDxbyT4UgRGKZA0lc=
-github.com/status-im/resize v0.0.0-20201215164250-7c6d9f0d3088 h1:ClCAP2FPCvl8hGMhbUx/tq/sOu2wibztAa5jAvQEe4Q=
-github.com/status-im/resize v0.0.0-20201215164250-7c6d9f0d3088/go.mod h1:+92j1tN27DypDeBFxkg0uzkqfh1bNHTZe3Bv2PjvxpM=
 github.com/status-im/tcp-shaker v1.1.1-status h1:TnVeeWlq2SKCWotHc4Vi6qZQfY8TTe3VLmu1xpEFYhg=
 github.com/status-im/tcp-shaker v1.1.1-status/go.mod h1:RYo/itke1oU5k/6sj9DNM3QAwtE5rZSgg5JnkOv83hk=
 github.com/status-im/zxcvbn-go v0.0.0-20220311183720-5e8676676857 h1:sPkzT7Z7uLmejOsBRlZ0kwDWpqjpHJsp834o5nbhqho=

_assets/tests/status_expected_large.jpg

@@ -10,8 +10,6 @@ import (
 	"io"
 	"regexp"
 	"strings"
-
-	"github.com/nfnt/resize"
 )
 
 type EncodeConfig struct {
@@ -78,12 +76,12 @@ func CompressToFileLimits(bb *bytes.Buffer, img image.Image, bounds FileSizeLimi
 	if img.Bounds().Max.X > img.Bounds().Max.Y {
 		// X is longer
 		if img.Bounds().Max.X > longSideMax {
-			img = resize.Resize(uint(longSideMax), 0, img, resize.Bilinear)
+			img = resizeImage(img, longSideMax, 0)
 		}
 	} else {
 		// Y is longer or equal
 		if img.Bounds().Max.Y > longSideMax {
-			img = resize.Resize(0, uint(longSideMax), img, resize.Bilinear)
+			img = resizeImage(img, 0, longSideMax)
 		}
 	}
 
@@ -97,7 +95,7 @@ func CompressToFileLimits(bb *bytes.Buffer, img image.Image, bounds FileSizeLimi
 			return err
 		}
 
-		img = ResizeTo(95, img)
+		img = Scale(95, img)
 	}
 }
 

_assets/tests/status_expected_thumbnail.jpg

@@ -98,7 +98,7 @@ func TestCompressToFileLimits(t *testing.T) {
 	bb := bytes.NewBuffer([]byte{})
 	err = CompressToFileLimits(bb, img, FileSizeLimits{50000, 350000})
 	require.NoError(t, err)
-	require.Equal(t, 291645, bb.Len())
+	require.Equal(t, 292395, bb.Len())
 }
 
 func TestGetPayloadFromURI(t *testing.T) {

go.mod

@@ -7,11 +7,8 @@ import (
 	"image/color"
 	"image/draw"
 	"image/png"
-	"math"
 	"os"
 
-	"github.com/nfnt/resize"
-	"github.com/oliamb/cutter"
 	"go.uber.org/zap"
 	xdraw "golang.org/x/image/draw"
 
@@ -31,40 +28,75 @@ func (c *Circle) Bounds() image.Rectangle {
 func (c *Circle) At(x, y int) color.Color {
 	xx, yy, rr := float64(x-c.X)+0.5, float64(y-c.Y)+0.5, float64(c.R)
 	if xx*xx+yy*yy < rr*rr {
-		return color.Alpha{255}
+		return color.Alpha{A: 255}
 	}
-	return color.Alpha{0}
+	return color.Alpha{A: 0}
+}
+
+// Calculates scaling factors using old and new image dimensions.
+func calcFactors(width, height int, oldWidth, oldHeight float64) (scaleX, scaleY float64) {
+	if width == 0 {
+		if height == 0 {
+			scaleX = 1.0
+			scaleY = 1.0
+		} else {
+			scaleY = oldHeight / float64(height)
+			scaleX = scaleY
+		}
+	} else {
+		scaleX = oldWidth / float64(width)
+		if height == 0 {
+			scaleY = scaleX
+		} else {
+			scaleY = oldHeight / float64(height)
+		}
+	}
+	return
+}
+
+func resizeImage(img image.Image, width int, height int) image.Image {
+	scaleX, scaleY := calcFactors(width, height, float64(img.Bounds().Dx()), float64(img.Bounds().Dy()))
+	if width == 0 {
+		width = int(0.7 + float64(img.Bounds().Dx())/scaleX)
+	}
+	if height == 0 {
+		height = int(0.7 + float64(img.Bounds().Dy())/scaleY)
+	}
+
+	out := image.NewNRGBA(image.Rect(0, 0, width, height))
+	xdraw.BiLinear.Scale(out, out.Bounds(), img, img.Bounds(), draw.Over, nil)
+	return out
 }
 
 func Resize(size ResizeDimension, img image.Image) image.Image {
-	var width, height uint
+	var width, height int
 
 	switch {
 	case img.Bounds().Max.X == img.Bounds().Max.Y:
-		width, height = uint(size), uint(size)
+		width, height = int(size), int(size)
 	case img.Bounds().Max.X > img.Bounds().Max.Y:
-		width, height = 0, uint(size)
+		width, height = 0, int(size)
 	default:
-		width, height = uint(size), 0
+		width, height = int(size), 0
 	}
 
 	logutils.ZapLogger().Info("resizing",
 		zap.Uint("size", uint(size)),
-		zap.Uint("width", width),
-		zap.Uint("height", height))
+		zap.Int("width", width),
+		zap.Int("height", height))
 
-	return resize.Resize(width, height, img, resize.Bilinear)
+	return resizeImage(img, width, height)
 }
 
-func ResizeTo(percent int, img image.Image) image.Image {
-	width := uint(img.Bounds().Max.X * percent / 100)
-	height := uint(img.Bounds().Max.Y * percent / 100)
+func Scale(percent int, img image.Image) image.Image {
+	width := img.Bounds().Max.X * percent / 100
+	height := img.Bounds().Max.Y * percent / 100
 
-	return resize.Resize(width, height, img, resize.Bilinear)
+	return resizeImage(img, width, height)
 }
 
 func ShrinkOnly(size ResizeDimension, img image.Image) image.Image {
-	finalSize := int(math.Min(float64(size), math.Min(float64(img.Bounds().Dx()), float64(img.Bounds().Dy()))))
+	finalSize := min(int(size), img.Bounds().Dx(), img.Bounds().Dy())
 	return Resize(ResizeDimension(finalSize), img)
 }
 
@@ -78,11 +110,14 @@ func Crop(img image.Image, rect image.Rectangle) (image.Image, error) {
 		)
 	}
 
-	return cutter.Crop(img, cutter.Config{
-		Width:  rect.Dx(),
-		Height: rect.Dy(),
-		Anchor: rect.Min,
-	})
+	// Use standard library cropping via SubImage on an RGBA buffer
+	// Ensure the requested rectangle is within the image bounds (checked above)
+	// Create a new RGBA of the crop size and draw from the source offset by rect.Min
+	cropW, cropH := rect.Dx(), rect.Dy()
+	out := image.NewRGBA(image.Rect(0, 0, cropW, cropH))
+	// Source point corresponds to rect.Min in the original image
+	draw.Draw(out, out.Bounds(), img, rect.Min, draw.Src)
+	return out, nil
 }
 
 // CropCenter takes an image, usually downloaded from a URL

go.sum

@@ -3,6 +3,7 @@ package images
 import (
 	"bytes"
 	"errors"
+	"fmt"
 	"image"
 	"testing"
 
@@ -145,7 +146,7 @@ func TestCrop(t *testing.T) {
 		{
 			"elephant.jpg",
 			[]params{
-				{topLeftSquare, topLeftSquare, 1447, nil},
+				{topLeftSquare, topLeftSquare, 1459, nil},
 				{offsetSquare, rect, 0, errors.New("crop dimensions out of bounds of image, image width '80px' & height '80px'; crop bottom right coordinate at X '160px' Y '160px'")},
 				{outOfBoundsSquare, rect, 0, errors.New("crop dimensions out of bounds of image, image width '80px' & height '80px'; crop bottom right coordinate at X '1000000px' Y '1000000px'")},
 			},
@@ -180,21 +181,24 @@ func TestCrop(t *testing.T) {
 		img, err := Decode(path + c.Filename)
 		require.NoError(t, err)
 
-		for _, p := range c.Params {
-			cImg, err := Crop(img, p.Rectangle)
-			if p.CropError != nil {
-				require.EqualError(t, err, p.CropError.Error())
-				continue
-			} else {
+		for i, p := range c.Params {
+			testName := fmt.Sprintf("%s-%d", c.Filename, i+1)
+			t.Run(testName, func(t *testing.T) {
+				cImg, err := Crop(img, p.Rectangle)
+				if p.CropError != nil {
+					require.EqualError(t, err, p.CropError.Error())
+					return
+				}
+
 				require.NoError(t, err)
-			}
-			require.Exactly(t, p.OutputBound.Dx(), cImg.Bounds().Dx(), c.Filename)
-			require.Exactly(t, p.OutputBound.Dy(), cImg.Bounds().Dy(), c.Filename)
+				require.Exactly(t, p.OutputBound.Dx(), cImg.Bounds().Dx(), c.Filename)
+				require.Exactly(t, p.OutputBound.Dy(), cImg.Bounds().Dy(), c.Filename)
 
-			bb := bytes.NewBuffer([]byte{})
-			err = Encode(bb, cImg, options)
-			require.NoError(t, err)
-			require.Exactly(t, p.OutputSize, bb.Len())
+				bb := bytes.NewBuffer([]byte{})
+				err = Encode(bb, cImg, options)
+				require.NoError(t, err)
+				require.Exactly(t, p.OutputSize, bb.Len())
+			})
 		}
 	}
 }