[Pixelle-commit] SF.net SVN: pixelle:[321] trunk/pixelle

[<dbr...@us...>]

Revision: 321
          http://pixelle.svn.sourceforge.net/pixelle/?rev=321&view=rev
Author:   dbrosius
Date:     2012-03-18 04:52:16 +0000 (Sun, 18 Mar 2012)
Log Message:
-----------
sync from github

Modified Paths:
--------------
    trunk/pixelle/etc/Pixelle.g
    trunk/pixelle/etc/pixelle.jnlp
    trunk/pixelle/pixelle.store

Modified: trunk/pixelle/etc/Pixelle.g
===================================================================
--- trunk/pixelle/etc/Pixelle.g	2012-03-12 02:57:00 UTC (rev 320)
+++ trunk/pixelle/etc/Pixelle.g	2012-03-18 04:52:16 UTC (rev 321)
@@ -69,20 +69,6 @@
 		
 		mv = cw.visitMethod(Opcodes.ACC_PRIVATE, "pixelAverage", "(DDDCLcom/mebigfatguy/pixelle/PixelleEval;)D", null, new String[0]);
         
-        mv.visitFieldInsn(Opcodes.GETSTATIC, "java/lang/System", "out", "Ljava/io/PrintStream;");
-        mv.visitTypeInsn(Opcodes.NEW, "java/lang/StringBuilder");
-        mv.visitInsn(Opcodes.DUP);
-        mv.visitMethodInsn(Opcodes.INVOKESPECIAL, "java/lang/StringBuilder", "<init>", "()V");
-        mv.visitVarInsn(Opcodes.DLOAD, 1);
-        mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, "java/lang/StringBuilder", "append", "(D)Ljava/lang/StringBuilder;");
-        mv.visitVarInsn(Opcodes.DLOAD, 3);
-        mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, "java/lang/StringBuilder", "append", "(D)Ljava/lang/StringBuilder;");        
-        mv.visitVarInsn(Opcodes.DLOAD, 5);
-        mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, "java/lang/StringBuilder", "append", "(D)Ljava/lang/StringBuilder;");
-        mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, "java/lang/StringBuilder", "toString", "()Ljava/lang/String;");
-        mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, "java/io/PrintStream", "println", "(Ljava/lang/String;)V");
-                   
-        
 		mv.visitVarInsn(Opcodes.DLOAD, 1);
 		mv.visitMethodInsn(Opcodes.INVOKESTATIC, "java/lang/Math", "round", "(D)J");
 		mv.visitInsn(Opcodes.L2I);
@@ -121,7 +107,6 @@
         mv.visitJumpInsn(Opcodes.GOTO, xBranchBottom);
         Label xBranchTop = new Label();
         mv.visitLabel(xBranchTop);
-                
         mv.visitVarInsn(Opcodes.DLOAD, 12);
         mv.visitVarInsn(Opcodes.ALOAD, 8);
         mv.visitVarInsn(Opcodes.ILOAD, 17);
@@ -146,7 +131,7 @@
         mv.visitInsn(Opcodes.IMUL);
         mv.visitInsn(Opcodes.ICONST_1);
         mv.visitInsn(Opcodes.IADD);
-        mv.visitInsn(Opcodes.ICONST_2);
+        mv.visitInsn(Opcodes.DUP);
         mv.visitInsn(Opcodes.IMUL);
         mv.visitInsn(Opcodes.I2D);
         mv.visitInsn(Opcodes.DDIV);
@@ -739,7 +724,7 @@
             mv.visitMethodInsn(Opcodes.INVOKEINTERFACE, "java/util/List", "size", "()I");
             mv.visitInsn(Opcodes.ICONST_1);
             mv.visitInsn(Opcodes.ISUB);
