svnno****@sourc*****
svnno****@sourc*****
2009年 5月 20日 (水) 21:16:05 JST
Revision: 1179 http://svn.sourceforge.jp/view?root=sie&view=rev&rev=1179 Author: dhrname Date: 2009-05-20 21:16:05 +0900 (Wed, 20 May 2009) Log Message: ----------- Modified Paths: -------------- branches/04x/048/sie.js Modified: branches/04x/048/sie.js =================================================================== --- branches/04x/048/sie.js 2009-05-20 12:07:57 UTC (rev 1178) +++ branches/04x/048/sie.js 2009-05-20 12:16:05 UTC (rev 1179) @@ -807,9 +807,10 @@ this.y = new STLength((rect.getAttribute("y") || 0), h); this.width = new STLength(rect.getAttribute("svgwidth"), w); this.height = new STLength(rect.getAttribute("svgheight"), h); - if (rect.getAttribute("rx") || rect.getAttribute("ry")) { - this.rx = new STLength((rect.getAttribute("rx") || rect.getAttribute("ry")), w); - this.ry = new STLength((rect.getAttribute("ry") || rect.getAttribute("rx")), h); + var rx = rect.getAttribute("rx"), ry = rect.getAttribute("ry"); + if (rx || ry) { + this.rx = new STLength((rx || ry), w); + this.ry = new STLength((ry || rx), h); if (this.rx.value > this.width.value / 2) { //rx属性が幅より大きければ、幅の半分を属性に設定 this.rx.value = this.width.value / 2; } @@ -819,7 +820,7 @@ } this.paint = new NAIBU.PaintColor(rect); this.transformable = NAIBU.transformToCTM(rect,matrix); - w = h = null; + w = h = rx = ry = null; } catch(ee) {stlog.add(ee,545);} return this; }