combine mat-to-pimage pixel functions into one; cleanup all examples to not call for P2D explicitly

atduskgreg · atduskgreg · commit f25fe8d60852 · 2014-10-17T16:19:45.000-04:00
diff --git a/examples/BrightnessContrast/BrightnessContrast.pde b/examples/BrightnessContrast/BrightnessContrast.pde
@@ -5,7 +5,7 @@ OpenCV opencv;
 
 void setup(){
   img = loadImage("test.jpg");
-  size(img.width, img.height, P2D);
+  size(img.width, img.height);
   opencv = new OpenCV(this, img);  
 }
 
diff --git a/examples/CalibrationDemo/CalibrationDemo.pde b/examples/CalibrationDemo/CalibrationDemo.pde
@@ -7,7 +7,7 @@ OpenCV opencv;
 void setup() {
   src = loadImage("checkerboard.jpg");
   src.resize(500, 0);
-  size(src.width, src.height, P2D);
+  size(src.width, src.height);
 
   opencv = new OpenCV(this, src);
   opencv.gray();
diff --git a/examples/ColorChannels/ColorChannels.pde b/examples/ColorChannels/ColorChannels.pde
@@ -7,8 +7,9 @@ int imgH, imgW;
 
 void setup() {
   src = loadImage("green_object.png");
+  src.resize(800,0);
   opencv = new OpenCV(this, src);  
-  size(int(opencv.width*1.5), int(opencv.height * 1.5), P2D);
+  size(int(opencv.width*1.5), int(opencv.height * 1.5));
   
   imgH = src.height/2;
   imgW = src.width/2;
diff --git a/examples/DilationAndErosion/DilationAndErosion.pde b/examples/DilationAndErosion/DilationAndErosion.pde
@@ -6,7 +6,7 @@ OpenCV opencv;
 void setup() {
   src = loadImage("pen_sketch.jpg"); 
   src.resize(src.width/2, 0);
-  size(src.width*2, src.height*2, P2D);
+  size(src.width*2, src.height*2);
 
   opencv = new OpenCV(this, src);
 
diff --git a/examples/FindContours/FindContours.pde b/examples/FindContours/FindContours.pde
@@ -8,7 +8,7 @@ ArrayList<Contour> polygons;
 
 void setup() {
   src = loadImage("test.jpg"); 
-  size(src.width, src.height/2, P2D);
+  size(src.width, src.height/2);
   opencv = new OpenCV(this, src);
 
   opencv.gray();
diff --git a/examples/FindEdges/FindEdges.pde b/examples/FindEdges/FindEdges.pde
@@ -5,7 +5,7 @@ PImage src, canny, scharr, sobel;
 
 void setup() {
   src = loadImage("test.jpg");
-  size(src.width, src.height, P2D);
+  size(src.width, src.height);
   
   opencv = new OpenCV(this, src);
   opencv.findCannyEdges(20,75);
diff --git a/examples/FindHistogram/FindHistogram.pde b/examples/FindHistogram/FindHistogram.pde
@@ -6,7 +6,7 @@ Histogram grayHist, rHist, gHist, bHist;
 PImage img;
 
 void setup() {
-  size(640, 400, P2D);
+  size(640, 400);
   img = loadImage("test.jpg");
   opencv = new OpenCV(this, img);
 
diff --git a/examples/HistogramSkinDetection/HistogramSkinDetection.pde b/examples/HistogramSkinDetection/HistogramSkinDetection.pde
@@ -16,7 +16,7 @@ Mat skinHistogram;
 void setup(){
   src = loadImage("test.jpg");
   src.resize(src.width/2, 0);
-  size(src.width*2 + 256, src.height, P2D);
+  size(src.width*2 + 256, src.height);
   // third argument is: useColor
   opencv = new OpenCV(this, src, true);  
 
diff --git a/examples/HoughLineDetection/HoughLineDetection.pde b/examples/HoughLineDetection/HoughLineDetection.pde
@@ -6,7 +6,7 @@ ArrayList<Line> lines;
 void setup() {
   PImage src = loadImage("film_scan.jpg");
   src.resize(0, 800);
-  size(src.width, src.height, P2D);
+  size(src.width, src.height);
 
   opencv = new OpenCV(this, src);
   opencv.findCannyEdges(20, 75);
diff --git a/examples/HueRangeSelection/HueRangeSelection.pde b/examples/HueRangeSelection/HueRangeSelection.pde
@@ -10,7 +10,7 @@ int upperb = 100;
 void setup() {
   img = loadImage("colored_balls.jpg");
   opencv = new OpenCV(this, img);
-  size(opencv.width, opencv.height, P2D);
+  size(opencv.width, opencv.height);
   opencv.useColor(HSB);
 }
 
diff --git a/examples/LoadAndDisplayImage/LoadAndDisplayImage.pde b/examples/LoadAndDisplayImage/LoadAndDisplayImage.pde
@@ -4,7 +4,7 @@ OpenCV opencv;
 
 void setup() {
   opencv = new OpenCV(this, "test.jpg");
-  size(opencv.width, opencv.height, P2D);
+  size(opencv.width, opencv.height);
 }
 
 void draw() {
diff --git a/examples/LumaVsGray/LumaVsGray.pde b/examples/LumaVsGray/LumaVsGray.pde
@@ -18,7 +18,7 @@ PImage colorImage, grayImage;
 void setup() {
   colorImage = loadImage("flashlight.jpg");
   opencv = new OpenCV(this, colorImage);  
-  size(opencv.width, opencv.height, P2D);
+  size(opencv.width, opencv.height);
   // Save the gray image so we can compare it to Luma
   grayImage = opencv.getSnapshot();
   // Use built-in OpenCV function to conver the color image from BGR to LAB color space.
diff --git a/examples/RegionOfInterest/RegionOfInterest.pde b/examples/RegionOfInterest/RegionOfInterest.pde
@@ -11,7 +11,7 @@ boolean useROI = true;
 void setup() {
   src = loadImage("test.jpg");
   opencv = new OpenCV(this, src);
-  size(opencv.width, opencv.height, P2D);
+  size(opencv.width, opencv.height);
 }
 
 void draw() {
diff --git a/src/gab/opencv/OpenCV.java b/src/gab/opencv/OpenCV.java
@@ -1068,74 +1068,30 @@ public static void ARGBtoBGRA(Mat rgba, Mat bgra){
 	public int getSize(){
 		return width * height;
 	}
-
-
-    /**
-     * Convert a 3 channel OpenCV Mat object into 
-     * pixels to be shoved into a 4 channel ARGB PImage's
-     * pixel array.
-     *
-     * @param m
-     *          A Mat you want converted
-     */
-    public int[] threeChanMatToARGBPixels(Mat m){
-        int pImageChannels = 4;
-        int numPixels = m.width()*m.height();
-        int[] intPixels = new int[numPixels];
-        Mat m2 = new Mat();
-  
-        // Assumes output PImage is ARGB.
-        Imgproc.cvtColor(m, m2, Imgproc.COLOR_RGB2RGBA);
-        byte[] matPixels = new byte[numPixels*pImageChannels];
-  
-        m2.get(0,0, matPixels);
-        ByteBuffer.wrap(matPixels).order(ByteOrder.LITTLE_ENDIAN).asIntBuffer().get(intPixels);
-        return intPixels;
-    }
-
-    /**
-     * Convert a single channel, gray OpenCV Mat object into 
-     * pixels to be shoved into a 4 channel ARGB PImage's
-     * pixel array.
-     *
-     * @param m
-     *          A Mat you want converted
-     */
-    public int[] grayMatToARGBPixels(Mat m){
-        int pImageChannels = 4;
-        int numPixels = m.width()*m.height();
-        int[] intPixels = new int[numPixels];
-        Mat m2 = new Mat();
-  
-        // Assumes output PImage is ARGB.
-        Imgproc.cvtColor(m, m2, Imgproc.COLOR_GRAY2RGBA);
-        byte[] matPixels = new byte[numPixels*pImageChannels];
-  
-        m2.get(0,0, matPixels);
-        ByteBuffer.wrap(matPixels).order(ByteOrder.LITTLE_ENDIAN).asIntBuffer().get(intPixels);
-        return intPixels;
-    }
-
+    
     /**
+     * 
      * Convert a 4 channel OpenCV Mat object into 
      * pixels to be shoved into a 4 channel ARGB PImage's
      * pixel array.
-     *
+     * 
      * @param m
-     *          A Mat you want converted
+     * 		An RGBA Mat we want converted 
+     * @return
+     * 		An int[] formatted to be the pixels of a PImage
      */
-    public int[] fourChanMatToARGBPixels(Mat m){
-        int pImageChannels = 4;
-        int numPixels = m.width()*m.height();
-        int[] intPixels = new int[numPixels];
-        byte[] matPixels = new byte[numPixels*pImageChannels];
-  
-        m.get(0,0, matPixels);
-        ByteBuffer.wrap(matPixels).order(ByteOrder.LITTLE_ENDIAN).asIntBuffer().get(intPixels);
-        return intPixels;
+    public int[] matToARGBPixels(Mat m){
+    	 int pImageChannels = 4;
+         int numPixels = m.width()*m.height();
+         int[] intPixels = new int[numPixels];
+         byte[] matPixels = new byte[numPixels*pImageChannels];
+   
+         m.get(0,0, matPixels);
+         ByteBuffer.wrap(matPixels).order(ByteOrder.LITTLE_ENDIAN).asIntBuffer().get(intPixels);
+         return intPixels;
     }
-	
-	
+
+ 
 	/**
 	 * Convert an OpenCV Mat object into a PImage
 	 * to be used in other Processing code.
@@ -1154,11 +1110,15 @@ public void toPImage(Mat m, PImage img){
 		  img.loadPixels();
 
 		  if(m.channels() == 3){
-              img.pixels = threeChanMatToARGBPixels(m);
+			  Mat m2 = new Mat();
+			  Imgproc.cvtColor(m, m2, Imgproc.COLOR_RGB2RGBA);
+              img.pixels = matToARGBPixels(m2);
 		  } else if(m.channels() == 1){
-              img.pixels = grayMatToARGBPixels(m);
+			  Mat m2 = new Mat();
+			  Imgproc.cvtColor(m, m2, Imgproc.COLOR_GRAY2RGBA);
+              img.pixels = matToARGBPixels(m2);
 		  } else if(m.channels() == 4){
-              img.pixels = fourChanMatToARGBPixels(m);
+              img.pixels = matToARGBPixels(m);
 		  }
 		  
 		  img.updatePixels();

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ OpenCV opencv;`
`5`	`5`
`6`	`6`	`void setup(){`
`7`	`7`	`img = loadImage("test.jpg");`
`8`		`- size(img.width, img.height, P2D);`
	`8`	`+ size(img.width, img.height);`
`9`	`9`	`opencv = new OpenCV(this, img);`
`10`	`10`	`}`
`11`	`11`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ int upperb = 100;`
`10`	`10`	`void setup() {`
`11`	`11`	`img = loadImage("colored_balls.jpg");`
`12`	`12`	`opencv = new OpenCV(this, img);`
`13`		`- size(opencv.width, opencv.height, P2D);`
	`13`	`+ size(opencv.width, opencv.height);`
`14`	`14`	`opencv.useColor(HSB);`
`15`	`15`	`}`
`16`	`16`