Version 1.02

- Fixed issues on Windows, emblem conversion now works in Windows.
fzerocentral · Jul 25, 2015 · 5d627c7 · 5d627c7
1 parent 3bb6070
commit 5d627c7
Show file tree

Hide file tree

Showing 64 changed files with 1,779 additions and 1,008 deletions.
diff --git a/...app/application.linux32/ImageToEmblem1_01 → ...app/application.linux32/ImageToEmblem1_02 b/...app/application.linux32/ImageToEmblem1_01 → ...app/application.linux32/ImageToEmblem1_02
@@ -1,4 +1,4 @@
 #!/bin/sh
 
 APPDIR=$(dirname "$0")
-java -Djna.nosys=true -Djava.library.path="$APPDIR:$APPDIR/lib" -cp "$APPDIR/lib/ImageToEmblem1_01.jar:$APPDIR/lib/core.jar:$APPDIR/lib/jogl-all.jar:$APPDIR/lib/gluegen-rt.jar:$APPDIR/lib/jogl-all-natives-linux-i586.jar:$APPDIR/lib/gluegen-rt-natives-linux-i586.jar" ImageToEmblem1_01 "$@"
+java -Djna.nosys=true -Djava.library.path="$APPDIR:$APPDIR/lib" -cp "$APPDIR/lib/ImageToEmblem1_02.jar:$APPDIR/lib/core.jar:$APPDIR/lib/jogl-all.jar:$APPDIR/lib/gluegen-rt.jar:$APPDIR/lib/jogl-all-natives-linux-i586.jar:$APPDIR/lib/gluegen-rt-natives-linux-i586.jar" ImageToEmblem1_02 "$@"
diff --git a/...tion.macosx/source/ImageToEmblem1_01.java → ...ion.linux32/source/ImageToEmblem1_02.java b/...tion.macosx/source/ImageToEmblem1_01.java → ...ion.linux32/source/ImageToEmblem1_02.java
@@ -12,7 +12,7 @@
 import java.io.OutputStream; 
 import java.io.IOException; 
 
-public class ImageToEmblem1_01 extends PApplet {
+public class ImageToEmblem1_02 extends PApplet {
 
 //Code originally by Yoshifan - @Yoshifan28
 //Code ported by Raphael Tetreault - @StarkNebula
@@ -190,20 +190,21 @@ public void LoadEmblemImage(File _selectedImage) {
       inputFileName = _selectedImage.getAbsolutePath();
       //println(inputFileName);
 
-      String[] splitPathName = split(inputFileName, '/');
+      String[] splitPathName = split(inputFileName, '/'); // Unix split path
+      splitPathName = split(inputFileName, '\\');         // Windows spilt path
       //println(splitPathName);
       //println(splitPathName.length);
 
       inputFileName = splitPathName[splitPathName.length - 1];
       println(inputFileName);
 
-      splitPathName = split(inputFileName, '.');
+      splitPathName = split(inputFileName, '.'); // remove image extension
 
       inputFileName = splitPathName[0];
 
     } catch (Exception e){
       fileWasLoaded = false;
-      println("An exception occured");
+      println("An exception occured in: void LoadEmblemImage(), try statement");
     }
   }
 }
@@ -757,7 +758,7 @@ public int CurrentDate() {
   }
 }
   static public void main(String[] passedArgs) {
-    String[] appletArgs = new String[] { "ImageToEmblem1_01" };
+    String[] appletArgs = new String[] { "ImageToEmblem1_02" };
     if (passedArgs != null) {
       PApplet.main(concat(appletArgs, passedArgs));
     } else {

diff --git a/...tion.linux64/source/ImageToEmblem1_01.pde → ...tion.linux32/source/ImageToEmblem1_02.pde b/...tion.linux64/source/ImageToEmblem1_01.pde → ...tion.linux32/source/ImageToEmblem1_02.pde
@@ -174,20 +174,21 @@ void LoadEmblemImage(File _selectedImage) {
       inputFileName = _selectedImage.getAbsolutePath();
       //println(inputFileName);
 
-      String[] splitPathName = split(inputFileName, '/');
+      String[] splitPathName = split(inputFileName, '/'); // Unix split path
+      splitPathName = split(inputFileName, '\\');         // Windows spilt path
       //println(splitPathName);
       //println(splitPathName.length);
 
       inputFileName = splitPathName[splitPathName.length - 1];
       println(inputFileName);
 
-      splitPathName = split(inputFileName, '.');
+      splitPathName = split(inputFileName, '.'); // remove image extension
 
       inputFileName = splitPathName[0];
 
     } catch (Exception e){
       fileWasLoaded = false;
-      println("An exception occured");
+      println("An exception occured in: void LoadEmblemImage(), try statement");
     }
   }
 }
