From af5174456a6bba7b09cb8b75cb3317d8d7f621d7 Mon Sep 17 00:00:00 2001
From: Antoni Sawicki <tenox@google.com>
Date: Wed, 13 Nov 2019 00:22:07 -0800
Subject: [PATCH] add propper img src width and height and log dimension

---
 wrp.go | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/wrp.go b/wrp.go
index 0d6cd3f..5548745 100644
--- a/wrp.go
+++ b/wrp.go
@@ -12,6 +12,7 @@ import (
 	"context"
 	"flag"
 	"fmt"
+	"image"
 	"image/gif"
 	"image/png"
 	"log"
@@ -287,6 +288,7 @@ func (w wrpReq) capture(c string, out http.ResponseWriter) {
 	mappath := fmt.Sprintf("/map/%04d.map", seq)
 	ismap[mappath] = w
 	var ssize string
+	var sw, sh int
 	if w.T == "gif" {
 		i, err := png.Decode(bytes.NewReader(pngcap))
 		if err != nil {
@@ -303,14 +305,19 @@ func (w wrpReq) capture(c string, out http.ResponseWriter) {
 		}
 		img[imgpath] = gifbuf
 		ssize = fmt.Sprintf("%.1f MB", float32(len(gifbuf.Bytes()))/1024.0/1024.0)
-		log.Printf("%s Encoded GIF image: %s, Size: %s, Colors: %d\n", c, imgpath, ssize, w.C)
+		sw = i.Bounds().Max.X
+		sh = i.Bounds().Max.Y
+		log.Printf("%s Encoded GIF image: %s, Size: %s, Colors: %d, %dx%d\n", c, imgpath, ssize, w.C, sw, sh)
 	} else if w.T == "png" {
 		pngbuf := bytes.NewBuffer(pngcap)
 		img[imgpath] = *pngbuf
+		cfg, _, _ := image.DecodeConfig(pngbuf)
 		ssize = fmt.Sprintf("%.1f MB", float32(len(pngbuf.Bytes()))/1024.0/1024.0)
-		log.Printf("%s Got PNG image: %s, Size: %s\n", c, imgpath, ssize)
+		sw = cfg.Width
+		sh = cfg.Height
+		log.Printf("%s Got PNG image: %s, Size: %s, %dx%d\n", c, imgpath, ssize, sw, sh)
 	}
-	fmt.Fprintf(out, "<A HREF=\"%s\"><IMG SRC=\"%s\" BORDER=\"0\" ALT=\"Url: %s, Size: %s\" ISMAP></A>", mappath, imgpath, w.U, ssize)
+	fmt.Fprintf(out, "<A HREF=\"%s\"><IMG SRC=\"%s\" BORDER=\"0\" ALT=\"Url: %s, Size: %s\" WIDTH=\"%d\" HEIGHT=\"%d\" ISMAP></A>", mappath, imgpath, w.U, ssize, sw, sh)
 	w.printFooter(out, fmt.Sprintf("%d PX", h), ssize)
 	log.Printf("%s Done with caputure for %s\n", c, w.U)
 }