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 92915f67d548f4dbe9454e1ffa6695ea33ee294a..2fc231f99c5aa3298a85e6a46bac56079408b1e6 100644 (file)
--- 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 9c8018ec465a2d8c283d00640b8282b5ca1d7b34..d3010e50067946191453115201ff147d4a812caf 100644 (file)
--- 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 16ebb8a6d9427b740aa6f3c5e772d4a02e4f1fd9..3c3082f55ca95be695ef10060827e26ff0cbcec0 100644 (file)
--- 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;