diff --git a/...app/application.linux64/ImageToEmblem1_01 → ...app/application.linux64/ImageToEmblem1_02 b/...app/application.linux64/ImageToEmblem1_01 → ...app/application.linux64/ImageToEmblem1_02
@@ -1,4 +1,4 @@
 #!/bin/sh
 
 APPDIR=$(dirname "$0")
-java -Djna.nosys=true -Djava.library.path="$APPDIR:$APPDIR/lib" -cp "$APPDIR/lib/ImageToEmblem1_01.jar:$APPDIR/lib/core.jar:$APPDIR/lib/jogl-all.jar:$APPDIR/lib/gluegen-rt.jar:$APPDIR/lib/jogl-all-natives-linux-amd64.jar:$APPDIR/lib/gluegen-rt-natives-linux-amd64.jar" ImageToEmblem1_01 "$@"
+java -Djna.nosys=true -Djava.library.path="$APPDIR:$APPDIR/lib" -cp "$APPDIR/lib/ImageToEmblem1_02.jar:$APPDIR/lib/core.jar:$APPDIR/lib/jogl-all.jar:$APPDIR/lib/gluegen-rt.jar:$APPDIR/lib/jogl-all-natives-linux-amd64.jar:$APPDIR/lib/gluegen-rt-natives-linux-amd64.jar" ImageToEmblem1_02 "$@"
diff --git a/...ion.linux32/source/ImageToEmblem1_01.java → ...ion.linux64/source/ImageToEmblem1_02.java b/...ion.linux32/source/ImageToEmblem1_01.java → ...ion.linux64/source/ImageToEmblem1_02.java
@@ -12,7 +12,7 @@
 import java.io.OutputStream; 
 import java.io.IOException; 
 
-public class ImageToEmblem1_01 extends PApplet {
+public class ImageToEmblem1_02 extends PApplet {
 
 //Code originally by Yoshifan - @Yoshifan28
 //Code ported by Raphael Tetreault - @StarkNebula
@@ -190,20 +190,21 @@ public void LoadEmblemImage(File _selectedImage) {
       inputFileName = _selectedImage.getAbsolutePath();
       //println(inputFileName);
 
-      String[] splitPathName = split(inputFileName, '/');
+      String[] splitPathName = split(inputFileName, '/'); // Unix split path
+      splitPathName = split(inputFileName, '\\');         // Windows spilt path
       //println(splitPathName);
       //println(splitPathName.length);
 
       inputFileName = splitPathName[splitPathName.length - 1];
       println(inputFileName);
 
-      splitPathName = split(inputFileName, '.');
+      splitPathName = split(inputFileName, '.'); // remove image extension
 
       inputFileName = splitPathName[0];
 
     } catch (Exception e){
       fileWasLoaded = false;
-      println("An exception occured");
+      println("An exception occured in: void LoadEmblemImage(), try statement");
     }
   }
 }
@@ -757,7 +758,7 @@ public int CurrentDate() {
   }
 }
   static public void main(String[] passedArgs) {
-    String[] appletArgs = new String[] { "ImageToEmblem1_01" };
+    String[] appletArgs = new String[] { "ImageToEmblem1_02" };
     if (passedArgs != null) {
       PApplet.main(concat(appletArgs, passedArgs));
     } else {

diff --git a/...ation.macosx/source/ImageToEmblem1_01.pde → ...tion.linux64/source/ImageToEmblem1_02.pde b/...ation.macosx/source/ImageToEmblem1_01.pde → ...tion.linux64/source/ImageToEmblem1_02.pde
@@ -174,20 +174,21 @@ void LoadEmblemImage(File _selectedImage) {
       inputFileName = _selectedImage.getAbsolutePath();
       //println(inputFileName);
 
-      String[] splitPathName = split(inputFileName, '/');
+      String[] splitPathName = split(inputFileName, '/'); // Unix split path
+      splitPathName = split(inputFileName, '\\');         // Windows spilt path
       //println(splitPathName);
       //println(splitPathName.length);
 
       inputFileName = splitPathName[splitPathName.length - 1];
       println(inputFileName);
 
-      splitPathName = split(inputFileName, '.');
+      splitPathName = split(inputFileName, '.'); // remove image extension
 
       inputFileName = splitPathName[0];
 
     } catch (Exception e){
       fileWasLoaded = false;
-      println("An exception occured");
+      println("An exception occured in: void LoadEmblemImage(), try statement");
     }
   }
 }
