Merge pull request #7 from adalberht/return-png-images-as-it-is-when-…

…jpeg-quality-is-set-to-100 Return PNG images as it is when JPEG quality is set to 100
gojek · Jul 16, 2019 · 7f6483a · 7f6483a
2 parents 1ffa16b + a816634
commit 7f6483a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/pkg/processor/native/encoder.go b/pkg/processor/native/encoder.go
@@ -68,7 +68,7 @@ func (e *Encoders) GetEncoder(img image.Image, ext string) Encoder {
 		return e.jpegEncoder
 	}
 	if ext == "png" {
-		if isOpaque(img) {
+		if e.options.JpegQuality != 100 && isOpaque(img) {
 			return e.jpegEncoder
 		}
 		return e.pngEncoder

diff --git a/pkg/processor/native/encoder_test.go b/pkg/processor/native/encoder_test.go
@@ -46,14 +46,24 @@ func TestNewEncoders(t *testing.T) {
 
 func (s *EncoderSuite) TestEncoders_GetEncoder() {
 	encoders := NewEncoders(DefaultCompressionOptions)
+
 	_, ok := (encoders.GetEncoder(s.opaqueImage, "jpg")).(*JpegEncoder)
 	assert.True(s.T(), ok)
+
 	_, ok = (encoders.GetEncoder(s.opaqueImage, "jpeg")).(*JpegEncoder)
 	assert.True(s.T(), ok)
+
+	encoders.options.JpegQuality = 99
 	_, ok = (encoders.GetEncoder(s.opaqueImage, "png")).(*JpegEncoder)
 	assert.True(s.T(), ok)
+
+	encoders.options.JpegQuality = 100
+	_, ok = (encoders.GetEncoder(s.opaqueImage, "png")).(*PngEncoder)
+	assert.True(s.T(), ok)
+
 	_, ok = (encoders.GetEncoder(s.transparentImage, "png")).(*PngEncoder)
 	assert.True(s.T(), ok)
+
 	_, ok = (encoders.GetEncoder(image.Black, "unknown")).(*NopEncoder)
 	assert.True(s.T(), ok)
 }