From 9bb3bdb51b46f9ae90925aa66170e760a63b58c9 Mon Sep 17 00:00:00 2001
From: yeqown <yeqown@gmail.com>
Date: Sat, 30 Mar 2024 11:23:09 +0800
Subject: [PATCH] fix(writer): transparent takes no effect on halftone image

---
 example/with-halftone/README.md               |  26 +++++++++++++---
 .../with-halftone/halftone-qr-transparent.png | Bin 0 -> 6874 bytes
 .../{halftone-qr.jpeg => halftone-qr.png}     | Bin
 example/with-halftone/main.go                 |  24 +++++++++++++--
 writer/standard/writer.go                     |  29 +++++++++++++++---
 5 files changed, 69 insertions(+), 10 deletions(-)
 create mode 100644 example/with-halftone/halftone-qr-transparent.png
 rename example/with-halftone/{halftone-qr.jpeg => halftone-qr.png} (100%)

diff --git a/example/with-halftone/README.md b/example/with-halftone/README.md
index e11e4e9..a53be2b 100644
--- a/example/with-halftone/README.md
+++ b/example/with-halftone/README.md
@@ -4,16 +4,33 @@
 > the gap between qr blocks could mislead the recognizer.
 
 ```go
+
+var (
+	transparent = flag.Bool("transparent", false, "set background to transparent")
+)
+
 func main() {
 	qrc, err := qrcode.New("https://github.com/yeqown/go-qrcode")
 	if err != nil {
 		panic(err)
 	}
-
-	w0, err := standard.New("./repository_qrcode.png",
+	
+	options := []standard.ImageOption{
 		standard.WithHalftone("./test.jpeg"),
 		standard.WithQRWidth(21),
-	)
+	}
+	filename := "./halftone-qr.png"
+	
+	if *transparent {
+		options = append(
+			options,
+			standard.WithBuiltinImageEncoder(standard.PNG_FORMAT),
+			standard.WithBgTransparent(),
+		)
+		filename = "./halftone-qr-transparent.png"
+	}
+	
+	w0, err := standard.New(filename, options...)
 	handleErr(err)
 	err = qrc.Save(w0)
 	handleErr(err)
@@ -26,4 +43,5 @@ func main() {
 
 #### output image
 
-<img src="./halftone-qr.jpeg">
\ No newline at end of file
+<img src="./halftone-qr.png">
+<img src="./halftone-qr-transparent.png">
diff --git a/example/with-halftone/halftone-qr-transparent.png b/example/with-halftone/halftone-qr-transparent.png
new file mode 100644
index 0000000000000000000000000000000000000000..1ef970c044d90ad77ba78d7817fed1ea7db1af7e
GIT binary patch
literal 6874
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

literal 0
HcmV?d00001

diff --git a/example/with-halftone/halftone-qr.jpeg b/example/with-halftone/halftone-qr.png
similarity index 100%
rename from example/with-halftone/halftone-qr.jpeg
rename to example/with-halftone/halftone-qr.png
diff --git a/example/with-halftone/main.go b/example/with-halftone/main.go
index 3a06021..e629068 100644
--- a/example/with-halftone/main.go
+++ b/example/with-halftone/main.go
@@ -1,20 +1,40 @@
 package main
 
 import (
+	"flag"
+
 	"github.com/yeqown/go-qrcode/v2"
 	"github.com/yeqown/go-qrcode/writer/standard"
 )
 
+var (
+	transparent = flag.Bool("transparent", false, "set background to transparent")
+)
+
 func main() {
+	flag.Parse()
+
 	qrc, err := qrcode.New("https://github.com/yeqown/go-qrcode")
 	if err != nil {
 		panic(err)
 	}
 
-	w0, err := standard.New("./repository_qrcode.png",
+	options := []standard.ImageOption{
 		standard.WithHalftone("./test.jpeg"),
 		standard.WithQRWidth(21),
-	)
+	}
+	filename := "./halftone-qr.png"
+
+	if *transparent {
+		options = append(
+			options,
+			standard.WithBuiltinImageEncoder(standard.PNG_FORMAT),
+			standard.WithBgTransparent(),
+		)
+		filename = "./halftone-qr-transparent.png"
+	}
+
+	w0, err := standard.New(filename, options...)
 	handleErr(err)
 	err = qrc.Save(w0)
 	handleErr(err)
diff --git a/writer/standard/writer.go b/writer/standard/writer.go
index 5f8f13a..b5c2581 100644
--- a/writer/standard/writer.go
+++ b/writer/standard/writer.go
@@ -139,7 +139,7 @@ func draw(mat qrcode.Matrix, opt *outputImageOptions) image.Image {
 			60,
 		)
 
-		//_ = imgkit.Save(halftoneImg, "mask.jpeg")
+		// _ = imgkit.Save(halftoneImg, "mask.jpeg")
 	}
 
 	// iterate the matrix to Draw each pixel
@@ -168,10 +168,10 @@ func draw(mat qrcode.Matrix, opt *outputImageOptions) image.Image {
 			for i := 0; i < 3; i++ {
 				for j := 0; j < 3; j++ {
 					ctx2.x, ctx2.y = ctx.x+float64(i)*halftoneW, ctx.y+float64(j)*halftoneW
-					ctx2.color = halftoneImg.At(x*3+i, y*3+j)
 					if i == 1 && j == 1 {
 						ctx2.color = ctx.color
-						// only center block keep the origin color.
+					} else {
+						ctx2.color = halftoneColor(halftoneImg, opt.bgTransparent, x*3+i, y*3+j)
 					}
 					shape.Draw(ctx2)
 				}
@@ -197,13 +197,34 @@ func draw(mat qrcode.Matrix, opt *outputImageOptions) image.Image {
 		}
 
 		// DONE(@yeqown): calculate the xOffset and yOffset which point(xOffset, yOffset)
-		//should icon upper-left to start
+		// should icon upper-left to start
 		dc.DrawImage(opt.logoImage(), (w-logoWidth)/2, (h-logoHeight)/2)
 	}
 done:
 	return dc.Image()
 }
 
+// halftoneImage is an image.Gray type image, which At(x, y) return color.Gray.
+// black equals to color.Gray{0}, white equals to color.Gray{255}.
+func halftoneColor(halftoneImage image.Image, transparent bool, x, y int) color.Color {
+
+	c0 := halftoneImage.At(x, y)
+	c1, ok := halftoneImage.At(x, y).(color.Gray)
+	if !ok {
+		log.Printf("halftoneColor: not a gray image, got: %T\n", c0)
+		return c0
+	}
+
+	if c1.Y == 255 {
+		if transparent {
+			return color.RGBA{}
+		}
+		return color.RGBA{R: 255, G: 255, B: 255, A: 255}
+	}
+
+	return color.RGBA{A: 255}
+}
+
 func validLogoImage(qrWidth, qrHeight, logoWidth, logoHeight, logoSizeMultiplier int) bool {
 	return qrWidth >= logoSizeMultiplier*logoWidth && qrHeight >= logoSizeMultiplier*logoHeight
 }