diff --git a/processing/app/application.macosx/ImageToEmblem1_01.app/Contents/Java/ImageToEmblem1_01.jar b/processing/app/application.macosx/ImageToEmblem1_01.app/Contents/Java/ImageToEmblem1_01.jar
diff --git a/processing/app/application.macosx/ImageToEmblem1_01.app/Contents/Java/core.jar b/processing/app/application.macosx/ImageToEmblem1_01.app/Contents/Java/core.jar
diff --git a/...cation.macosx/ImageToEmblem1_01.app/Contents/Java/gluegen-rt-natives-macosx-universal.jar b/...cation.macosx/ImageToEmblem1_01.app/Contents/Java/gluegen-rt-natives-macosx-universal.jar
diff --git a/processing/app/application.macosx/ImageToEmblem1_01.app/Contents/Java/gluegen-rt.jar b/processing/app/application.macosx/ImageToEmblem1_01.app/Contents/Java/gluegen-rt.jar
diff --git a/...lication.macosx/ImageToEmblem1_01.app/Contents/Java/jogl-all-natives-macosx-universal.jar b/...lication.macosx/ImageToEmblem1_01.app/Contents/Java/jogl-all-natives-macosx-universal.jar
diff --git a/processing/app/application.macosx/ImageToEmblem1_01.app/Contents/Java/jogl-all.jar b/processing/app/application.macosx/ImageToEmblem1_01.app/Contents/Java/jogl-all.jar
diff --git a/...ImageToEmblem1_01.app/Contents/Info.plist → ...ImageToEmblem1_02.app/Contents/Info.plist b/...ImageToEmblem1_01.app/Contents/Info.plist → ...ImageToEmblem1_02.app/Contents/Info.plist
@@ -5,17 +5,17 @@
     <key>CFBundleDevelopmentRegion</key>
     <string>English</string>
     <key>CFBundleExecutable</key>
-    <string>ImageToEmblem1_01</string>
+    <string>ImageToEmblem1_02</string>
     <key>CFBundleIconFile</key>
     <string>sketch.icns</string>
     <key>CFBundleIdentifier</key>
-    <string>ImageToEmblem1_01</string>
+    <string>ImageToEmblem1_02</string>
     <key>CFBundleDisplayName</key>
-    <string>ImageToEmblem1_01</string>
+    <string>ImageToEmblem1_02</string>
     <key>CFBundleInfoDictionaryVersion</key>
     <string>6.0</string>
     <key>CFBundleName</key>
-    <string>ImageToEmblem1_01</string>
+    <string>ImageToEmblem1_02</string>
     <key>CFBundlePackageType</key>
     <string>APPL</string>
 
@@ -35,7 +35,7 @@
 
 
     <key>JVMMainClassName</key>
-    <string>ImageToEmblem1_01</string>
+    <string>ImageToEmblem1_02</string>
 
     <key>LSMinimumSystemVersion</key>
     <string>10.7.3</string>
@@ -59,13 +59,13 @@
 
     <key>JVMOptions</key>
     <array>
-            <string>-Djna.nosys=true</string>
+      <string>-Djna.nosys=true</string>
 
       <string>-Xdock:icon=Contents/Resources/sketch.icns</string>
       <string>-Dapple.laf.useScreenMenuBar=true</string>
       <string>-Dcom.apple.macos.use-file-dialog-packages=true</string>
       <string>-Dcom.apple.macos.useScreenMenuBar=true</string>
