From 3a7b3f117064192dfe6f8121edb29a2bd9fcea5e Mon Sep 17 00:00:00 2001
From: Yoshihiro Yamazaki <yoya@awm.jp>
Date: Fri, 28 Dec 2012 10:14:12 +0900
Subject: [PATCH] =?utf8?q?-=20ctx=20=E3=81=8C=20bitmap=20=E3=81=AE?=
 =?utf8?q?=E6=99=82=E3=81=97=E3=81=8B=E7=94=A8=E6=84=8F=E3=81=97=E3=81=A6?=
 =?utf8?q?=E3=81=AA=E3=81=8B=E3=81=A3=E3=81=9F=E3=81=AE=E3=81=A7=20fillsty?=
 =?utf8?q?le=20=E5=87=A6=E7=90=86=E3=81=AE=E9=A0=AD=E3=81=AB=E7=A7=BB?=
 =?utf8?q?=E5=8B=951=20-=20color=20CSS=20=E3=81=AE=E5=87=BA=E5=8A=9B?=
 =?utf8?q?=E3=83=A1=E3=82=BD=E3=83=83=E3=83=89=E3=82=92=E9=9D=99=E7=9A=84?=
 =?utf8?q?=E3=81=AB=E4=BD=BF=E3=81=86=E3=82=88=E3=81=86=E4=BF=AE=E6=AD=A3?=
 =?utf8?q?=20-=20=E3=82=B9=E3=83=97=E3=83=A9=E3=82=A4=E3=83=B3=E6=9B=B2?=
 =?utf8?q?=E7=B7=9A=E3=81=A7=20ctx.ctx=20=E3=81=AE=E6=89=80=E3=82=92=20ctx?=
 =?utf8?q?=20=E3=81=AB=E4=BF=AE=E6=AD=A3=E3=80=82(canvas.ctx=20=E3=82=92?=
 =?utf8?q?=E7=BD=AE=E6=8F=9B=E3=81=97=E3=81=9F=E6=99=82=E3=81=AE=E5=A4=B1?=
 =?utf8?q?=E6=95=97=E8=B7=A1)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 src/shape.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/shape.js b/src/shape.js
index f5bf43f..5c41754 100644
--- a/src/shape.js
+++ b/src/shape.js
@@ -34,6 +34,7 @@ FlappShape.prototype = {
 	var lineStyles = shape.lineStyles;
 	var fillEdges = shape.edges.fillEdges;
 	var lineEdges = shape.edges.lineEdges;
+	rca.push("var ctx = canvas.ctx;");
 	for (var fillStyle in fillEdges) {
 	    // style
 	    var style = fillStyles[fillStyle - 1];
@@ -50,7 +51,7 @@ FlappShape.prototype = {
 	    var maxY = edgeInfoList.maxY;
 	    switch (style.type) {
 	    case 00:
-		styleCode = '"'+style.color.toCSS()+'"';
+		styleCode = '"'+FlappSWFRGBA.toCSS(style.color)+'"';
 		break;
             case 0x40:
             case 0x41:
@@ -61,7 +62,6 @@ FlappShape.prototype = {
 		} else {
 		    var bitmap = dict.get(style.bitmapId);
 		    var image = bitmap.image;
-		    rca.push("var ctx = canvas.ctx;");
 		    rca.push("var bitmap = dict.get("+style.bitmapId+");");
 		    rca.push("var image = bitmap.image;");
 		    rca.push("var canvas_im = document.createElement('canvas');");
@@ -117,7 +117,7 @@ FlappShape.prototype = {
 		    edgesUsed[currIndex] = 1; // used
 		    for (var i2 = 2, l2 = edges.length ; i2 < l2; ) {
 			if (types[i2 / 2 - 1] === 'C') {
-			    rca.push("ctx.ctx.quadraticCurveTo("+(edges[i2++]-minX)*factor+","+(edges[i2++]-minY)*factor+","+(edges[i2++]-minX)*factor+","+(edges[i2++]-minY)*factor+");");
+			    rca.push("ctx.quadraticCurveTo("+(edges[i2++]-minX)*factor+","+(edges[i2++]-minY)*factor+","+(edges[i2++]-minX)*factor+","+(edges[i2++]-minY)*factor+");");
 			} else {
 			    rca.push("ctx.lineTo("+(edges[i2++]-minX)*factor+","+(edges[i2++]-minY)*factor+");");
 			}
-- 
2.11.0