From 3881e0c0856e22039e9f6d9359101df6c1bd8b37 Mon Sep 17 00:00:00 2001
From: Danny Yoo <dyoo@cs.wpi.edu>
Date: Tue, 17 Jan 2012 12:38:33 -0500
Subject: [PATCH] fixing image width and height bug in resources

---
 examples/iron-puzzle/iron-puzzle.rkt |  4 ++++
 resource/specialize/js-impl.js       | 31 +++++++++++++++++++---------
 2 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/examples/iron-puzzle/iron-puzzle.rkt b/examples/iron-puzzle/iron-puzzle.rkt
index 2547f72..b054399 100644
--- a/examples/iron-puzzle/iron-puzzle.rkt
+++ b/examples/iron-puzzle/iron-puzzle.rkt
@@ -19,6 +19,8 @@
 
 
 distorted-image              
+(image-width distorted-image)
+(image-height distorted-image)
 
 ;; We will want to decompose the image into its individual pixels.  We can use
 ;; image->color-list to do this.
@@ -60,3 +62,5 @@ dark-image
 ;; the landmark.
 
 red-eye-image
+(image-width red-eye-image)
+(image-height red-eye-image)
diff --git a/resource/specialize/js-impl.js b/resource/specialize/js-impl.js
index 4a6708b..538eff6 100644
--- a/resource/specialize/js-impl.js
+++ b/resource/specialize/js-impl.js
@@ -31,10 +31,10 @@ var isImagePath = function(s) {
 
 
 // A lot of this comes from image/private/kernel.js
-var injectImageMethods = function(r, img) {
+var injectImageMethods = function(r, img, after) {
     r.img = img;
-    r.getHeight = function() { return img.width; };
-    r.getWidth = function() { return img.height; };
+    r.getWidth = function() { return img.width; };
+    r.getHeight = function() { return img.height; };
     r.getBaseline = function() { return img.height; };
     r.updatePinhole = function() {
         var aCopy = plt.baselib.clone(this);
@@ -43,20 +43,29 @@ var injectImageMethods = function(r, img) {
         return aCopy;
     };
     r.render = function(ctx, x, y) {
-        installHackToSupportAnimatedGifs(r);
         ctx.drawImage(r.animationHackImg, x, y);
     };
     r.toDomNode = function(params) {
         return img.cloneNode(true);
     };
+
+    installHackToSupportAnimatedGifs(r, after);
 };
 
-var installHackToSupportAnimatedGifs = function(r) {
-    if (r.animationHackImg) { return; }
+var installHackToSupportAnimatedGifs = function(r, after) {
     r.animationHackImg = r.img.cloneNode(true);
     document.body.appendChild(r.animationHackImg);
     r.animationHackImg.width = 0;
     r.animationHackImg.height = 0;
+    
+    if (r.animationHackImg.complete) {
+        after();
+    } else {
+        r.animationHackImg.onload = function() {
+            delete (r.animationHackImg.onload);
+            after();
+        };
+    }
 };
 
 
@@ -79,10 +88,12 @@ EXPORTS['specialize!'] = makeClosure(
                     rawImage.onload = function() {
                         delete(rawImage.onload);
                         delete(rawImage.onerror);
-                        injectImageMethods(resource, rawImage);
-                        restart(function(MACHINE) {
-                            return finalizeClosureCall(MACHINE, resource);
-                        });
+                        var after = function() {
+                            restart(function(MACHINE) {
+                                return finalizeClosureCall(MACHINE, resource);
+                            });
+                        };
+                        injectImageMethods(resource, rawImage, after);
                     };
                     rawImage.onerror = function(e) {
                         delete(rawImage.onload);