-      <string>-Dcom.apple.mrj.application.apple.menu.about.name=ImageToEmblem1_01</string>
+      <string>-Dcom.apple.mrj.application.apple.menu.about.name=ImageToEmblem1_02</string>
       <string>-Dcom.apple.smallTabs=true</string>
     </array>
     <key>JVMArguments</key>

diff --git a/processing/app/application.macosx/ImageToEmblem1_02.app/Contents/Java/ImageToEmblem1_02.jar b/processing/app/application.macosx/ImageToEmblem1_02.app/Contents/Java/ImageToEmblem1_02.jar
diff --git a/processing/app/application.macosx/ImageToEmblem1_02.app/Contents/Java/core.jar b/processing/app/application.macosx/ImageToEmblem1_02.app/Contents/Java/core.jar
diff --git a/..._01.app/Contents/Java/data/HowToUsePrefix → ..._02.app/Contents/Java/data/HowToUsePrefix b/..._01.app/Contents/Java/data/HowToUsePrefix → ..._02.app/Contents/Java/data/HowToUsePrefix
diff --git a/...oEmblem1_01.app/Contents/Java/data/prefix → ...oEmblem1_02.app/Contents/Java/data/prefix b/...oEmblem1_01.app/Contents/Java/data/prefix → ...oEmblem1_02.app/Contents/Java/data/prefix
diff --git a/...s/Java/data/resources/emblem_banner_blank → ...s/Java/data/resources/emblem_banner_blank b/...s/Java/data/resources/emblem_banner_blank → ...s/Java/data/resources/emblem_banner_blank
diff --git a/.../Contents/Java/data/resources/emblem_icon → .../Contents/Java/data/resources/emblem_icon b/.../Contents/Java/data/resources/emblem_icon → .../Contents/Java/data/resources/emblem_icon
diff --git a/.../Contents/Java/data/resources/fzcLogo.png → .../Contents/Java/data/resources/fzcLogo.png b/.../Contents/Java/data/resources/fzcLogo.png → .../Contents/Java/data/resources/fzcLogo.png
diff --git a/...cation.macosx/ImageToEmblem1_02.app/Contents/Java/gluegen-rt-natives-macosx-universal.jar b/...cation.macosx/ImageToEmblem1_02.app/Contents/Java/gluegen-rt-natives-macosx-universal.jar
diff --git a/processing/app/application.macosx/ImageToEmblem1_02.app/Contents/Java/gluegen-rt.jar b/processing/app/application.macosx/ImageToEmblem1_02.app/Contents/Java/gluegen-rt.jar
diff --git a/...lication.macosx/ImageToEmblem1_02.app/Contents/Java/jogl-all-natives-macosx-universal.jar b/...lication.macosx/ImageToEmblem1_02.app/Contents/Java/jogl-all-natives-macosx-universal.jar
diff --git a/processing/app/application.macosx/ImageToEmblem1_02.app/Contents/Java/jogl-all.jar b/processing/app/application.macosx/ImageToEmblem1_02.app/Contents/Java/jogl-all.jar
diff --git a/...1_01.app/Contents/MacOS/ImageToEmblem1_01 → ...1_02.app/Contents/MacOS/ImageToEmblem1_02 b/...1_01.app/Contents/MacOS/ImageToEmblem1_01 → ...1_02.app/Contents/MacOS/ImageToEmblem1_02
diff --git a/...sx/ImageToEmblem1_01.app/Contents/PkgInfo → ...sx/ImageToEmblem1_02.app/Contents/PkgInfo b/...sx/ImageToEmblem1_01.app/Contents/PkgInfo → ...sx/ImageToEmblem1_02.app/Contents/PkgInfo
diff --git a/...ts/Resources/en.lproj/Localizable.strings → ...ts/Resources/en.lproj/Localizable.strings b/...ts/Resources/en.lproj/Localizable.strings → ...ts/Resources/en.lproj/Localizable.strings
diff --git a/...em1_01.app/Contents/Resources/sketch.icns → ...em1_02.app/Contents/Resources/sketch.icns b/...em1_01.app/Contents/Resources/sketch.icns → ...em1_02.app/Contents/Resources/sketch.icns
diff --git a/...app/Contents/_CodeSignature/CodeResources → ...app/Contents/_CodeSignature/CodeResources b/...app/Contents/_CodeSignature/CodeResources → ...app/Contents/_CodeSignature/CodeResources
@@ -20,13 +20,13 @@
 	</dict>
 	<key>files2</key>
 	<dict>
