calcHist runs without crashing, but not quite yet done

Author: Florin

bea/constants.bea

@@ -345,7 +345,7 @@
 	FONT_HERSHEY_SCRIPT_COMPLEX 
 	FONT_ITALIC 
 
-	
+	CV_FILLED
 
 
 

bea/cv.bea

@@ -294,7 +294,7 @@
 		void cornerHarris(const Mat& src, Mat& dst, int blockSize, int apertureSize, double k, int borderType=BORDER_DEFAULT)
 		void cornerEigenValsAndVecs(const Mat& src, Mat& dst, int blockSize, int apertureSize, int borderType=BORDER_DEFAULT)
 
-		void calcHist(std::vector<cv::Mat> arrays, std::vector<int> channels, const Mat& mask, cv::SparseMat& hist, int dims, std::vector<int> histSize, std::vector<std::vector<float> > ranges, bool uniform = true, bool accumulate = false)
+		void calcHist(std::vector<cv::Mat> arrays, std::vector<int> channels, const Mat& mask, cv::Mat& hist, int dims, std::vector<int> histSize, std::vector<std::vector<float> > ranges, bool uniform = true, bool accumulate = false)
 			#@orgapi void calcHist(const Mat* arrays, int narrays, const int* channels, const Mat& mask, SparseMat& hist, int dims, const int* histSize, const float** ranges, bool uniform=true, bool accumulate=false)
 			@call
 
@@ -314,11 +314,11 @@
 				}
 				cv::calcBackProject(&arrays[0], arrays.size(), &channels[0], *hist, *backProject, (const float**)&vrangs[0], scale, uniform);
 
-		minMaxLocRet minMaxLoc(const SparseMat& a);
-			#@orgapi void minMaxLoc(const SparseMat& a, double* minVal, double* maxVal, int* minIdx=0, int* maxIdx=0 )
+		minMaxLocRet minMaxLoc(const Mat& a);
+			#@orgapi void minMaxLoc(const Mat& a, double* minVal, double* maxVal, int* minIdx=0, int* maxIdx=0 )
 			@call
 				minMaxLocRet fnRetVal;
-				cv::minMaxLoc(*a, &fnRetVal.minVal, &fnRetVal.maxVal, &fnRetVal.minIdx, &fnRetVal.maxIdx);
+				cv::minMaxLoc(*a, &fnRetVal.minVal, &fnRetVal.maxVal, NULL, NULL);
 
 		@manual void cvSmooth(const Mat& src, Mat& dst, int smoothtype=CV_GAUSSIAN, int param1=3, int param2=0, double param3=0, double param4=0)
 

scripts/calcHist.coffee

@@ -2,10 +2,19 @@
 #http://opencv.willowgarage.com/documentation/cpp/imgproc_histograms.html?highlight=calchist#calcHist
 cv = require './opencv'
 keypress = require 'keypress'
+path = require 'path'
 
-src = cv.imread "test.jpg", 1
+fullpath = path.resolve 'lena.jpg'
+
+console.log 'Opening ', fullpath
+src = cv.imread fullpath, 1
 return console.log 'Error opening file' if src.empty
 
+console.log src.size
+
+cv.namedWindow "org", 0
+cv.imshow "org", src
+
 
 hsv = new cv.Mat 
 cv.cvtColor src, hsv, cv.CV_BGR2HSV
@@ -35,24 +44,20 @@ console.log hist.rows + 'x' + hist.cols
 
 minMax = cv.minMaxLoc hist
 
-tmp = new Mat
+tmp = new cv.Mat
 scale = 10
 
 histImg = tmp.zeros sbins * scale, hbins * 10, cv.CV_8UC3
 
-console.log 'Looping...'
 for h in [0..hbins - 1]
 	for s in [0..sbins - 1]
 		binVal = hist.at h, s
 
