From: Tae-Young Chung <ty83.chung@samsung.com>
Date: Thu, 27 Jan 2022 05:54:28 +0000 (+0900)
Subject: Change constant 16 and 1.0/16.0 values to constexpr
X-Git-Tag: submit/tizen/20220701.002357~1^2~5
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f56956e10fb8559a47b0c91acb103ee58a7299ee;p=platform%2Fcore%2Fmultimedia%2Fdfs-opencv.git

Change constant 16 and 1.0/16.0 values to constexpr

Signed-off-by: Tae-Young Chung <ty83.chung@samsung.com>
---

diff --git a/packaging/dfs-opencv.spec b/packaging/dfs-opencv.spec
index 92915f6..2fc231f 100644
--- a/packaging/dfs-opencv.spec
+++ b/packaging/dfs-opencv.spec
@@ -1,7 +1,7 @@
 Name:       dfs-opencv
 Summary:    OpenCV based Depth-from-Stereo implementation
 Version:    1.0.2
-Release:    0
+Release:    1
 Group:      Multimedia/Libraries
 License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
diff --git a/src/dfs_opencv.cpp b/src/dfs_opencv.cpp
index 9c8018e..d3010e5 100644
--- a/src/dfs_opencv.cpp
+++ b/src/dfs_opencv.cpp
@@ -164,8 +164,8 @@ namespace DfsAdaptationImpl
 		mDfsParam = param;
 		mImageSize = cv::Size(width, height);
 		mMinDisparity = minDisp;
-		mNumDisparities = static_cast<int>(static_cast<float>(maxDisp - minDisp+1)/16.f);
-		mNumDisparities *= 16;
+		mNumDisparities = static_cast<int>(static_cast<float>(maxDisp - minDisp+1)*mDispShiftInv);
+		mNumDisparities *= mDispShift;
 		LOGE("mMinDisparity: %zd, mNumDisparities: %zd", mMinDisparity, mNumDisparities);
 		if (mDownScale) {
 			mMinDisparity >>= mDownScale;
@@ -433,7 +433,7 @@ namespace DfsAdaptationImpl
 				}
 				mDfsPostOcv->filter(dispMat, rBaseMat, dispFiltMat);
 			}
-			dispFiltMat.convertTo(mDispMat, CV_32F, 1.0/16.0);
+			dispFiltMat.convertTo(mDispMat, CV_32F, mDispShiftInv);
 		} else {
 			LOGI("left : %s", results[0].get() ? "true" : "false");
 			if (mDownScale) {
@@ -443,9 +443,9 @@ namespace DfsAdaptationImpl
 					static_cast<double>(1<<mDownScale),
 					static_cast<double>(1<<mDownScale));
 
-				tmp.convertTo(mDispMat, CV_32F, (1.0/16.0) * static_cast<double>(1 << mDownScale));
+				tmp.convertTo(mDispMat, CV_32F, mDispShiftInv * static_cast<double>(1 << mDownScale));
 			} else {
-				dispMat.convertTo(mDispMat, CV_32F, 1.0/16.0);
+				dispMat.convertTo(mDispMat, CV_32F, mDispShiftInv);
 			}
 		}
 
diff --git a/src/dfs_opencv_private.h b/src/dfs_opencv_private.h
index 16ebb8a..3c3082f 100644
--- a/src/dfs_opencv_private.h
+++ b/src/dfs_opencv_private.h
@@ -87,6 +87,9 @@ namespace DfsAdaptationImpl
 		size_t mP1;
 		size_t mP2;
 		size_t mPreFilterCap;
+		static constexpr size_t mDispShift = 16;
+		static constexpr float mDispShiftInv = 1.0f/16.f;
+
 
 		cv::Mat mDispMat;
 		DfsData mDepthData;