-		<key>Java/ImageToEmblem1_01.jar</key>
+		<key>Java/ImageToEmblem1_02.jar</key>
 		<data>
-		xsOQzPV5YTioACGLR+ZSnoxxaSM=
+		l83zWXGZEBrdKucGJTSsELpbWhI=
 		</data>
 		<key>Java/core.jar</key>
 		<data>
-		SpDlY7TTnmN5l62rrAY5XUAl+D8=
+		9yAhryCrC0UVAs0jLxdifhNloyE=
 		</data>
 		<key>Java/data/HowToUsePrefix</key>
 		<data>
@@ -50,19 +50,19 @@
 		</data>
 		<key>Java/gluegen-rt-natives-macosx-universal.jar</key>
 		<data>
-		dSY2jqhCzH0BdYHC3nHFXr8Szfg=
+		11uvp9PE8pshoC2Ui3fprr9Rlyk=
 		</data>
 		<key>Java/gluegen-rt.jar</key>
 		<data>
-		nhSb1MwghVwL8br1nFGxdgU4CO8=
+		APjYBlK7KesrkBL7r+HBYLqAd1w=
 		</data>
 		<key>Java/jogl-all-natives-macosx-universal.jar</key>
 		<data>
-		ifigUE29LXn7FtpmQPihyPgBVb8=
+		vfFs1wrGn5GXlnQXxB6q14dTj7k=
 		</data>
 		<key>Java/jogl-all.jar</key>
 		<data>
-		G0SOvCuFAID0CeiqRFKxd1bFPAk=
+		+x0SaYucrNLvSRtPISbciy2yp4E=
 		</data>
 		<key>Resources/en.lproj/Localizable.strings</key>
 		<dict>

diff --git a/...n.windows32/source/ImageToEmblem1_01.java → ...tion.macosx/source/ImageToEmblem1_02.java b/...n.windows32/source/ImageToEmblem1_01.java → ...tion.macosx/source/ImageToEmblem1_02.java
@@ -12,7 +12,7 @@
 import java.io.OutputStream; 
 import java.io.IOException; 
 
-public class ImageToEmblem1_01 extends PApplet {
+public class ImageToEmblem1_02 extends PApplet {
 
 //Code originally by Yoshifan - @Yoshifan28
 //Code ported by Raphael Tetreault - @StarkNebula
@@ -190,20 +190,21 @@ public void LoadEmblemImage(File _selectedImage) {
       inputFileName = _selectedImage.getAbsolutePath();
       //println(inputFileName);
 
-      String[] splitPathName = split(inputFileName, '/');
+      String[] splitPathName = split(inputFileName, '/'); // Unix split path
+      splitPathName = split(inputFileName, '\\');         // Windows spilt path
       //println(splitPathName);
       //println(splitPathName.length);
 
       inputFileName = splitPathName[splitPathName.length - 1];
       println(inputFileName);
 
-      splitPathName = split(inputFileName, '.');
+      splitPathName = split(inputFileName, '.'); // remove image extension
 
       inputFileName = splitPathName[0];
 
     } catch (Exception e){
       fileWasLoaded = false;
-      println("An exception occured");
+      println("An exception occured in: void LoadEmblemImage(), try statement");
     }
   }
 }
@@ -757,7 +758,7 @@ public int CurrentDate() {
   }
 }
   static public void main(String[] passedArgs) {
-    String[] appletArgs = new String[] { "ImageToEmblem1_01" };
+    String[] appletArgs = new String[] { "ImageToEmblem1_02" };
     if (passedArgs != null) {
       PApplet.main(concat(appletArgs, passedArgs));
     } else {

diff --git a/...on.windows32/source/ImageToEmblem1_01.pde → ...ation.macosx/source/ImageToEmblem1_02.pde b/...on.windows32/source/ImageToEmblem1_01.pde → ...ation.macosx/source/ImageToEmblem1_02.pde
@@ -174,20 +174,21 @@ void LoadEmblemImage(File _selectedImage) {
       inputFileName = _selectedImage.getAbsolutePath();
       //println(inputFileName);
 
-      String[] splitPathName = split(inputFileName, '/');
+      String[] splitPathName = split(inputFileName, '/'); // Unix split path
+      splitPathName = split(inputFileName, '\\');         // Windows spilt path
       //println(splitPathName);
       //println(splitPathName.length);
 
       inputFileName = splitPathName[splitPathName.length - 1];
       println(inputFileName);
 
-      splitPathName = split(inputFileName, '.');
+      splitPathName = split(inputFileName, '.'); // remove image extension
 
       inputFileName = splitPathName[0];
 
     } catch (Exception e){
       fileWasLoaded = false;
-      println("An exception occured");
+      println("An exception occured in: void LoadEmblemImage(), try statement");
     }
   }
 }
