Support webp (#145)

Author: sunshineplan

README.md

@@ -13,7 +13,7 @@
 Package imgconv provides basic image processing functions (resize, add watermark, format converter.).
 
 All the image processing functions provided by the package accept any image type that implements `image.Image` interface
-as an input, include jpg(jpeg), png, gif, tif(tiff), bmp, webp(decode only) and pdf.
+as an input, include jpg(jpeg), png, gif, tif(tiff), bmp, webp and pdf.
 
 ## Installation
 
@@ -30,6 +30,7 @@ This repo relies on the following third-party projects:
   * [disintegration/imaging](https://github.com/disintegration/imaging)
   * [pdfcpu/pdfcpu](https://github.com/pdfcpu/pdfcpu)
   * [hhrutter/tiff](https://github.com/hhrutter/tiff)
+  * [HugoSmits86/nativewebp](github.com/HugoSmits86/nativewebp)
 
 ## Usage examples
 

converter/go.mod

@@ -10,6 +10,7 @@ require (
 )
 
 require (
+	github.com/HugoSmits86/nativewebp v1.1.0 // indirect
 	github.com/hhrutter/lzw v1.0.0 // indirect
 	github.com/hhrutter/tiff v1.0.1 // indirect
 	github.com/mattn/go-runewidth v0.0.15 // indirect

converter/go.sum

@@ -1,3 +1,5 @@
+github.com/HugoSmits86/nativewebp v1.1.0 h1:4V8ftAa8nY7F4I2qof7A74qf2Fjnl3zSdllpnwpCG+E=
+github.com/HugoSmits86/nativewebp v1.1.0/go.mod h1:YNQuWenlVmSUUASVNhTDwf4d7FwYQGbGhklC8p72Vr8=
 github.com/hhrutter/lzw v1.0.0 h1:laL89Llp86W3rRs83LvKbwYRx6INE8gDn0XNb1oXtm0=
 github.com/hhrutter/lzw v1.0.0/go.mod h1:2HC6DJSn/n6iAZfgM3Pg+cP1KxeWc3ezG8bBqW5+WEo=
 github.com/hhrutter/tiff v1.0.1 h1:MIus8caHU5U6823gx7C6jrfoEvfSTGtEFRiM8/LOzC0=

converter/main.go

@@ -21,26 +21,27 @@ import (
 )
 
 var (
-	src             = flag.String("src", "", "")
-	dst             = flag.String("dst", "output", "")
-	test            = flag.Bool("test", false, "")
-	force           = flag.Bool("force", false, "")
-	pdf             = flag.Bool("pdf", false, "")
-	whiteBackground = flag.Bool("white-background", false, "")
-	gray            = flag.Bool("gray", false, "")
-	quality         = flag.Int("quality", 75, "")
-	autoOrientation = flag.Bool("auto-orientation", false, "")
-	watermark       = flag.String("watermark", "", "")
-	opacity         = flag.Uint("opacity", 128, "")
-	random          = flag.Bool("random", false, "")
-	offsetX         = flag.Int("x", 0, "")
-	offsetY         = flag.Int("y", 0, "")
-	width           = flag.Int("width", 0, "")
-	height          = flag.Int("height", 0, "")
-	percent         = flag.Float64("percent", 0, "")
-	worker          = flag.Int("worker", 5, "")
-	quiet           = flag.Bool("q", false, "")
-	debug           = flag.Bool("debug", false, "")
+	src               = flag.String("src", "", "")
+	dst               = flag.String("dst", "output", "")
+	test              = flag.Bool("test", false, "")
+	force             = flag.Bool("force", false, "")
+	pdf               = flag.Bool("pdf", false, "")
+	whiteBackground   = flag.Bool("white-background", false, "")
+	gray              = flag.Bool("gray", false, "")
+	quality           = flag.Int("quality", 75, "")
+	autoOrientation   = flag.Bool("auto-orientation", false, "")
+	useExtendedFormat = flag.Bool("use-extended-format", false, "")
+	watermark         = flag.String("watermark", "", "")
+	opacity           = flag.Uint("opacity", 128, "")
+	random            = flag.Bool("random", false, "")
+	offsetX           = flag.Int("x", 0, "")
+	offsetY           = flag.Int("y", 0, "")
+	width             = flag.Int("width", 0, "")
+	height            = flag.Int("height", 0, "")
+	percent           = flag.Float64("percent", 0, "")
+	worker            = flag.Int("worker", 5, "")
+	quiet             = flag.Bool("q", false, "")
+	debug             = flag.Bool("debug", false, "")
 
 	format      imgconv.Format
 	compression imgconv.TIFFCompression
@@ -60,7 +61,7 @@ func usage() {
   --pdf
 		convert pdf source (default: false)
   --format
-		output format (jpg, jpeg, png, gif, tif, tiff, bmp and pdf are supported, default: jpg)
+		output format (jpg, jpeg, png, gif, tif, tiff, bmp, pdf and webp are supported, default: jpg)
   --white-background
 		use white color for transparent background (default: false)
   --gray
@@ -71,6 +72,8 @@ func usage() {
 		set tiff compression type (none, deflate, default: deflate)
   --auto-orientation
 		auto orientation (default: false)
+  --use-extended-format
+		set webp to use extended format (default: false)
   --watermark
 		watermark path
   --opacity
@@ -165,6 +168,9 @@ func main() {
 	if format == imgconv.TIFF {
 		opts = append(opts, imgconv.TIFFCompressionType(compression))
 	}
+	if format == imgconv.WEBP {
+		opts = append(opts, imgconv.WEBPUseExtendedFormat(*useExtendedFormat))
+	}
 	if *whiteBackground {
 		opts = append(opts, imgconv.BackgroundColor(color.White))
 	}

format.go

@@ -10,12 +10,13 @@ import (
 	"image/jpeg"
 	"image/png"
 	"io"
+	"slices"
 	"strings"
 
+	"github.com/HugoSmits86/nativewebp"
 	"github.com/sunshineplan/pdf"
 	"golang.org/x/image/bmp"
 	"golang.org/x/image/tiff"
-	_ "golang.org/x/image/webp" // decode webp format
 )
 
 var (
@@ -34,6 +35,7 @@ const (
 	TIFF
 	BMP
 	PDF
+	WEBP
 )
 
 var formatExts = [][]string{
@@ -43,6 +45,7 @@ var formatExts = [][]string{
 	{"tif", "tiff"},
 	{"bmp"},
 	{"pdf"},
+	{"webp"},
 }
 
 func (f Format) String() (format string) {
@@ -55,14 +58,12 @@ func (f Format) String() (format string) {
 }
 
 // FormatFromExtension parses image format from filename extension:
-// "jpg" (or "jpeg"), "png", "gif", "tif" (or "tiff"), "bmp" and "pdf" are supported.
+// "jpg" (or "jpeg"), "png", "gif", "tif" (or "tiff"), "bmp", "pdf" and "webp" are supported.
 func FormatFromExtension(ext string) (Format, error) {
 	ext = strings.ToLower(ext)
 	for index, exts := range formatExts {
-		for _, i := range exts {
-			if ext == i {
-				return Format(index), nil
-			}
+		if slices.Contains(exts, ext) {
+			return Format(index), nil
 		}
 	}
 
@@ -137,13 +138,14 @@ type FormatOption struct {
 }
 
 type encodeConfig struct {
-	Quality             int
-	gifNumColors        int
-	gifQuantizer        draw.Quantizer
-	gifDrawer           draw.Drawer
-	pngCompressionLevel png.CompressionLevel
-	tiffCompressionType TIFFCompression
-	background          color.Color
+	Quality               int
+	gifNumColors          int
+	gifQuantizer          draw.Quantizer
+	gifDrawer             draw.Drawer
+	pngCompressionLevel   png.CompressionLevel
+	tiffCompressionType   TIFFCompression
+	webpUseExtendedFormat bool
+	background            color.Color
 }
 
 var defaultEncodeConfig = encodeConfig{
@@ -207,14 +209,22 @@ func TIFFCompressionType(compressionType TIFFCompression) EncodeOption {
 	}
 }
 
+// WEBPUseExtendedFormat returns EncodeOption that determines whether to use extended format
+// of the WEBP-encoded image. Default is false.
+func WEBPUseExtendedFormat(b bool) EncodeOption {
+	return func(c *encodeConfig) {
+		c.webpUseExtendedFormat = b
+	}
+}
+
 // BackgroundColor returns an EncodeOption that sets the background color.
 func BackgroundColor(color color.Color) EncodeOption {
 	return func(c *encodeConfig) {
 		c.background = color
 	}
 }
 
-// Encode writes the image img to w in the specified format (JPEG, PNG, GIF, TIFF, BMP or PDF).
+// Encode writes the image img to w in the specified format (JPEG, PNG, GIF, TIFF, BMP, PDF or WEBP).
 func (f *FormatOption) Encode(w io.Writer, img image.Image) error {
 	cfg := defaultEncodeConfig
 	for _, option := range f.EncodeOption {
@@ -259,6 +269,9 @@ func (f *FormatOption) Encode(w io.Writer, img image.Image) error {
 
 	case PDF:
 		return pdf.Encode(w, []image.Image{img}, &pdf.Options{Quality: cfg.Quality})
+
+	case WEBP:
+		return nativewebp.Encode(w, img, &nativewebp.Options{UseExtendedFormat: cfg.webpUseExtendedFormat})
 	}
 
 	return image.ErrFormat

go.mod

@@ -3,6 +3,7 @@ module github.com/sunshineplan/imgconv
 go 1.24
 
 require (
+	github.com/HugoSmits86/nativewebp v1.1.0
 	github.com/sunshineplan/pdf v1.0.7
 	golang.org/x/image v0.25.0
 )

go.sum

@@ -1,3 +1,5 @@
+github.com/HugoSmits86/nativewebp v1.1.0 h1:4V8ftAa8nY7F4I2qof7A74qf2Fjnl3zSdllpnwpCG+E=
+github.com/HugoSmits86/nativewebp v1.1.0/go.mod h1:YNQuWenlVmSUUASVNhTDwf4d7FwYQGbGhklC8p72Vr8=
 github.com/hhrutter/lzw v1.0.0 h1:laL89Llp86W3rRs83LvKbwYRx6INE8gDn0XNb1oXtm0=
 github.com/hhrutter/lzw v1.0.0/go.mod h1:2HC6DJSn/n6iAZfgM3Pg+cP1KxeWc3ezG8bBqW5+WEo=
 github.com/hhrutter/tiff v1.0.1 h1:MIus8caHU5U6823gx7C6jrfoEvfSTGtEFRiM8/LOzC0=