Fix SIGNED_TO_BIGGER_UNSIGNED svace issues

[Version] 1.0.11-0
[Issue type] bug fix

VD svace: WGID 1113974, 1113975

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

diff --git a/packaging/dfs-opencv.spec b/packaging/dfs-opencv.spec
index 4bf2a3217c57dee9f15c9078ba6709191c83486f..f7e6508b0950ef6e49ce1b65696316ad0afd6007 100644 (file)
--- a/packaging/dfs-opencv.spec
+++ b/packaging/dfs-opencv.spec
@@ -1,6 +1,6 @@
 Name:       dfs-opencv
 Summary:    OpenCV based Depth-from-Stereo implementation
-Version:    1.0.10
+Version:    1.0.11
 Release:    0
 Group:      Multimedia/Libraries
 License:    Apache-2.0

diff --git a/src/dfs_opencv.cpp b/src/dfs_opencv.cpp
index 046283ce0f0ed9d62e81749aefe09bffe94a8459..70e1fe0bda131ec0f9a61f832ce3b854bae669aa 100644 (file)
--- a/src/dfs_opencv.cpp
+++ b/src/dfs_opencv.cpp
@@ -174,7 +174,7 @@ namespace DfsAdaptationImpl
                mDfsParam = param;
                mImageSize = cv::Size(width, height);
                mMinDisparity = minDisp;
-               mNumDisparities = static_cast<int>(static_cast<float>(maxDisp - minDisp+1)*mDispShiftInv);
+               mNumDisparities = static_cast<size_t>(static_cast<float>(maxDisp - minDisp+1)*mDispShiftInv);
                mNumDisparities *= mDispShift;
                LOGE("mMinDisparity: %zd, mNumDisparities: %zd", mMinDisparity, mNumDisparities);
                if (mDownScale) {
@@ -467,20 +467,20 @@ namespace DfsAdaptationImpl
 
                mDepthData.data = mDepthMat.ptr<unsigned short>();
                mDepthData.type = DFS_DATA_TYPE_UINT16C1;
-               mDepthData.width = mDepthMat.cols;
-               mDepthData.height = mDepthMat.rows;
+               mDepthData.width = static_cast<size_t>(mDepthMat.cols);
+               mDepthData.height = static_cast<size_t>(mDepthMat.rows);
                mDepthData.stride = mDepthMat.elemSize() *  mDepthMat.cols;
 
                mBaseData.data = mBaseMat.ptr<unsigned char>();
                mBaseData.type = mBaseMat.channels() > 1 ? DFS_DATA_TYPE_UINT8C3 : DFS_DATA_TYPE_UINT8C1;
-               mBaseData.width = mBaseMat.cols;
-               mBaseData.height = mBaseMat.rows;
+               mBaseData.width = static_cast<size_t>(mBaseMat.cols);
+               mBaseData.height = static_cast<size_t>(mBaseMat.rows);
                mBaseData.stride = mBaseMat.elemSize() *  mBaseMat.cols;
 
                mExtraData.data = mExtraMat.ptr<unsigned char>();
                mExtraData.type = mExtraMat.channels() > 1 ? DFS_DATA_TYPE_UINT8C3 : DFS_DATA_TYPE_UINT8C1;
-               mExtraData.width = mExtraMat.cols;
-               mExtraData.height = mExtraMat.rows;
+               mExtraData.width = static_cast<size_t>(mExtraMat.cols);
+               mExtraData.height = static_cast<size_t>(mExtraMat.rows);
                mExtraData.stride = mExtraMat.elemSize() *  mExtraMat.cols;
 
                LOGI("LEAVE");