diff --git a/.classpath b/.classpath index 32d0130..525e316 100644 --- a/.classpath +++ b/.classpath @@ -2,6 +2,6 @@ - + diff --git a/launch4j_config.xml b/launch4j_config.xml index d395bf4..3ebd9eb 100644 --- a/launch4j_config.xml +++ b/launch4j_config.xml @@ -1,8 +1,8 @@ false gui - C:\Users\Akaiwarp\workspace\Resizer\Resizer_1.1.2.jar - C:\Users\Akaiwarp\workspace\Resizer\Resizer_1.1.2.exe + C:\Users\Akaiwarp\workspace\Resizer\Resizer_1.2.jar + C:\Users\Akaiwarp\workspace\Resizer\Resizer_1.2.exe @@ -24,12 +24,12 @@ preferJre - 1.1.2.0 - 1.1.2 + 1.2.0.0 + 1.2 9Patch Resizer Redwarp - 2012 - 1.1.2.0 - 1.1.2 + 1.2.0.0 + 1.2 9Patch Resizer Resizer diff --git a/res/misc/preferences.properties b/res/misc/preferences.properties index 3255806..6f308a5 100644 --- a/res/misc/preferences.properties +++ b/res/misc/preferences.properties @@ -1,3 +1,3 @@ #Created by JInto - www.guh-software.de #Sun Oct 21 22:30:52 CEST 2012 -version=1.1.2 +version=1.2 diff --git a/src/net/redwarp/tool/resizer/worker/ImageScaler.java b/src/net/redwarp/tool/resizer/worker/ImageScaler.java index e502f0e..c6e16ea 100644 --- a/src/net/redwarp/tool/resizer/worker/ImageScaler.java +++ b/src/net/redwarp/tool/resizer/worker/ImageScaler.java @@ -252,8 +252,8 @@ private BufferedImage generateBordersImage(BufferedImage source, BufferedImage.TYPE_INT_ARGB); leftBorder.setRGB(0, 0, 1, cutH, source.getRGB(0, 1, 1, cutH, null, 0, 1), 0, 1); - leftBorder = this.resizeBorder(leftBorder, 1, trimedHeight); this.verifyBorderImage(leftBorder); + leftBorder = this.resizeBorder(leftBorder, 1, trimedHeight); finalBorder.setRGB(0, 1, 1, trimedHeight, leftBorder.getRGB(0, 0, 1, trimedHeight, null, 0, 1), 0, 1); } @@ -326,7 +326,7 @@ private BufferedImage resizeBorder(final BufferedImage border, int newY = Math.min(Math.round(y * heightRatio), targetHeight - 1); - newData[newY * targetWidth + newX] = 0xff000000; + newData[newY * targetWidth + newX] = data[y * w + x]; } } } @@ -344,7 +344,7 @@ private void verifyBorderImage(BufferedImage border) null, 0, border.getWidth()); for (int i = 0; i < rgb.length; i++) { if ((0xff000000 & rgb[i]) != 0) { - if (rgb[i] != 0xff000000) { + if (rgb[i] != 0xff000000 && rgb[i] != 0xffff0000) { throw new Wrong9PatchException(); } }