Merge branch 'ide-1.5.x' into dev-ide-1.5.x-discovery

Conflicts:
	app/src/processing/app/Preferences.java
	app/src/processing/app/debug/Uploader.java

1 files changed, 0 insertions, 64 deletions

diff --git a/libraries/TFT/utility/PImage.h b/libraries/TFT/utility/PImage.h
deleted file mode 100644
index d37bf71..0000000
--- a/libraries/TFT/utility/PImage.h
+++ /dev/null
@@ -1,64 +0,0 @@
-
-
-#ifndef _PIMAGE_H
-#define _PIMAGE_H
-
-class Adafruit_GFX;
-
-#if defined(__SD_H__)  // Arduino SD library
-
-
-/// This class mimics Processing's PImage, but with fewer
-/// capabilities. It allows an image stored in the SD card to be
-/// drawn to the display.
-/// @author Enrico Gueli <enrico.gueli@gmail.com>
-class PImage {
-public:
-  PImage() : 
-    _valid(false), 
-    _bmpWidth(0), 
-    _bmpHeight(0) { }
-  
-  void draw(Adafruit_GFX & glcd, int16_t x, int16_t y);
-  
-  static PImage loadImage(const char * fileName);
-  
-  
-  bool isValid() { return _valid; }
-  
-  int width() { return _bmpWidth; }
-  int height() { return _bmpHeight; }
-  
-private:
-  friend class Adafruit_GFX;
-  
-  File _bmpFile;
-  int  _bmpWidth, _bmpHeight;   // W+H in pixels
-  uint8_t  _bmpDepth;              // Bit depth (currently must be 24)
-  uint32_t _bmpImageoffset;        // Start of image data in file
-  uint32_t _rowSize;               // Not always = bmpWidth; may have padding
-  bool     _flip; 
-  
-  bool     _valid;
-  
-  PImage(File & bmpFile, int bmpWidth, int bmpHeight, uint8_t  bmpDepth, uint32_t bmpImageoffset, uint32_t rowSize, bool     flip) : 
-  _bmpFile(bmpFile),
-  _bmpWidth(bmpWidth),
-  _bmpHeight(bmpHeight),
-  _bmpDepth(bmpDepth),
-  _bmpImageoffset(bmpImageoffset),
-  _rowSize(rowSize),
-  _flip(flip),
-  _valid(true) // since Adafruit_GFX is friend, we could just let it write the variables and save some CPU cycles
-  { }
-  
-  static uint16_t read16(File f);
-  static uint32_t read32(File f);
-  
-  // TODO close the file in ~PImage and PImage(const PImage&)
-
-};
-
-#endif
-
-#endif // _PIMAGE_H