Merge branch 'master' of https://github.com/atduskgreg/opencv-processing

atduskgreg · atduskgreg · commit f1aebe67ebb7 · 2014-10-17T15:58:33.000-04:00
diff --git a/src/gab/opencv/OpenCV.java b/src/gab/opencv/OpenCV.java
@@ -38,6 +38,7 @@
 import java.awt.image.BufferedImage;
 import java.awt.image.DataBufferInt;
 import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
 import java.nio.IntBuffer;
 import java.io.File;
 import java.lang.reflect.Field;
@@ -1067,6 +1068,72 @@ 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
+     */
+    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;
+    }
 	
 	
 	/**
@@ -1087,23 +1154,11 @@ public void toPImage(Mat m, PImage img){
 		  img.loadPixels();
 
 		  if(m.channels() == 3){
-			  byte[] matPixels = new byte[width*height*3];
-			  m.get(0,0, matPixels);
-			  for(int i = 0; i < m.width()*m.height()*3; i+=3){
-				  img.pixels[PApplet.floor(i/3)] = parent.color(matPixels[i+2]&0xFF, matPixels[i+1]&0xFF, matPixels[i]&0xFF);
-			  }
+              img.pixels = threeChanMatToARGBPixels(m);
 		  } else if(m.channels() == 1){
-			  byte[] matPixels = new byte[width*height];
-			  m.get(0,0, matPixels);
-		      for(int i = 0; i < m.width()*m.height(); i++){
-		    	  img.pixels[i] = parent.color(matPixels[i]&0xFF);
-		      }
+              img.pixels = grayMatToARGBPixels(m);
 		  } else if(m.channels() == 4){
-			  byte[] matPixels = new byte[width*height*4];
-			  m.get(0,0, matPixels);
-			  for(int i = 0; i < m.width()*m.height()*4; i+=4){				  
-				  img.pixels[PApplet.floor(i/4)] = parent.color(matPixels[i+2]&0xFF, matPixels[i+1]&0xFF, matPixels[i]&0xFF, matPixels[i+3]&0xFF);
-			  }
+              img.pixels = fourChanMatToARGBPixels(m);
 		  }
 		  
 		  img.updatePixels();
