Merge branch 'release/1.2'

redwarp · Jun 16, 2013 · d8b7809 · d8b7809
2 parents 2b64e98 + 1997d82
commit d8b7809
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/.classpath b/.classpath
@@ -2,6 +2,6 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="res"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/launch4j_config.xml b/launch4j_config.xml
@@ -1,8 +1,8 @@
 <launch4jConfig>
   <dontWrapJar>false</dontWrapJar>
   <headerType>gui</headerType>
-  <jar>C:\Users\Akaiwarp\workspace\Resizer\Resizer_1.1.2.jar</jar>
-  <outfile>C:\Users\Akaiwarp\workspace\Resizer\Resizer_1.1.2.exe</outfile>
+  <jar>C:\Users\Akaiwarp\workspace\Resizer\Resizer_1.2.jar</jar>
+  <outfile>C:\Users\Akaiwarp\workspace\Resizer\Resizer_1.2.exe</outfile>
   <errTitle></errTitle>
   <cmdLine></cmdLine>
   <chdir></chdir>
@@ -24,12 +24,12 @@
     <jdkPreference>preferJre</jdkPreference>
   </jre>
   <versionInfo>
-    <fileVersion>1.1.2.0</fileVersion>
-    <txtFileVersion>1.1.2</txtFileVersion>
+    <fileVersion>1.2.0.0</fileVersion>
+    <txtFileVersion>1.2</txtFileVersion>
     <fileDescription>9Patch Resizer</fileDescription>
     <copyright>Redwarp - 2012</copyright>
-    <productVersion>1.1.2.0</productVersion>
-    <txtProductVersion>1.1.2</txtProductVersion>
+    <productVersion>1.2.0.0</productVersion>
+    <txtProductVersion>1.2</txtProductVersion>
     <productName>9Patch Resizer</productName>
     <companyName></companyName>
     <internalName>Resizer</internalName>

diff --git 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
@@ -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();
 				}
 			}