Color-only image processing functions don't raise an exception,

atduskgreg · atduskgreg · commit 60251cce27fb · 2013-06-25T10:33:32.000-04:00
but only print out an error message, a la Shiffman.
diff --git a/distribution/OpenCVPro-1/download/OpenCVPro-1.zip b/distribution/OpenCVPro-1/download/OpenCVPro-1.zip
diff --git a/distribution/OpenCVPro-1/download/OpenCVPro.zip b/distribution/OpenCVPro-1/download/OpenCVPro.zip
diff --git a/distribution/OpenCVPro-1/examples/WorkingWithColorImages/WorkingWithColorImages.pde b/distribution/OpenCVPro-1/examples/WorkingWithColorImages/WorkingWithColorImages.pde
@@ -1,9 +1,7 @@
 import gab.opencvpro.*;
-import org.opencv.core.Mat;
-import org.opencv.imgproc.Imgproc;
 
 OpenCVPro opencv;
-PImage threshold;
+PImage threshold, blur;
 
 void setup() {
   PImage img = loadImage("test.jpg");
@@ -16,14 +14,16 @@ void setup() {
   opencv.useColor();  
 
   // A lot of OpenCV operations only work on gray.
-  // But some do work in color, like threshold:
+  // But some do work in color, like threshold, blur, findCannyEdges, findChessboardCorners, etc.:
   opencv.threshold(75);
   threshold = opencv.getSnapshot();
 
+  opencv.blur(30);
+  blur = opencv.getSnapshot();
+
   // If you try an operation that does not work in color
   // it will raise an exception and print out a message:
   try{
-    opencv.loadImage(img);
     opencv.adaptiveThreshold(591, 1);
   } catch (Exception e){
   }
@@ -33,5 +33,6 @@ void setup() {
 void draw() {
   scale(0.5);
   image(threshold, 0, 0);
+  image(blur, threshold.width,0);
 }
 
diff --git a/distribution/OpenCVPro-1/index.html b/distribution/OpenCVPro-1/index.html
@@ -42,7 +42,7 @@ <h1>OpenCVPro</h1>
 			<h2>OpenCVPro</h2>
 			<p>
 			A library by <a href="http://gregborenstein.com">Greg Borenstein</a> for the <a href="http://www.processing.org" target="_blank">Processing</a> programming environment.<br>
-			Last update, 06/24/2013.
+			Last update, 06/25/2013.
 			</p>
 			<p>
 			Computer vision with OpenCV based on the official OpenCV Java API.<br>
diff --git a/distribution/OpenCVPro-1/reference/allclasses-frame.html b/distribution/OpenCVPro-1/reference/allclasses-frame.html
@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_45) on Mon Jun 24 16:59:16 EDT 2013 -->
+<!-- Generated by javadoc (build 1.6.0_45) on Tue Jun 25 10:25:22 EDT 2013 -->
 <TITLE>
 All Classes (Javadocs: OpenCVPro)
 </TITLE>
 
-<META NAME="date" CONTENT="2013-06-24">
+<META NAME="date" CONTENT="2013-06-25">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
 
diff --git a/distribution/OpenCVPro-1/reference/allclasses-noframe.html b/distribution/OpenCVPro-1/reference/allclasses-noframe.html
@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_45) on Mon Jun 24 16:59:16 EDT 2013 -->
+<!-- Generated by javadoc (build 1.6.0_45) on Tue Jun 25 10:25:22 EDT 2013 -->
 <TITLE>
 All Classes (Javadocs: OpenCVPro)
 </TITLE>
 
-<META NAME="date" CONTENT="2013-06-24">
+<META NAME="date" CONTENT="2013-06-25">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
 
diff --git a/distribution/OpenCVPro-1/reference/constant-values.html b/distribution/OpenCVPro-1/reference/constant-values.html
@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_45) on Mon Jun 24 16:59:16 EDT 2013 -->
+<!-- Generated by javadoc (build 1.6.0_45) on Tue Jun 25 10:25:22 EDT 2013 -->
 <TITLE>
 Constant Field Values (Javadocs: OpenCVPro)
 </TITLE>
 
-<META NAME="date" CONTENT="2013-06-24">
+<META NAME="date" CONTENT="2013-06-25">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
 
diff --git a/distribution/OpenCVPro-1/reference/deprecated-list.html b/distribution/OpenCVPro-1/reference/deprecated-list.html
@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_45) on Mon Jun 24 16:59:16 EDT 2013 -->
+<!-- Generated by javadoc (build 1.6.0_45) on Tue Jun 25 10:25:22 EDT 2013 -->
 <TITLE>
 Deprecated List (Javadocs: OpenCVPro)
 </TITLE>
 
