From a31ca68bf5516ce94cd9ff23ae3898e89c3d21f4 Mon Sep 17 00:00:00 2001
From: benfry <fry@processing.org>
Date: Tue, 21 Sep 2004 14:15:14 +0000
Subject: [PATCH] fix for a bug in get(), also removed debug msg from mouse
 stuff

---
 app/PdeCompiler.java   | 7 +++----
 app/PdeSketchbook.java | 2 +-
 core/PApplet.java      | 1 -
 core/PImage.java       | 3 +--
 core/todo.txt          | 3 +++
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/PdeCompiler.java b/app/PdeCompiler.java
index 83609fa27..e7740919f 100644
--- a/app/PdeCompiler.java
+++ b/app/PdeCompiler.java
@@ -336,10 +336,9 @@ public class PdeCompiler implements PdeMessageConsumer {
   /**
    * Return the path for a folder, with appended paths to 
    * any .jar or .zip files inside that folder.
-   * This will prepend a colon so that it can be directly
-   * appended to another path string.
+   * This will prepend a colon (or whatever the path separator is)
+   * so that it can be directly appended to another path string.
    */
-  //static public String includeFolder(File folder) {
   static public String contentsToClassPath(File folder) {
     if (folder == null) return "";
 
@@ -370,7 +369,7 @@ public class PdeCompiler implements PdeMessageConsumer {
       e.printStackTrace();  // this would be odd
     }
     //System.out.println("included path is " + abuffer.toString());
-    packageListFromClassPath(abuffer.toString());  // WHY?
+    //packageListFromClassPath(abuffer.toString());  // WHY?
     return abuffer.toString();
   }
 
diff --git a/app/PdeSketchbook.java b/app/PdeSketchbook.java
index 3eab6c46e..e979802ad 100644
--- a/app/PdeSketchbook.java
+++ b/app/PdeSketchbook.java
@@ -314,8 +314,8 @@ public class PdeSketchbook {
       buildMenu(popupMenu);
 
       // rebuild the "import library" menu
-      importMenu.removeAll();
       librariesClassPath = "";
+      importMenu.removeAll();
       if (addLibraries(importMenu, new File(getSketchbookPath()))) {
         importMenu.addSeparator();
       }
diff --git a/core/PApplet.java b/core/PApplet.java
index 3a254da27..5ed5bbb8c 100644
--- a/core/PApplet.java
+++ b/core/PApplet.java
@@ -601,7 +601,6 @@ public class PApplet extends Applet
       mousePressed();
       break;
     case MouseEvent.MOUSE_RELEASED:
-      System.out.println("mouse released");
       mousePressed = false;
       mouseReleased();
       break;
diff --git a/core/PImage.java b/core/PImage.java
index c7dcf713d..b542428aa 100644
--- a/core/PImage.java
+++ b/core/PImage.java
@@ -292,8 +292,7 @@ public class PImage implements PConstants, Cloneable {
   public int get(int x, int y) {
     if ((x < 0) || (y < 0) || (x >= width) || (y >= height)) return 0;
     return (format == RGB) ? 
-      (pixels[y*width + x] & 0x00ffffff) : pixels[y*width + x];
-      //(pixels[y*width + x] & 0xff000000) : pixels[y*width + x];
+      (pixels[y*width + x] | 0xff000000) : pixels[y*width + x];
   }
 
 
diff --git a/core/todo.txt b/core/todo.txt
index 35e12e8be..4dd08f60b 100644
--- a/core/todo.txt
+++ b/core/todo.txt
@@ -189,6 +189,9 @@ X   this was problem with rendering an image from PGraphics on board
 X   http://processing.org/discourse/yabb/YaBB.cgi?board=Proce55ing_software_bugs;action=display;num=1091798655;start=0
 X   http://processing.org/discourse/yabb/YaBB.cgi?board=Syntax;action=display;num=1080671926;start=0
 
+040921 morning
+X bug in get() that was removing the high bits (rather than adding)
+
 _ before graphics engine change, attach jogl stuff?
 _ massive graphics engine changes
 _   explicitly state depth()/nodepth()