diff --git a/build/windows/make.sh b/build/windows/make.sh index add9a5d4e..b640744fc 100755 --- a/build/windows/make.sh +++ b/build/windows/make.sh @@ -203,11 +203,27 @@ cd ../.. CLASSPATH="..\\..\\build\\windows\\work\\lib\\core.jar;..\\..\\build\\windows\\work\\java\\lib\\rt.jar" + cd ../../lib/serial ../../build/windows/work/jikes +D -classpath "RXTXcomm.jar;$CLASSPATH" -d . *.java -#../../build/windows/work/jikes +D -classpath "comm.jar;$CLASSPATH" -d . *.java zip -r0q serial.jar processing rm -rf processing - cp serial.jar "C:\\Documents and Settings\\fry\\My Documents\\sketchbook\\rxtx_work\\code" + +QTJAVA="$WINDIR\\system32\\QTJava.zip" +if test -f "${QTJAVA}" +then + echo "Found Quicktime at $QTJAVA" +else + echo "could not find qtjava.zip in" + echo "${WINDIR}\\system32\\qtjava.zip" + echo "quicktime for java must be installed before building." + exit 1; +fi +cd ../../lib/video +../../build/windows/work/jikes +D -classpath "$QTJAVA;$CLASSPATH" -d . PCamera.java +zip -r0q video.jar processing +rm -rf processing +cp video.jar "C:\\Documents and Settings\\fry\\My Documents\\sketchbook\\new_camera_action\\code" + diff --git a/core/PImage.java b/core/PImage.java index 2ed466c62..793170784 100644 --- a/core/PImage.java +++ b/core/PImage.java @@ -75,7 +75,7 @@ public class PImage implements PConstants, Cloneable { boolean smooth = false; // for gl subclass / hardware accel - int cacheIndex; + public int cacheIndex; // private fields private int fracU, ifU, fracV, ifV, u1, u2, v1, v2, sX, sY, iw, iw1, ih1; @@ -104,7 +104,8 @@ public class PImage implements PConstants, Cloneable { * alpha is zero, it will be transparent. */ public PImage(int width, int height) { - this(new int[width * height], width, height, RGBA); + setup(width, height, RGBA); + //this(new int[width * height], width, height, RGBA); // toxi: is it maybe better to init the image with max alpha enabled? //for(int i=0; i