-<META NAME="date" CONTENT="2013-06-24">
+<META NAME="date" CONTENT="2013-06-25">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
 
diff --git a/distribution/OpenCVPro-1/reference/gab/opencvpro/Contour.html b/distribution/OpenCVPro-1/reference/gab/opencvpro/Contour.html
@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_45) on Mon Jun 24 16:59:16 EDT 2013 -->
+<!-- Generated by javadoc (build 1.6.0_45) on Tue Jun 25 10:25:22 EDT 2013 -->
 <TITLE>
 Contour (Javadocs: OpenCVPro)
 </TITLE>
 
-<META NAME="date" CONTENT="2013-06-24">
+<META NAME="date" CONTENT="2013-06-25">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../stylesheet.css" TITLE="Style">
 
diff --git a/distribution/OpenCVPro-1/reference/gab/opencvpro/OpenCVPro.html b/distribution/OpenCVPro-1/reference/gab/opencvpro/OpenCVPro.html
@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_45) on Mon Jun 24 16:59:16 EDT 2013 -->
+<!-- Generated by javadoc (build 1.6.0_45) on Tue Jun 25 10:25:22 EDT 2013 -->
 <TITLE>
 OpenCVPro (Javadocs: OpenCVPro)
 </TITLE>
 
-<META NAME="date" CONTENT="2013-06-24">
+<META NAME="date" CONTENT="2013-06-25">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../stylesheet.css" TITLE="Style">
 
diff --git a/distribution/OpenCVPro-1/reference/gab/opencvpro/package-frame.html b/distribution/OpenCVPro-1/reference/gab/opencvpro/package-frame.html
@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_45) on Mon Jun 24 16:59:16 EDT 2013 -->
+<!-- Generated by javadoc (build 1.6.0_45) on Tue Jun 25 10:25:22 EDT 2013 -->
 <TITLE>
 gab.opencvpro (Javadocs: OpenCVPro)
 </TITLE>
 
-<META NAME="date" CONTENT="2013-06-24">
+<META NAME="date" CONTENT="2013-06-25">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../stylesheet.css" TITLE="Style">
 
diff --git a/distribution/OpenCVPro-1/reference/gab/opencvpro/package-summary.html b/distribution/OpenCVPro-1/reference/gab/opencvpro/package-summary.html
@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_45) on Mon Jun 24 16:59:16 EDT 2013 -->
+<!-- Generated by javadoc (build 1.6.0_45) on Tue Jun 25 10:25:22 EDT 2013 -->
 <TITLE>
 gab.opencvpro (Javadocs: OpenCVPro)
 </TITLE>
 
-<META NAME="date" CONTENT="2013-06-24">
+<META NAME="date" CONTENT="2013-06-25">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../stylesheet.css" TITLE="Style">
 
diff --git a/distribution/OpenCVPro-1/reference/gab/opencvpro/package-tree.html b/distribution/OpenCVPro-1/reference/gab/opencvpro/package-tree.html
@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_45) on Mon Jun 24 16:59:16 EDT 2013 -->
+<!-- Generated by javadoc (build 1.6.0_45) on Tue Jun 25 10:25:22 EDT 2013 -->
 <TITLE>
 gab.opencvpro Class Hierarchy (Javadocs: OpenCVPro)
 </TITLE>
 
-<META NAME="date" CONTENT="2013-06-24">
+<META NAME="date" CONTENT="2013-06-25">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../stylesheet.css" TITLE="Style">
 
diff --git a/distribution/OpenCVPro-1/reference/help-doc.html b/distribution/OpenCVPro-1/reference/help-doc.html
@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_45) on Mon Jun 24 16:59:16 EDT 2013 -->
+<!-- Generated by javadoc (build 1.6.0_45) on Tue Jun 25 10:25:22 EDT 2013 -->
 <TITLE>
 API Help (Javadocs: OpenCVPro)
 </TITLE>
 
-<META NAME="date" CONTENT="2013-06-24">
+<META NAME="date" CONTENT="2013-06-25">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
 
diff --git a/distribution/OpenCVPro-1/reference/index-all.html b/distribution/OpenCVPro-1/reference/index-all.html
@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_45) on Mon Jun 24 16:59:16 EDT 2013 -->
+<!-- Generated by javadoc (build 1.6.0_45) on Tue Jun 25 10:25:22 EDT 2013 -->
 <TITLE>
 Index (Javadocs: OpenCVPro)
 </TITLE>
 
-<META NAME="date" CONTENT="2013-06-24">
+<META NAME="date" CONTENT="2013-06-25">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="./stylesheet.css" TITLE="Style">
 
