From 0292ea2627a0491087a225aa07fef9787699262d Mon Sep 17 00:00:00 2001
From: Alexander Wang <alex@terrastruct.com>
Date: Mon, 13 Mar 2023 17:58:47 -0700
Subject: [PATCH] add exif to png

---
 d2cli/main.go                                 |   8 ++++----
 d2renderers/d2svg/d2svg.go                    |   2 +-
 .../TestCLI_E2E/hello_world_png.exp.png       | Bin 15325 -> 15387 bytes
 .../TestCLI_E2E/hello_world_png_pad.exp.png   | Bin 73528 -> 73590 bytes
 .../hello_world_png_sketch.exp.png            | Bin 28779 -> 28841 bytes
 lib/png/png.go                                |   5 +++--
 6 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/d2cli/main.go b/d2cli/main.go
index 4d7fbb68c..40f0617e8 100644
--- a/d2cli/main.go
+++ b/d2cli/main.go
@@ -432,10 +432,10 @@ func _render(ctx context.Context, ms *xmain.State, plugin d2plugin.Plugin, sketc
 		if err != nil {
 			return svg, err
 		}
-		// out, err = png.AddExif(out)
-		// if err != nil {
-		//   return svg, err
-		// }
+		out, err = png.AddExif(out)
+		if err != nil {
+			return svg, err
+		}
 	} else {
 		if len(out) > 0 && out[len(out)-1] != '\n' {
 			out = append(out, '\n')
diff --git a/d2renderers/d2svg/d2svg.go b/d2renderers/d2svg/d2svg.go
index 70e05bd46..7fd1fddf5 100644
--- a/d2renderers/d2svg/d2svg.go
+++ b/d2renderers/d2svg/d2svg.go
@@ -1780,7 +1780,7 @@ func Render(diagram *d2target.Diagram, opts *RenderOpts) ([]byte, error) {
 		dimensions = fmt.Sprintf(` width="%d" height="%d"`, w, h)
 	}
 
-	fitToScreenWrapper := fmt.Sprintf(`<svg %s d2:version="%s" preserveAspectRatio="xMinYMin meet" viewBox="0 0 %d %d"%s>`,
+	fitToScreenWrapper := fmt.Sprintf(`<svg %s d2Version="%s" preserveAspectRatio="xMinYMin meet" viewBox="0 0 %d %d"%s>`,
 		`xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"`,
 		version.Version,
 		w, h,
diff --git a/e2etests-cli/testdata/TestCLI_E2E/hello_world_png.exp.png b/e2etests-cli/testdata/TestCLI_E2E/hello_world_png.exp.png
index 613ca9a6337b4c45eed3355693af6b4305db717c..69d0fe8d2de25caec80d6cc134833467f828eb77 100644
GIT binary patch
delta 70
zcmcaxKD%OqinUQ{glC$sFM}2X0|N&G6C*zZ6OhI1V#L6}C;(>j0QqV_%ur^aXQXGM
S>*4C?!myc(<L5@jJ=Orn-weS3

delta 10
RcmbPTakqSe%EqLf)&L$P1tS0e

diff --git a/e2etests-cli/testdata/TestCLI_E2E/hello_world_png_pad.exp.png b/e2etests-cli/testdata/TestCLI_E2E/hello_world_png_pad.exp.png
index 296288588f1d201e1152eb956d58535f39132215..2d59ba2a4f9a953eb417b5bba2b42d8b233ced83 100644
GIT binary patch
delta 75
zcmdn7kLBAwmI*4>MyU~=X}-P;S_}*f91Kj1{0vM$7PE^H0|TP~n9T#^s{t`XnSq{>
Xo{6r9tD_6UW-gAOjfz_p8O7xRDNqe^

delta 15
Wcmeyik7dU`mI*42Nn4W`MdSfHVFncd

diff --git a/e2etests-cli/testdata/TestCLI_E2E/hello_world_png_sketch.exp.png b/e2etests-cli/testdata/TestCLI_E2E/hello_world_png_sketch.exp.png
index e421fbb38c3b3a630aa0201cb1b6d5a9dd4cd2a8..728970d7b0458b63e2b62d7b39766cc0ef41e68f 100644
GIT binary patch
delta 72
zcmaF;fN|wR#tACcMyU~=X}-P;S_}*f91Kj1{0vM$7PE^H0|TP~n9T#^s{t`XnSq{>
Uo{6r9tD_6UW-gAO8x_3@01Q42bN~PV

delta 12
TcmZ4akn!~c#tAALliUjcDf0!^

diff --git a/lib/png/png.go b/lib/png/png.go
index 9b5fb3b4b..ae0d08d7f 100644
--- a/lib/png/png.go
+++ b/lib/png/png.go
@@ -13,6 +13,7 @@ import (
 	pngstruct "github.com/dsoprea/go-png-image-structure/v2"
 	"github.com/playwright-community/playwright-go"
 
+	"oss.terrastruct.com/d2/lib/version"
 	"oss.terrastruct.com/util-go/xmain"
 )
 
@@ -109,12 +110,12 @@ func AddExif(png []byte) ([]byte, error) {
 
 	ib := exif.NewIfdBuilder(im, ti, exifcommon.IfdStandardIfdIdentity, exifcommon.TestDefaultByteOrder)
 
-	err = ib.AddStandardWithName("ImageWidth", []uint32{11})
+	err = ib.AddStandardWithName("Make", "D2")
 	if err != nil {
 		return nil, err
 	}
 
-	err = ib.AddStandardWithName("ImageLength", []uint32{22})
+	err = ib.AddStandardWithName("Model", version.Version)
 	if err != nil {
 		return nil, err
 	}