luciano/d2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add exif to png

Browse source
This commit is contained in:
Alexander Wang 2023-03-13 17:58:47 -07:00
parent d1040bf4f8
commit 0292ea2627
No known key found for this signature in database
GPG key ID: D89FA31966BDBECE
6 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
d2cli/main.go
View file

@ -432,10 +432,10 @@ func _render(ctx context.Context, ms *xmain.State, plugin d2plugin.Plugin, sketc
if err != nil { if err != nil {
return svg, err return svg, err
} }
// out, err = png.AddExif(out) out, err = png.AddExif(out)
// if err != nil { if err != nil {
// return svg, err return svg, err
// } }
} else { } else {
if len(out) > 0 && out[len(out)-1] != '\n' { if len(out) > 0 && out[len(out)-1] != '\n' {
out = append(out, '\n') out = append(out, '\n')

2
d2renderers/d2svg/d2svg.go
View file

@ -1780,7 +1780,7 @@ func Render(diagram *d2target.Diagram, opts *RenderOpts) ([]byte, error) {
dimensions = fmt.Sprintf(` width="%d" height="%d"`, w, h) 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"`, `xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"`,
version.Version, version.Version,
w, h, w, h,

BIN
e2etests-cli/testdata/TestCLI_E2E/hello_world_png.exp.png vendored
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

BIN
e2etests-cli/testdata/TestCLI_E2E/hello_world_png_pad.exp.png vendored
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 72 KiB

After

Width:  |  Height:  |  Size: 72 KiB

BIN
e2etests-cli/testdata/TestCLI_E2E/hello_world_png_sketch.exp.png vendored
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 28 KiB

After

Width:  |  Height:  |  Size: 28 KiB

5
lib/png/png.go
View file

@ -13,6 +13,7 @@ import (
pngstruct "github.com/dsoprea/go-png-image-structure/v2" pngstruct "github.com/dsoprea/go-png-image-structure/v2"
"github.com/playwright-community/playwright-go" "github.com/playwright-community/playwright-go"
"oss.terrastruct.com/d2/lib/version"
"oss.terrastruct.com/util-go/xmain" "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) ib := exif.NewIfdBuilder(im, ti, exifcommon.IfdStandardIfdIdentity, exifcommon.TestDefaultByteOrder)
err = ib.AddStandardWithName("ImageWidth", []uint32{11}) err = ib.AddStandardWithName("Make", "D2")
if err != nil { if err != nil {
return nil, err return nil, err
} }
err = ib.AddStandardWithName("ImageLength", []uint32{22}) err = ib.AddStandardWithName("Model", version.Version)
if err != nil { if err != nil {
return nil, err return nil, err
} }