Fix image flip

git-svn-id: https://explorercanvas.googlecode.com/svn/trunk@52 fd59bba8-8519-0410-9389-e36bf2bdbbd6
arv · Apr 14, 2009 · 08ccb63 · 08ccb63
2 parents 0bb5789 + 40972e0
commit 08ccb63
Show file tree

Hide file tree

Showing 14 changed files with 78 additions and 21 deletions.
diff --git a/excanvas.js b/excanvas.js
@@ -115,7 +115,6 @@ if (!document.createElement('canvas').getContext) {
             'text-align:left;width:300px;height:150px}' +
             'g_vml_\\:*{behavior:url(#default#VML)}' +
             'g_o_\\:*{behavior:url(#default#VML)}';
-
       }
 
       // find all canvas elements
@@ -135,7 +134,6 @@ if (!document.createElement('canvas').getContext) {
      */
     initElement: function(el) {
       if (!el.getContext) {
-
         el.getContext = getContext;
 
         // Remove fallback content. There is no way to hide text nodes so we
@@ -539,7 +537,8 @@ if (!document.createElement('canvas').getContext) {
     // The following check doesn't account for skews (which don't exist
     // in the canvas spec (yet) anyway.
 
-    if (this.m_[0][0] != 1 || this.m_[0][1]) {
+    if (this.m_[0][0] != 1 || this.m_[0][1] ||
+        this.m_[1][1] != 1 || this.m_[1][0]) {
       var filter = [];
 
       // Note the 12/21 reversal

diff --git a/testcases/arc.html b/testcases/arc.html
@@ -9,7 +9,7 @@
 }
 
 </style>
-<!--[if IE]><script type="text/javascript" src="../excanvas.js"></script><![endif]-->
+<!--[if IE]><script src="../excanvas.js"></script><![endif]-->
 <script>
 
 window.onload = function() {

diff --git a/testcases/clearpath.html b/testcases/clearpath.html
@@ -9,7 +9,7 @@
 }
 
 </style>
-<!--[if IE]><script type="text/javascript" src="../excanvas.js"></script><![endif]-->
+<!--[if IE]><script src="../excanvas.js"></script><![endif]-->
 <script>
 
 window.onload = function() {

diff --git a/testcases/draw-image-flip.html b/testcases/draw-image-flip.html
@@ -0,0 +1,57 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Overflow Test</title>
+<style>
+
+body {
+  text-align: center
+}
+
+</style>
+<!--[if IE]><script src="../excanvas.js"></script><![endif]-->
+<script>
+
+function draw() {
+  var ctx = document.getElementById('c').getContext('2d');
+  var w = 608 / 2;
+  var h = 380 / 2;
+
+  ctx.save();
+  ctx.translate(w, 0);
+  ctx.drawImage(img, 0, 0, w, h);
+  ctx.restore();
+
+  ctx.save();
+  ctx.translate(w, 0);
+  ctx.scale(-1, 1);
+  ctx.drawImage(img, 0, 0, w, h);
+  ctx.restore();
+
+  ctx.save();
+  ctx.translate(w, 2 * h);
+  ctx.scale(1, -1);
+  ctx.drawImage(img, 0, 0, w, h);
+  ctx.restore();
+
+  ctx.save();
+  ctx.translate(w, 2 * h);
+  ctx.scale(-1, -1);
+  ctx.drawImage(img, 0, 0, w, h);
+  ctx.restore();
+};
+
+var img = new Image;
+img.onload = draw;
+window.onload = function() {
+  img.src = '../examples/ff.jpg';
+};
+
+</script>
+</head>
+<body>
+
+<canvas id=c width=608 height=380></canvas>
+
+</body>
+</html>
diff --git a/testcases/drawimage.html b/testcases/drawimage.html
@@ -9,7 +9,7 @@
 }
 
 </style>
-<!--[if IE]><script type="text/javascript" src="../excanvas.js"></script><![endif]-->
+<!--[if IE]><script src="../excanvas.js"></script><![endif]-->
 <script>
 
 window.onload = function() {

diff --git a/testcases/gradient.html b/testcases/gradient.html
@@ -9,7 +9,7 @@
 }
 
 </style>
-<!--[if IE]><script type="text/javascript" src="../excanvas.js"></script><![endif]-->
+<!--[if IE]><script src="../excanvas.js"></script><![endif]-->
 <script>
 
 window.onload = function() {

diff --git a/testcases/gradient2.html b/testcases/gradient2.html
@@ -5,11 +5,12 @@
 <style>
 
 body {
-  text-align: center
+  text-align: center;
+  background: pink
 }
 
 </style>
-<!--[if IE]><script type="text/javascript" src="../excanvas.js"></script><![endif]-->
+<!--[if IE]><script src="../excanvas.js"></script><![endif]-->
 <script>
 
 window.onload = function() {

diff --git a/testcases/linewidth.html b/testcases/linewidth.html
@@ -9,7 +9,7 @@
 }
 
 </style>
-<!--[if IE]><script type="text/javascript" src="../excanvas.js"></script><![endif]-->
+<!--[if IE]><script src="../excanvas.js"></script><![endif]-->
 <script>
 
 window.onload = function() {
@@ -44,4 +44,4 @@
 using sub pixel coordinates.</p>
 
 </body>
-</html>
+</html>
diff --git a/testcases/overflow.html b/testcases/overflow.html
@@ -9,18 +9,18 @@
 }
 
 </style>
-<!--[if IE]><script type="text/javascript" src="../excanvas.js"></script><![endif]-->
+<!--[if IE]><script src="../excanvas.js"></script><![endif]-->
 <script>
 
 window.onload = function() {
   var ctx = document.getElementById('c').getContext('2d');
-	
+
   ctx.fillStyle = 'blue';
   ctx.fillRect(-50, -50, 100, 100);
-  
+
   ctx.fillStyle = 'green';
   ctx.fillRect(50, 50, 100, 100);
-  
+
   ctx.strokeStyle = 'black';
   ctx.strokeRect(0, 0, 100, 100);
 };
@@ -34,4 +34,4 @@
 <p>This tests if content gets cropped if painting outside the canvas.</p>
 
 </body>
-</html>
+</html>
diff --git a/testcases/quadraticcurve.html b/testcases/quadraticcurve.html
@@ -9,7 +9,7 @@
 }
 
 </style>
-<!--[if IE]><script type="text/javascript" src="../excanvas.js"></script><![endif]-->
+<!--[if IE]><script src="../excanvas.js"></script><![endif]-->
 <script>
 
 window.onload = function() {

diff --git a/testcases/resizing.html b/testcases/resizing.html
@@ -1,7 +1,7 @@
 <html>
 <head>
   <title>ExplorerCanvas Text Case</title>
-  <!--[if IE]><script type="text/javascript" src="../excanvas.js"></script><![endif]-->
+  <!--[if IE]><script src="../excanvas.js"></script><![endif]-->
   <script>
     // Safari is known not to handle resizing well, expect this to
     // compare to Firefox

diff --git a/testcases/saverestorepath.html b/testcases/saverestorepath.html
@@ -9,7 +9,7 @@
 }
 
 </style>
-<!--[if IE]><script type="text/javascript" src="../excanvas.js"></script><![endif]-->
+<!--[if IE]><script src="../excanvas.js"></script><![endif]-->
 <script>
 
 window.onload = function() {

diff --git a/testcases/stroke-scale-rotate.html b/testcases/stroke-scale-rotate.html
@@ -13,7 +13,7 @@
 }
 
 </style>
-<!--[if IE]><script type="text/javascript" src="../excanvas.js"></script><![endif]-->
+<!--[if IE]><script src="../excanvas.js"></script><![endif]-->
 <script>
 
 // draw a star

diff --git a/testcases/stroke-should-not-close-path.html b/testcases/stroke-should-not-close-path.html
@@ -9,7 +9,7 @@
 }
 
 </style>
-<!--[if IE]><script type="text/javascript" src="../excanvas.js"></script><![endif]-->
+<!--[if IE]><script src="../excanvas.js"></script><![endif]-->
 <script>
 
 window.onload = function() {