Fixed round rectangles to correctly scale radii. Repacked jars with different compression engine.

git-svn-id: https://svn.java.net/svn/svgsalamander~svn/trunk/svg-core@53 7dc7fa77-23fb-e6ad-8e2e-c86bd48ed22b

3 files changed, 11 insertions, 30 deletions

diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
index 02bb0a6..49527fb 100755
--- a/nbproject/build-impl.xml
+++ b/nbproject/build-impl.xml
@@ -19,7 +19,7 @@ is divided into following sections:
   - cleanup

 

         -->

-<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="svg-salamander-core-impl">

+<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject2="http://www.netbeans.org/ns/j2se-project/2" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="svg-salamander-core-impl">

     <target depends="test,jar,javadoc" description="Build and test whole project." name="default"/>

     <!-- 

                 ======================

@@ -35,37 +35,18 @@ is divided into following sections:
         <property file="nbproject/private/configs/${config}.properties"/>

         <property file="nbproject/private/private.properties"/>

     </target>

-    <target depends="-pre-init,-init-private" name="-init-libraries">

-        <property location="..\libraries\nblibraries.properties" name="libraries.1.path"/>

-        <dirname file="${libraries.1.path}" property="libraries.1.dir.nativedirsep"/>

-        <pathconvert dirsep="/" property="libraries.1.dir">

-            <path path="${libraries.1.dir.nativedirsep}"/>

-        </pathconvert>

-        <basename file="${libraries.1.path}" property="libraries.1.basename" suffix=".properties"/>

-        <touch file="${libraries.1.dir}/${libraries.1.basename}-private.properties"/>

-        <loadproperties srcfile="${libraries.1.dir}/${libraries.1.basename}-private.properties">

-            <filterchain>

-                <replacestring from="$${base}" to="${libraries.1.dir}"/>

-            </filterchain>

-        </loadproperties>

-        <loadproperties srcfile="${libraries.1.path}">

-            <filterchain>

-                <replacestring from="$${base}" to="${libraries.1.dir}"/>

-            </filterchain>

-        </loadproperties>

-    </target>

-    <target depends="-pre-init,-init-private,-init-libraries" name="-init-user">

+    <target depends="-pre-init,-init-private" name="-init-user">

         <property file="${user.properties.file}"/>

         <!-- The two properties below are usually overridden -->

         <!-- by the active platform. Just a fallback. -->

         <property name="default.javac.source" value="1.4"/>

         <property name="default.javac.target" value="1.4"/>

     </target>

-    <target depends="-pre-init,-init-private,-init-libraries,-init-user" name="-init-project">

+    <target depends="-pre-init,-init-private,-init-user" name="-init-project">

         <property file="nbproject/configs/${config}.properties"/>

         <property file="nbproject/project.properties"/>

     </target>

-    <target depends="-pre-init,-init-private,-init-libraries,-init-user,-init-project,-init-macrodef-property" name="-do-init">

+    <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init">

         <available file="${manifest.file}" property="manifest.available"/>

         <condition property="manifest.available+main.class">

             <and>

@@ -147,7 +128,7 @@ is divided into following sections:
         <!-- Empty placeholder for easier customization. -->

         <!-- You can override this target in the ../build.xml file. -->

     </target>

-    <target depends="-pre-init,-init-private,-init-libraries,-init-user,-init-project,-do-init" name="-init-check">

+    <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init" name="-init-check">

         <fail unless="src.www.dir">Must set src.www.dir</fail>

         <fail unless="src.dir">Must set src.dir</fail>

         <fail unless="src.java.dir">Must set src.java.dir</fail>

@@ -334,7 +315,7 @@ is divided into following sections:
             </jar>

         </presetdef>

     </target>

-    <target depends="-pre-init,-init-private,-init-libraries,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-junit,-init-macrodef-nbjpda,-init-macrodef-debug,-init-macrodef-java,-init-presetdef-jar" name="init"/>

+    <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-junit,-init-macrodef-nbjpda,-init-macrodef-debug,-init-macrodef-java,-init-presetdef-jar" name="init"/>

     <!--

                 ===================

                 COMPILATION SECTION

diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties
index 9d45de5..0865813 100755
--- a/nbproject/genfiles.properties
+++ b/nbproject/genfiles.properties
@@ -4,5 +4,5 @@ build.xml.stylesheet.CRC32=be360661
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.

 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.

 nbproject/build-impl.xml.data.CRC32=478066e1

-nbproject/build-impl.xml.script.CRC32=a04a2883

-nbproject/build-impl.xml.stylesheet.CRC32=e327d66c

+nbproject/build-impl.xml.script.CRC32=63fa9093

+nbproject/build-impl.xml.stylesheet.CRC32=f1d9da08

diff --git a/src/main/java/com/kitfox/svg/Rect.java b/src/main/java/com/kitfox/svg/Rect.java
index fa59372..5104707 100644
--- a/src/main/java/com/kitfox/svg/Rect.java
+++ b/src/main/java/com/kitfox/svg/Rect.java
@@ -79,7 +79,7 @@ public class Rect extends ShapeElement {
         }

         else

         {

-            rect = new RoundRectangle2D.Float(x, y, width, height, rx, ry);

+            rect = new RoundRectangle2D.Float(x, y, width, height, rx * 2, ry * 2);

         }

     }

     

@@ -153,7 +153,7 @@ public class Rect extends ShapeElement {
         }

         else

         {

-            rect = new RoundRectangle2D.Float(x, y, width, height, rx, ry);

+            rect = new RoundRectangle2D.Float(x, y, width, height, rx * 2, ry * 2);

         }

     }

 

@@ -257,7 +257,7 @@ public class Rect extends ShapeElement {
             }

             else

             {

-                rect = new RoundRectangle2D.Float(x, y, width, height, rx, ry);

+                rect = new RoundRectangle2D.Float(x, y, width, height, rx * 2, ry * 2);

             }

             return true;

         }