-		intensity = Math.round(binVal * 255 / maxVal)
-		cv.rectangle histImg, {x: h*scale, y: s*scale}, {x: (h+1)*scale - 1, y: (s+1)*scale - 1}, [255, 0, 0], cv.CV_FILLED
+		intensity = Math.round(binVal * 255 / minMax.maxVal)
+		cv.rectangle histImg, {x: h*scale, y: s*scale}, {x: (h+1)*scale - 1, y: (s+1)*scale - 1}, [255, 0, 0, 0], -1
 
-namedWindow "source", 1
-imshow "source", src
-
-namedWindow "H-S Histogram", 1
-imshow "H-S Histogram", histImg
+cv.namedWindow "H-S Histogram", 1
+cv.imshow "H-S Histogram", histImg
 
 keypress process.stdin
 process.stdin.on 'keypress', (char, key) ->
@@ -62,4 +67,5 @@ process.stdin.on 'keypress', (char, key) ->
 
 process.stdin.setRawMode true
 process.stdin.resume()		
-console.log 'Press ESC to stop.'
+console.log 'Press ESC to stop.'
+

src/opencv_manual.cpp

@@ -9,8 +9,6 @@ using namespace cv;
 
 namespace opencvjs {
 
-
-
 	v8::Handle<v8::Value> JMat::at(const v8::Arguments& args) {
 		METHOD_BEGIN(1);
 		//Experimental - not tested

src/opencvjs.cpp

@@ -3064,11 +3064,11 @@ namespace opencvjs {
 
 	v8::Handle<v8::Value> JOpenCV::calcHist(const v8::Arguments& args) {
 		METHOD_BEGIN(7);
-		//void calcHist(std::vector<cv::Mat> arrays, std::vector<int> channels, const Mat& mask, cv::SparseMat& hist, int dims, std::vector<int> histSize, std::vector<std::vector<float> > ranges, bool uniform = true, bool accumulate = false)
+		//void calcHist(std::vector<cv::Mat> arrays, std::vector<int> channels, const Mat& mask, cv::Mat& hist, int dims, std::vector<int> histSize, std::vector<std::vector<float> > ranges, bool uniform = true, bool accumulate = false)
 		std::vector<cv::Mat> arrays = bea::Convert<std::vector<cv::Mat> >::FromJS(args[0], 0);
 		std::vector<int> channels = bea::Convert<std::vector<int> >::FromJS(args[1], 1);
 		cv::Mat* mask = bea::Convert<cv::Mat*>::FromJS(args[2], 2);
-		cv::SparseMat* hist = bea::Convert<cv::SparseMat*>::FromJS(args[3], 3);
+		cv::Mat* hist = bea::Convert<cv::Mat*>::FromJS(args[3], 3);
 		int dims = bea::Convert<int>::FromJS(args[4], 4);
 		std::vector<int> histSize = bea::Convert<std::vector<int> >::FromJS(args[5], 5);
 		std::vector<std::vector<float> > ranges = bea::Convert<std::vector<std::vector<float> > >::FromJS(args[6], 6);
@@ -3085,11 +3085,11 @@ namespace opencvjs {
 	}
 
 	v8::Handle<v8::Value> JOpenCV::minMaxLoc(const v8::Arguments& args) {
-		METHOD_BEGIN(1);
-		//minMaxLocRet minMaxLoc(const SparseMat& a)
-		cv::SparseMat* a = bea::Convert<cv::SparseMat*>::FromJS(args[0], 0);
+		METHOD_BEGIN(1);	
+		//minMaxLocRet minMaxLoc(const Mat& a)
+		cv::Mat* a = bea::Convert<cv::Mat*>::FromJS(args[0], 0);
 		minMaxLocRet fnRetVal;
-		cv::minMaxLoc(*a, &fnRetVal.minVal, &fnRetVal.maxVal, &fnRetVal.minIdx, &fnRetVal.maxIdx);
+		cv::minMaxLoc(*a, &fnRetVal.minVal, &fnRetVal.maxVal, NULL, NULL);
 
 		return bea::Convert<cv::minMaxLocRet>::ToJS(fnRetVal);
 		METHOD_END();