bkyk8rc3zvpnsf5inmcqq4n3k98cv6hj-my-site-hyper-literate-git.test.suzanne.soy-0.0.1

commit b5e473c5d9c65f395f70d77591889677b885180b
parent 96fc0407d0b8119f68030f834ed2b2af26161825
Author: Matthew Flatt <mflatt@racket-lang.org>
Date:   Mon, 12 May 2014 20:12:18 -0600

scribble: fix HTML scaling of GIFs

Even without scaling, declare the size of a PNG or GIF in HTML
output.

original commit: 3f3e6e4cb421e8004c4e0c5ee5944718bdd686a3

Diffstat:
M
pkgs/scribble-pkgs/scribble-lib/scribble/html-render.rkt
 | 
16
+++++++++++-----

1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/html-render.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/html-render.rkt
@@ -18,6 +18,7 @@
          net/uri-codec
          net/base64
          scheme/serialize
+         racket/draw/gif
          (prefix-in xml: xml/xml)
          (for-syntax scheme/base)
          "search.rkt"
@@ -1211,11 +1212,13 @@
          (let* ([src (collects-relative->path (image-element-path e))]
                 [suffixes (image-element-suffixes e)]
                 [scale (image-element-scale e)]
-                [to-num
+                [to-scaled-num
                  (lambda (s)
                    (number->string
                     (inexact->exact
-                     (floor (* scale (integer-bytes->integer s #f #t))))))]
+                     (floor (* scale (if (number? s)
+                                         s
+                                         (integer-bytes->integer s #f #t)))))))]
                 [src (select-suffix src suffixes '(".png" ".gif" ".svg"))]
                 [svg? (regexp-match? #rx#"[.]svg$" (if (path? src) (path->bytes src) src))]
                 [sz (cond
@@ -1242,7 +1245,6 @@
                              (if (and w h)
                                  `([width ,w][height ,h])
                                  null)))))]
-                     [(= 1.0 scale) null]
                      [else
                       ;; Try to extract file size:
                       (call-with-input-file*
@@ -1250,8 +1252,12 @@
                        (lambda (in)
                          (cond
                           [(regexp-try-match #px#"^\211PNG.{12}" in)
-                           `([width ,(to-num (read-bytes 4 in))]
-                             [height ,(to-num (read-bytes 4 in))])]
+                           `([width ,(to-scaled-num (read-bytes 4 in))]
+                             [height ,(to-scaled-num (read-bytes 4 in))])]
+                          [(regexp-try-match #px#"^(?=GIF8)" in)
+                           (define-values (w h rows) (gif->rgba-rows in))
+                           `([width ,(to-scaled-num w)]
+                             [height ,(to-scaled-num h)])]
                           [else
                            null])))])])
            (let ([srcref (let ([p (install-file src)])