Updates everywhere (#5)

* Updates everywhere

* whelp

Dockerfile

@@ -1,7 +1,7 @@
-FROM golang:1.15-buster as builder
+FROM golang:1.20-buster as builder
 
-ENV GOLANGCI_VERSION "1.30.0"
-ENV GOLANGCI_SHASUM "c8e8fc5753e74d2eb489ad428dbce219eb9907799a57c02bcd8b80b4b98c60d4"
+ENV GOLANGCI_VERSION "1.53.3"
+ENV GOLANGCI_SHASUM "4f62007ca96372ccba54760e2ed39c2446b40ec24d9a90c21aad9f2fdf6cf0da"
 
 WORKDIR /app
 
@@ -12,19 +12,19 @@ RUN \
   && echo "deb http://deb.debian.org/debian experimental main" | tee -a /etc/apt/sources.list \
   && apt-get update \
   && apt-get install -t bullseye -y --no-install-recommends gcc-8-base libgcc-8-dev\
-# Start libheif
+  # Start libheif
   && apt-get install -t bullseye -y -o APT::Immediate-Configure=0 --no-install-recommends libheif-dev \
-# Start turbojpeg
+  # Start turbojpeg
   && apt-get install -t experimental -y --no-install-recommends libturbojpeg0-dev \
-# Install dep packages
+  # Install dep packages
   && apt-get install -t buster -y --no-install-recommends libwebp-dev libpng-dev autoconf libtool make nasm pkg-config libgomp1 \
   && apt-get clean
 
 # Install GolangCI
 RUN wget -q https://github.com/golangci/golangci-lint/releases/download/v$GOLANGCI_VERSION/golangci-lint-$GOLANGCI_VERSION-linux-amd64.tar.gz \
-    && echo -n "$GOLANGCI_SHASUM  golangci-lint-$GOLANGCI_VERSION-linux-amd64.tar.gz" | shasum -c - \
-    && tar xzf golangci-lint-$GOLANGCI_VERSION-linux-amd64.tar.gz \
-    && rm golangci-lint-$GOLANGCI_VERSION-linux-amd64.tar.gz
+  && echo -n "$GOLANGCI_SHASUM  golangci-lint-$GOLANGCI_VERSION-linux-amd64.tar.gz" | shasum -c - \
+  && tar xzf golangci-lint-$GOLANGCI_VERSION-linux-amd64.tar.gz \
+  && rm golangci-lint-$GOLANGCI_VERSION-linux-amd64.tar.gz
 
 COPY go.mod .
 COPY go.sum .

coding_test.go

@@ -7,8 +7,8 @@ import (
 	_ "image/gif"
 	_ "image/jpeg"
 	_ "image/png"
-	"io/ioutil"
 	"math"
+	"os"
 	"testing"
 
 	"github.com/Nr90/imgsim"
@@ -61,7 +61,7 @@ func makeTestImage() *image.Gray {
 }
 
 func readImageHash(filename string, t *testing.T, diffhash bool) imgsim.Hash {
-	imgbytes, err := ioutil.ReadFile(filename)
+	imgbytes, err := os.ReadFile(filename)
 	if err != nil {
 		t.Fatalf("Error reading file %v", err)
 	}

config_test.go

@@ -1,7 +1,7 @@
 package imagecoding
 
 import (
-	"io/ioutil"
+	"os"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -20,7 +20,7 @@ func TestConfig(t *testing.T) {
 		{"f2", "testdata/f2-exif.jpg", 40, 80},
 	}
 	for _, tt := range tests {
-		imgbytes, err := ioutil.ReadFile(tt.filename)
+		imgbytes, err := os.ReadFile(tt.filename)
 		assert.NoError(t, err)
 		exHeight := tt.height
 		exWidth := tt.width

go.mod

@@ -1,19 +1,23 @@
 module github.com/e-conomic/go-imagecoding
 
-go 1.15
+go 1.20
 
 require (
 	github.com/Nr90/imgsim v0.0.0-20180202144352-5caa057144b0
 	github.com/disintegration/imaging v1.6.2
-	github.com/h2non/filetype v1.1.0
-	github.com/harukasan/go-libwebp v0.0.0-20190703060927-68562c9c99af
-	github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 // indirect
-	github.com/pkg/errors v0.8.1 // indirect
+	github.com/h2non/filetype v1.1.3
+	github.com/harukasan/go-libwebp v0.0.0-20220408054828-61eedf90d768
 	github.com/rwcarlsen/goexif v0.0.0-20190401172101-9e8deecbddbd
-	github.com/stretchr/testify v1.4.0
-	github.com/strukturag/libheif v1.9.1
-	go.uber.org/atomic v1.4.0 // indirect
-	go.uber.org/multierr v1.1.0 // indirect
-	go.uber.org/zap v1.10.0
-	golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8
+	github.com/stretchr/testify v1.8.4
+	github.com/strukturag/libheif v1.11.0
+	go.uber.org/zap v1.26.0
+	golang.org/x/image v0.14.0
+)
+
+require (
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	go.uber.org/multierr v1.11.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -1,38 +1,33 @@
 github.com/Nr90/imgsim v0.0.0-20180202144352-5caa057144b0 h1:8cjsGKoi/1QBb0V2ps3iBra9c4o+qY/NaJ15NsdjmQ4=
 github.com/Nr90/imgsim v0.0.0-20180202144352-5caa057144b0/go.mod h1:PSWPVD+KeWK3XVt0i/AahAMRw38OZ1k1vJpJLuvIY1w=
-github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/disintegration/imaging v1.6.2 h1:w1LecBlG2Lnp8B3jk5zSuNqd7b4DXhcjwek1ei82L+c=
 github.com/disintegration/imaging v1.6.2/go.mod h1:44/5580QXChDfwIclfc/PCwrr44amcmDAg8hxG0Ewe4=
-github.com/h2non/filetype v1.1.0 h1:Or/gjocJrJRNK/Cri/TDEKFjAR+cfG6eK65NGYB6gBA=
-github.com/h2non/filetype v1.1.0/go.mod h1:319b3zT68BvV+WRj7cwy856M2ehB3HqNOt6sy1HndBY=
-github.com/harukasan/go-libwebp v0.0.0-20190703060927-68562c9c99af h1:WmgySY+bcDEGQ42RmkJhL5cPbnWi3nFpAyRuRxoofDY=
-github.com/harukasan/go-libwebp v0.0.0-20190703060927-68562c9c99af/go.mod h1:ldE44ycRKJi6dVHIWnbUlEJqHQUhK5gJ4TKIfAwFbCg=
+github.com/h2non/filetype v1.1.3 h1:FKkx9QbD7HR/zjK1Ia5XiBsq9zdLi5Kf3zGyFTAFkGg=
+github.com/h2non/filetype v1.1.3/go.mod h1:319b3zT68BvV+WRj7cwy856M2ehB3HqNOt6sy1HndBY=
+github.com/harukasan/go-libwebp v0.0.0-20220408054828-61eedf90d768 h1:6kHMeZ8a/fyiHlsR4fwBWaVh3KSBgsMrupXAA5pChfc=
+github.com/harukasan/go-libwebp v0.0.0-20220408054828-61eedf90d768/go.mod h1:ldE44ycRKJi6dVHIWnbUlEJqHQUhK5gJ4TKIfAwFbCg=
 github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 h1:zYyBkD/k9seD2A7fsi6Oo2LfFZAehjjQMERAvZLEDnQ=
 github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8=
-github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
-github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/rwcarlsen/goexif v0.0.0-20190401172101-9e8deecbddbd h1:CmH9+J6ZSsIjUK3dcGsnCnO41eRBOnY12zwkn5qVwgc=
 github.com/rwcarlsen/goexif v0.0.0-20190401172101-9e8deecbddbd/go.mod h1:hPqNNc0+uJM6H+SuU8sEs5K5IQeKccPqeSjfgcKGgPk=
-github.com/stretchr/objx v0.1.0 h1:4G4v2dO3VZwixGIRoQ5Lfboy6nUhCyYzaqnIAPPhYs4=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
-github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
-github.com/strukturag/libheif v1.9.1 h1:ek4y3HG8DUh6QDIS9KYtVht80V6sPqDTrI234ZGBalI=
-github.com/strukturag/libheif v1.9.1/go.mod h1:E/PNRlmVtrtj9j2AvBZlrO4dsBDu6KfwDZn7X1Ce8Ks=
-go.uber.org/atomic v1.4.0 h1:cxzIVoETapQEqDhQu3QfnvXAV4AlzcvUCxkVUFw3+EU=
-go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
-go.uber.org/multierr v1.1.0 h1:HoEmRHQPVSqub6w2z2d2EOVs2fjyFRGyofhKuyDq0QI=
-go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
-go.uber.org/zap v1.10.0 h1:ORx85nbTijNz8ljznvCMR1ZBIPKFn3jQrag10X2AsuM=
-go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
-golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8 h1:hVwzHzIUGRjiF7EcUjqNxk3NCfkPxbDKRdnNE1Rpg0U=
+github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
+github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
+github.com/strukturag/libheif v1.11.0 h1:HaWu5re98INSXNq7C8o5AwLcv2qD8+U7a+jVCpGWemI=
+github.com/strukturag/libheif v1.11.0/go.mod h1:E/PNRlmVtrtj9j2AvBZlrO4dsBDu6KfwDZn7X1Ce8Ks=
+go.uber.org/goleak v1.2.0 h1:xqgm/S+aQvhWFTtR0XK3Jvg7z8kGV8P4X14IzwN3Eqk=
+go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
+go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
+go.uber.org/zap v1.26.0 h1:sI7k6L95XOKS281NhVKOFCUNIvv9e0w4BF8N3u+tCRo=
+go.uber.org/zap v1.26.0/go.mod h1:dtElttAiwGvoJ/vj4IwHBS/gXsEu/pZ50mUIRWuG0so=
 golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
-golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
+golang.org/x/image v0.14.0 h1:tNgSxAFe3jC4uYqvZdTr84SZoM1KfwdC9SKIFrLjFn4=
+golang.org/x/image v0.14.0/go.mod h1:HUYqC05R2ZcZ3ejNQsIHQDQiwWM4JBqmm6MKANTp4LE=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
-gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

heif.go

@@ -1,3 +1,4 @@
+//go:build heif || darwin
 // +build heif darwin
 
 package imagecoding
@@ -6,9 +7,9 @@ import (
 	"image"
 	"image/color"
 	"runtime"
-)
 
-import "github.com/strukturag/libheif/go/heif"
+	"github.com/strukturag/libheif/go/heif"
+)
 
 func ConfigHeif(data []byte) (image.Config, string, error) {
 	if len(data) == 0 {

heif_test.go

@@ -1,16 +1,17 @@
+//go:build heif || darwin
 // +build heif darwin
 
 package imagecoding
 
 import (
-	"io/ioutil"
+	"os"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
 )
 
 func TestHeifTransform(t *testing.T) {
-	sample, err := ioutil.ReadFile("testdata/world-political.heic")
+	sample, err := os.ReadFile("testdata/world-political.heic")
 	if !assert.NoError(t, err) {
 		t.FailNow()
 	}
@@ -32,7 +33,7 @@ func TestHeifTransform(t *testing.T) {
 }
 
 func BenchmarkHeifTransform(b *testing.B) {
-	sample, err := ioutil.ReadFile("testdata/world-political.heic")
+	sample, err := os.ReadFile("testdata/world-political.heic")
 	if !assert.NoError(b, err) {
 		b.FailNow()
 	}

jpeg_test.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"image/jpeg"
 	"image/png"
-	"io/ioutil"
+	"os"
 	"testing"
 
 	"github.com/Nr90/imgsim"
@@ -20,7 +20,7 @@ func TestJpegExif(t *testing.T) {
 	for f := 1; f <= 8; f++ {
 		filename := fmt.Sprintf("testdata/f%d-exif.jpg", f)
 		t.Run(fmt.Sprintf("f%d-exif.jpg", f), func(t *testing.T) {
-			jpegbytes, err := ioutil.ReadFile(filename)
+			jpegbytes, err := os.ReadFile(filename)
 			if err != nil {
 				t.Fatalf("Error reading file %v", err)
 			}
@@ -59,7 +59,7 @@ func TestJpegConformance(t *testing.T) {
 		},
 	}
 	for _, tt := range tests {
-		jpegbytes, err := ioutil.ReadFile(tt.filename)
+		jpegbytes, err := os.ReadFile(tt.filename)
 		if err != nil {
 			t.Fatalf("Error reading file %v", err)
 		}
@@ -117,7 +117,7 @@ func BenchmarkJPEG(b *testing.B) {
 }
 
 func BenchmarkJPEGTransform(b *testing.B) {
-	sample, err := ioutil.ReadFile("testdata/world-political.jpg")
+	sample, err := os.ReadFile("testdata/world-political.jpg")
 	if !assert.NoError(b, err) {
 		b.FailNow()
 	}

orientation_test.go

@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"fmt"
 	"image/jpeg"
-	"io/ioutil"
+	"os"
 	"testing"
 
 	"github.com/Nr90/imgsim"
@@ -17,7 +17,7 @@ func TestJpegExifReference(t *testing.T) {
 	for f := 1; f <= 8; f++ {
 		filename := fmt.Sprintf("testdata/f%d-exif.jpg", f)
 		t.Run(fmt.Sprintf("f%d-exif.jpg", f), func(t *testing.T) {
-			jpegbytes, err := ioutil.ReadFile(filename)
+			jpegbytes, err := os.ReadFile(filename)
 			if err != nil {
 				t.Fatalf("Error reading file %v", err)
 			}

png_test.go

@@ -3,7 +3,7 @@ package imagecoding
 import (
 	"bytes"
 	"image/png"
-	"io/ioutil"
+	"os"
 	"testing"
 
 	"github.com/Nr90/imgsim"
@@ -35,7 +35,7 @@ func BenchmarkPNG(b *testing.B) {
 }
 
 func BenchmarkPNGComplex(b *testing.B) {
-	sample, err := ioutil.ReadFile("testdata/world-political.jpg")
+	sample, err := os.ReadFile("testdata/world-political.jpg")
 	if !assert.NoError(b, err) {
 		b.FailNow()
 	}

transform_test.go

@@ -1,14 +1,14 @@
 package imagecoding
 
 import (
-	"io/ioutil"
+	"os"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
 )
 
 func TestTransform(t *testing.T) {
-	sample, err := ioutil.ReadFile("testdata/gamer.png")
+	sample, err := os.ReadFile("testdata/gamer.png")
 	if !assert.NoError(t, err) {
 		t.FailNow()
 	}
@@ -31,7 +31,7 @@ func TestTransformNoError(t *testing.T) {
 		},
 	}
 	for _, tt := range tests {
-		sample, err := ioutil.ReadFile(tt.filename)
+		sample, err := os.ReadFile(tt.filename)
 		if !assert.NoError(t, err) {
 			t.FailNow()
 		}
@@ -51,7 +51,7 @@ func TestTransformEmpty(t *testing.T) {
 }
 
 func BenchmarkPNGTransform(b *testing.B) {
-	sample, err := ioutil.ReadFile("testdata/gamer.png")
+	sample, err := os.ReadFile("testdata/gamer.png")
 	if !assert.NoError(b, err) {
 		b.FailNow()
 	}