diff --git a/distribution/OpenCVPro-1/reference/index.html b/distribution/OpenCVPro-1/reference/index.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc on Mon Jun 24 16:59:16 EDT 2013-->
+<!-- Generated by javadoc on Tue Jun 25 10:25:22 EDT 2013-->
 <TITLE>
 Javadocs: OpenCVPro
 </TITLE>
diff --git a/distribution/OpenCVPro-1/reference/overview-tree.html b/distribution/OpenCVPro-1/reference/overview-tree.html
@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_45) on Mon Jun 24 16:59:16 EDT 2013 -->
+<!-- Generated by javadoc (build 1.6.0_45) on Tue Jun 25 10:25:22 EDT 2013 -->
 <TITLE>
 Class Hierarchy (Javadocs: OpenCVPro)
 </TITLE>
 
-<META NAME="date" CONTENT="2013-06-24">
+<META NAME="date" CONTENT="2013-06-25">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
 
diff --git a/examples/WorkingWithColorImages/WorkingWithColorImages.pde b/examples/WorkingWithColorImages/WorkingWithColorImages.pde
@@ -1,19 +1,19 @@
 import gab.opencvpro.*;
 
 OpenCVPro opencv;
-PImage threshold, blur;
+PImage threshold, blur, adaptive, gray;
 
 void setup() {
   PImage img = loadImage("test.jpg");
-  size(img.width, img.height/2);
+  size(img.width, img.height);
 
   // By default, OpenCVPro works with a gray
   // version of the source image
   opencv = new OpenCVPro(this, img);
   // but you can tell it explicitly to use color instead:
   opencv.useColor();  
 
-  // A lot of OpenCV operations only work on gray.
+  // A lot of OpenCV operations only work on grayscale images.
   // But some do work in color, like threshold, blur, findCannyEdges, findChessboardCorners, etc.:
   opencv.threshold(75);
   threshold = opencv.getSnapshot();
@@ -22,17 +22,22 @@ void setup() {
   blur = opencv.getSnapshot();
 
   // If you try an operation that does not work in color
-  // it will raise an exception and print out a message:
-  try{
-    opencv.adaptiveThreshold(591, 1);
-  } catch (Exception e){
-  }
-
+  // it will print out an error message and leave the image unaffected
+  opencv.adaptiveThreshold(591, 1);
+  adaptive = opencv.getSnapshot();
+  
+  // if you convert the image to gray then you can
+  // do gray-only operations
+  opencv.gray();
+  opencv.adaptiveThreshold(591, 1);
+  gray = opencv.getSnapshot();
 }
 
 void draw() {
   scale(0.5);
   image(threshold, 0, 0);
   image(blur, threshold.width,0);
+  image(adaptive, 0,threshold.height);
+  image(gray, threshold.width, threshold.height);
 }
 
diff --git a/src/gab/opencvpro/OpenCVPro.java b/src/gab/opencvpro/OpenCVPro.java
@@ -237,8 +237,6 @@ private void init(int w, int h){
     	height = h;
 		welcome();
 		setupWorkingImages();
-
-		PApplet.println("init buffers at: " + width+"x"+height);
 		
 		bufferR = new Mat(height, width, CvType.CV_8UC1);
 		bufferG = new Mat(height, width, CvType.CV_8UC1);
@@ -315,8 +313,7 @@ public void adaptiveThreshold(int blockSize, int c){
 		try{
 			Imgproc.adaptiveThreshold(getCurrentBuffer(), getCurrentBuffer(), 255, Imgproc.ADAPTIVE_THRESH_GAUSSIAN_C, Imgproc.THRESH_BINARY, blockSize, c);
 		} catch(CvException e){
-			PApplet.println("ERROR: adaptiveThreshold function only works on gray images");
-			throw e;
+			PApplet.println("ERROR: adaptiveThreshold function only works on gray images.");
 		}
 	}
 	
@@ -325,7 +322,6 @@ public void equalizeHistogram(){
 			Imgproc.equalizeHist(getCurrentBuffer(), getCurrentBuffer());
 		} catch(CvException e){
 			PApplet.println("ERROR: equalizeHistogram only works on a gray image.");
-			throw e;
 		}
 	}
 	
@@ -370,8 +366,7 @@ public ArrayList<Contour> findContours(){
 		try{
 		Imgproc.findContours(getCurrentBuffer(), contourMat, new Mat(), Imgproc.RETR_LIST, Imgproc.CHAIN_APPROX_NONE);
 		} catch(CvException e){
-			PApplet.println("ERROR: findContours only works with a gray image");
-			throw e;
+			PApplet.println("ERROR: findContours only works with a gray image.");
 		}
 		  for (MatOfPoint c : contourMat) {
 		    result.add(new Contour(parent, c));
