update getSnapshot() so it returns a PImage corresponding to the ROI if one is set. Closes atduskgreg#52 and atduskgreg#60.

atduskgreg · atduskgreg · commit e70629fcdb2b · 2014-12-08T15:28:09.000-05:00
diff --git a/examples/RegionOfInterest/RegionOfInterest.pde b/examples/RegionOfInterest/RegionOfInterest.pde
@@ -23,6 +23,13 @@ void draw() {
 
   opencv.findCannyEdges(20,75);
   image(opencv.getOutput(), 0, 0);
+  
+  // if an ROI is in-use then getSnapshot()
+  // will return an image with the dimensions
+  // and content of the ROI
+  if(useROI){
+    image(opencv.getSnapshot(), width-roiWidth,0);
+  }
 }
 
 // toggle ROI on and off
diff --git a/resources/build.properties b/resources/build.properties
@@ -149,12 +149,12 @@ source.repository=https://github.com/atduskgreg/OpenCVPro
 # This is used to compare different versions of the same library, and check if 
 # an update is available.
 
-library.version=13
+library.version=14
 
 
 # The version as the user will see it. 
 
-library.prettyVersion=0.5.2
+library.prettyVersion=0.5.3
 
 
 library.copyright=(c) 2013
diff --git a/src/gab/opencv/OpenCV.java b/src/gab/opencv/OpenCV.java
@@ -1284,16 +1284,19 @@ public PImage getOutput(){
 	public PImage getSnapshot(){
 		PImage result;
 		
-		if(useColor){
-			if(colorSpace == PApplet.HSB){
-				result = getSnapshot(matHSV);
+		if(useROI){
+			result = getSnapshot(matROI);
+		} else {
+			if(useColor){
+				if(colorSpace == PApplet.HSB){
+					result = getSnapshot(matHSV);
+				} else {
+					result = getSnapshot(matBGRA);
+				}
 			} else {
-				result = getSnapshot(matBGRA);
+				result = getSnapshot(matGray);
 			}
-		} else {
-			result = getSnapshot(matGray);
 		}
-	
 		return result;
 	}
 	
