Change libjpeg library, rename tag

This commit is contained in:
Milan Nikolic
2025-06-13 17:01:56 +02:00
parent 948fe29079
commit 4a09c9b803
5 changed files with 23 additions and 40 deletions

View File

@@ -1,14 +1,12 @@
//go:build turbo
// +build turbo
//go:build !libjpeg
// Package image.
package image
import (
"image"
"image/jpeg"
"io"
jpeg "github.com/antonini/golibjpegturbo"
)
// NewDecoder returns a new Decoder.

View File

@@ -1,13 +1,13 @@
//go:build !turbo
// +build !turbo
//go:build libjpeg
// Package image.
package image
import (
"image"
"image/jpeg"
"io"
"github.com/pixiv/go-libjpeg/jpeg"
)
// NewDecoder returns a new Decoder.
@@ -22,5 +22,9 @@ type Decoder struct {
// Decode decodes image from JPEG.
func (d Decoder) Decode() (image.Image, error) {
return jpeg.Decode(d.r)
return jpeg.Decode(d.r, &jpeg.DecoderOptions{
DCTMethod: jpeg.DCTFloat,
DisableFancyUpsampling: true,
DisableBlockSmoothing: true,
})
}

View File

@@ -1,14 +1,12 @@
//go:build turbo
// +build turbo
//go:build !libjpeg
// Package image.
package image
import (
"image"
"image/jpeg"
"io"
jpeg "github.com/antonini/golibjpegturbo"
)
// NewEncoder returns a new Encoder.

View File

@@ -1,13 +1,13 @@
//go:build !turbo
// +build !turbo
//go:build libjpeg
// Package image.
package image
import (
"image"
"image/jpeg"
"io"
"github.com/pixiv/go-libjpeg/jpeg"
)
// NewEncoder returns a new Encoder.
@@ -22,10 +22,7 @@ type Encoder struct {
// Encode encodes image to JPEG.
func (e Encoder) Encode(img image.Image) error {
err := jpeg.Encode(e.w, img, &jpeg.Options{Quality: 75})
if err != nil {
return err
}
return nil
return jpeg.Encode(e.w, img, &jpeg.EncoderOptions{
Quality: 75,
})
}