-            mv.visitMethodInsn(Opcodes.INVOKEINTERFACE, "java/util/List", "get", "(I)Ljava/lang/Object;");
+            mv.visitMethodInsn(Opcodes.INVOKEINTERFACE, "java/util/List", "remove", "(I)Ljava/lang/Object;");
             mv.visitTypeInsn(Opcodes.CHECKCAST, "java/lang/Double");
             mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, "java/lang/Double", "doubleValue", "()D");
             
@@ -749,7 +734,7 @@
             mv.visitMethodInsn(Opcodes.INVOKEINTERFACE, "java/util/List", "size", "()I");
             mv.visitInsn(Opcodes.ICONST_1);
             mv.visitInsn(Opcodes.ISUB);
-            mv.visitMethodInsn(Opcodes.INVOKEINTERFACE, "java/util/List", "get", "(I)Ljava/lang/Object;");
+            mv.visitMethodInsn(Opcodes.INVOKEINTERFACE, "java/util/List", "remove", "(I)Ljava/lang/Object;");
             mv.visitTypeInsn(Opcodes.CHECKCAST, "java/lang/Double");
             mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, "java/lang/Double", "doubleValue", "()D");
             
@@ -759,7 +744,7 @@
             mv.visitMethodInsn(Opcodes.INVOKEINTERFACE, "java/util/List", "size", "()I");
             mv.visitInsn(Opcodes.ICONST_1);
             mv.visitInsn(Opcodes.ISUB);
-            mv.visitMethodInsn(Opcodes.INVOKEINTERFACE, "java/util/List", "get", "(I)Ljava/lang/Object;");
+            mv.visitMethodInsn(Opcodes.INVOKEINTERFACE, "java/util/List", "remove", "(I)Ljava/lang/Object;");
             mv.visitTypeInsn(Opcodes.CHECKCAST, "java/lang/Double");
             mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, "java/lang/Double", "doubleValue", "()D");
             
@@ -769,7 +754,7 @@
             mv.visitMethodInsn(Opcodes.INVOKEINTERFACE, "java/util/List", "size", "()I");
             mv.visitInsn(Opcodes.ICONST_1);
             mv.visitInsn(Opcodes.ISUB);
-            mv.visitMethodInsn(Opcodes.INVOKEINTERFACE, "java/util/List", "get", "(I)Ljava/lang/Object;");
+            mv.visitMethodInsn(Opcodes.INVOKEINTERFACE, "java/util/List", "remove", "(I)Ljava/lang/Object;");
             mv.visitTypeInsn(Opcodes.CHECKCAST, "java/lang/Double");
             mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, "java/lang/Double", "doubleValue", "()D");
                                     

Modified: trunk/pixelle/etc/pixelle.jnlp
===================================================================
--- trunk/pixelle/etc/pixelle.jnlp	2012-03-12 02:57:00 UTC (rev 320)
+++ trunk/pixelle/etc/pixelle.jnlp	2012-03-18 04:52:16 UTC (rev 321)
@@ -15,13 +15,11 @@
       <all-permissions/> 
   </security> 
   <resources> 
-    <j2se version="1.5+" initial-heap-size="500m" max-heap-size="1200m"/>
-    <jar href="pixelle-$VERSION.jar"/> 
-    <jar href="antlr-2.7.7.jar"/> 
-    <jar href="antlr-3.1b1.jar"/> 
-    <jar href="antlr-runtime-3.1b1.jar"/> 
-    <jar href="asm-3.1.jar"/> 
-    <jar href="stringtemplate-3.1.jar"/> 
+    <j2se version="1.6+" initial-heap-size="500m" max-heap-size="1200m"/>
+    <jar href="pixelle-$VERSION.jar"/>
+    <jar href="antlr-runtime-3.4.jar"/> 
+    <jar href="asm-3.3.1.jar"/> 
+    <jar href="stringtemplate-4.0.2.jar"/> 
   </resources> 
   <application-desc main-class="com.mebigfatguy.pixelle.Pixelle"/> 
 </jnlp> 

Modified: trunk/pixelle/pixelle.store
===================================================================
(Binary files differ)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.