if globalFMThr is not explicitly set in convenience function apply, t…

…he value from FocusEstimation is the current one (default or set)
TUWien · Jan 11, 2017 · 403059d · 403059d
1 parent 0211594
commit 403059d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/app/src/main/jni/FocusMeasure.cpp b/app/src/main/jni/FocusMeasure.cpp
@@ -595,8 +595,9 @@ namespace dsc {
 		fe.setWindowSize(ws);
 
 		fe.setImg(src);
-		fe.setGlobalFMThreshold(globalFMThr);
-
+		if (globalFMThr > 0) {
+		    fe.setGlobalFMThreshold(globalFMThr);
+		}
 
 		////version 1
 		//fe.compute(dsc::FocusEstimation::FocusMeasure::LAPV);

diff --git a/app/src/main/jni/FocusMeasure.h b/app/src/main/jni/FocusMeasure.h
@@ -165,7 +165,7 @@ namespace dsc {
 		void setTextThrshold(double t);
 		double textThr() const;
 
-		static std::vector<dsc::Patch> apply(const cv::Mat& src, const double globalFMThr = 0.15);
+		static std::vector<dsc::Patch> apply(const cv::Mat& src, const double globalFMThr = -1.0);
 
 	protected:
 		cv::Mat mSrcImg;