Forked off copying pixels in case of Chrome.

Added Log Timers as Diffs.
nparashuram · Jan 30, 2011 · 7a52cb0 · 7a52cb0
1 parent 6795c7b
commit 7a52cb0
Showing 1 changed file with 19 additions and 9 deletions.
diff --git a/index.html b/index.html
@@ -153,12 +153,22 @@ <h1 style ="text-align:center"><a href = "http://en.wikipedia.org/wiki/Seam_carv
                     worker.addEventListener("message", function(e){
                         switch (e.data.action) {
                             case "done":
-                                newImage = ctx.createImageData(e.data.image.width, e.data.image.height);
+                                var start = new Date().getTime();
-                                log("Reduced image available, copying it to canvas")
+                                log("Reduced image available, copying it to canvas");
-                                for (var i = 0; i < e.data.image.data.length; i++) {
+								var result = e.data.image;
-                                    newImage.data[i] = e.data.image.data[i];
+                                try {
+                                    ctx.putImageData(result, 0, 0);
+                                } 
+                                catch (e) {
+                                    log("Could not simply reassign the canvas, so copying the entire array");
+                                    var newImage = ctx.createImageData(result.width, result.height);
+                                    for (var i = 0; i < result.data.length; i++) {
+                                        newImage.data[i] = result.data[i];
+                                    }
+                                    ctx.putImageData(newImage, 0, 0);
                                 }
-                                ctx.putImageData(newImage, 0, 0);
+
+                                log("Array Copy time " + (new Date().getTime() - start))
                                 log("Reduced image placed on canvas");
                                 break;
                             default:
@@ -189,10 +199,10 @@ <h1 style ="text-align:center"><a href = "http://en.wikipedia.org/wiki/Seam_carv
             }
 
             function log(msg){
-                var time = new Date();
+                if (typeof startTime === "undefined") {
-                var t = time.toTimeString();
+                    startTime = new Date().getTime();
-                t = "<span style = 'color:GREEN'>" + t + "</span> " + msg;
+                }
-                $("#log").append($("<div>").html(t));
+                $("#log").append($("<div>").html("<span style = 'color:GREEN'>" + (new Date().getTime() - startTime) + "</span> : " + msg));
             }
 
             $("#images img").first().click();