Skip to content

Commit a8090ff

Browse files
authored
Ignore sisze when source is GIF (#233)
* Ignore sisze when source is GIF * error strings should not be capitalized (ST1005)
1 parent 2c0dd15 commit a8090ff

File tree

1 file changed

+24
-1
lines changed

1 file changed

+24
-1
lines changed

encoder.go

+24-1
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,17 @@ func avifEncoder(p1, p2 string, quality int, extraParams ExtraParams) error {
114114
return err
115115
}
116116

117+
// Ignore Unknown, WebP, AVIF
118+
ignoreList := []vips.ImageType{vips.ImageTypeUnknown, vips.ImageTypeWEBP, vips.ImageTypeAVIF}
119+
120+
imageFormat := img.Format()
121+
for _, ignore := range ignoreList {
122+
if imageFormat == ignore {
123+
// Return err to render original image
124+
return errors.New("encoder: ignore image type")
125+
}
126+
}
127+
117128
if config.EnableExtraParams {
118129
err = resizeImage(img, extraParams)
119130
if err != nil {
@@ -175,6 +186,17 @@ func webpEncoder(p1, p2 string, quality int, extraParams ExtraParams) error {
175186
return err
176187
}
177188

189+
// Ignore Unknown, WebP, AVIF
190+
ignoreList := []vips.ImageType{vips.ImageTypeUnknown, vips.ImageTypeWEBP, vips.ImageTypeAVIF}
191+
192+
imageFormat := img.Format()
193+
for _, ignore := range ignoreList {
194+
if imageFormat == ignore {
195+
// Return err to render original image
196+
return errors.New("encoder: ignore image type")
197+
}
198+
}
199+
178200
if config.EnableExtraParams {
179201
err = resizeImage(img, extraParams)
180202
if err != nil {
@@ -183,7 +205,8 @@ func webpEncoder(p1, p2 string, quality int, extraParams ExtraParams) error {
183205
}
184206

185207
// The maximum pixel dimensions of a WebP image is 16383 x 16383.
186-
if img.Metadata().Width > webpMax || img.Metadata().Height > webpMax {
208+
// But GIF is exception, it can be larger than 16383
209+
if (img.Metadata().Width > webpMax || img.Metadata().Height > webpMax) && imageFormat != vips.ImageTypeGIF {
187210
return errors.New("WebP: image too large")
188211
}
189212

0 commit comments

Comments
 (0)