NewFromBytesWithFormat -> nil

imagedata/image_data.go

@@ -95,7 +95,8 @@ func Init() error {
 func loadWatermark() error {
 	var err error
 
-	if len(config.WatermarkData) > 0 {
+	switch {
+	case len(config.WatermarkData) > 0:
 		Watermark, err = NewFromBase64(config.WatermarkData, security.DefaultOptions())
 
 		// NOTE: this should be something like err = ierrors.Wrap(err).WithStackDeep(0).WithPrefix("watermark")
@@ -104,20 +105,21 @@ func loadWatermark() error {
 		if err != nil {
 			return ierrors.Wrap(err, 0, ierrors.WithPrefix("can't load watermark from Base64"))
 		}
-	}
 
-	if len(config.WatermarkPath) > 0 {
+	case len(config.WatermarkPath) > 0:
 		Watermark, err = NewFromPath(config.WatermarkPath, security.DefaultOptions())
 		if err != nil {
 			return ierrors.Wrap(err, 0, ierrors.WithPrefix("can't read watermark from file"))
 		}
-	}
 
-	if len(config.WatermarkURL) > 0 {
+	case len(config.WatermarkURL) > 0:
 		Watermark, err = Download(context.Background(), config.WatermarkURL, "watermark", DownloadOptions{Header: nil, CookieJar: nil}, security.DefaultOptions())
 		if err != nil {
 			return ierrors.Wrap(err, 0, ierrors.WithPrefix("can't download from URL"))
 		}
+
+	default:
+		Watermark = nil
 	}
 
 	return nil
@@ -139,8 +141,12 @@ func loadFallbackImage() (err error) {
 
 	case len(config.FallbackImageURL) > 0:
 		FallbackImage, err = Download(context.Background(), config.FallbackImageURL, "fallback image", DownloadOptions{Header: nil, CookieJar: nil}, security.DefaultOptions())
+		if err != nil {
+			return ierrors.Wrap(err, 0, ierrors.WithPrefix("can't download from URL"))
+		}
+
 	default:
-		FallbackImage, err = nil, nil
+		FallbackImage = nil
 	}
 
 	if FallbackImage != nil && err == nil && config.FallbackImageTTL > 0 {

imagedata/read.go

@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"context"
 	"io"
-	"net/http"
 
 	"github.com/imgproxy/imgproxy/v3/bufpool"
 	"github.com/imgproxy/imgproxy/v3/bufreader"
@@ -50,7 +49,7 @@ func readAndCheckImage(r io.Reader, contentLength int, secopts security.Options)
 		return nil, imagefetcher.WrapError(err)
 	}
 
-	i := NewFromBytesWithFormat(meta.Format(), buf.Bytes(), make(http.Header))
+	i := NewFromBytesWithFormat(meta.Format(), buf.Bytes(), nil)
 	i.AddCancel(cancel)
 	return i, nil
 }

vips/vips.go

@@ -470,7 +470,7 @@ func (img *Image) Save(imgtype imagetype.Type, quality int) (imagedata.ImageData
 
 	b := ptrToBytes(ptr, int(imgsize))
 
-	i := imagedata.NewFromBytesWithFormat(imgtype, b, make(http.Header))
+	i := imagedata.NewFromBytesWithFormat(imgtype, b, nil)
 	i.AddCancel(cancel)
 
 	return i, nil