diff --git a/...plication.windows64/ImageToEmblem1_01.exe → ...plication.windows32/ImageToEmblem1_02.exe b/...plication.windows64/ImageToEmblem1_01.exe → ...plication.windows32/ImageToEmblem1_02.exe
diff --git a/...ion.linux64/source/ImageToEmblem1_01.java → ...n.windows32/source/ImageToEmblem1_02.java b/...ion.linux64/source/ImageToEmblem1_01.java → ...n.windows32/source/ImageToEmblem1_02.java
@@ -12,7 +12,7 @@
 import java.io.OutputStream; 
 import java.io.IOException; 
 
-public class ImageToEmblem1_01 extends PApplet {
+public class ImageToEmblem1_02 extends PApplet {
 
 //Code originally by Yoshifan - @Yoshifan28
 //Code ported by Raphael Tetreault - @StarkNebula
@@ -190,20 +190,21 @@ public void LoadEmblemImage(File _selectedImage) {
       inputFileName = _selectedImage.getAbsolutePath();
       //println(inputFileName);
 
-      String[] splitPathName = split(inputFileName, '/');
+      String[] splitPathName = split(inputFileName, '/'); // Unix split path
+      splitPathName = split(inputFileName, '\\');         // Windows spilt path
       //println(splitPathName);
       //println(splitPathName.length);
 
       inputFileName = splitPathName[splitPathName.length - 1];
       println(inputFileName);
 
-      splitPathName = split(inputFileName, '.');
+      splitPathName = split(inputFileName, '.'); // remove image extension
 
       inputFileName = splitPathName[0];
 
     } catch (Exception e){
       fileWasLoaded = false;
-      println("An exception occured");
+      println("An exception occured in: void LoadEmblemImage(), try statement");
     }
   }
 }
@@ -757,7 +758,7 @@ public int CurrentDate() {
   }
 }
   static public void main(String[] passedArgs) {
-    String[] appletArgs = new String[] { "ImageToEmblem1_01" };
+    String[] appletArgs = new String[] { "ImageToEmblem1_02" };
     if (passedArgs != null) {
       PApplet.main(concat(appletArgs, passedArgs));
     } else {

diff --git a/...on.windows64/source/ImageToEmblem1_01.pde → ...on.windows32/source/ImageToEmblem1_02.pde b/...on.windows64/source/ImageToEmblem1_01.pde → ...on.windows32/source/ImageToEmblem1_02.pde
@@ -174,20 +174,21 @@ void LoadEmblemImage(File _selectedImage) {
       inputFileName = _selectedImage.getAbsolutePath();
       //println(inputFileName);
 
-      String[] splitPathName = split(inputFileName, '/');
+      String[] splitPathName = split(inputFileName, '/'); // Unix split path
+      splitPathName = split(inputFileName, '\\');         // Windows spilt path
       //println(splitPathName);
       //println(splitPathName.length);
 
       inputFileName = splitPathName[splitPathName.length - 1];
       println(inputFileName);
 
-      splitPathName = split(inputFileName, '.');
+      splitPathName = split(inputFileName, '.'); // remove image extension
 
       inputFileName = splitPathName[0];
 
     } catch (Exception e){
       fileWasLoaded = false;
-      println("An exception occured");
+      println("An exception occured in: void LoadEmblemImage(), try statement");
     }
   }
 }
diff --git a/...plication.windows32/ImageToEmblem1_01.exe → ...plication.windows64/ImageToEmblem1_02.exe b/...plication.windows32/ImageToEmblem1_01.exe → ...plication.windows64/ImageToEmblem1_02.exe