From 4678c01ace6e4ed8def627d83a9475ca67d0ae4e Mon Sep 17 00:00:00 2001 From: Tae-Young Chung Date: Mon, 28 Nov 2022 12:12:59 +0900 Subject: [PATCH] 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 --- packaging/dfs-opencv.spec | 2 +- src/dfs_opencv.cpp | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packaging/dfs-opencv.spec b/packaging/dfs-opencv.spec index 4bf2a32..f7e6508 100644 --- 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 046283c..70e1fe0 100644 --- 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(static_cast(maxDisp - minDisp+1)*mDispShiftInv); + mNumDisparities = static_cast(static_cast(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(); mDepthData.type = DFS_DATA_TYPE_UINT16C1; - mDepthData.width = mDepthMat.cols; - mDepthData.height = mDepthMat.rows; + mDepthData.width = static_cast(mDepthMat.cols); + mDepthData.height = static_cast(mDepthMat.rows); mDepthData.stride = mDepthMat.elemSize() * mDepthMat.cols; mBaseData.data = mBaseMat.ptr(); 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(mBaseMat.cols); + mBaseData.height = static_cast(mBaseMat.rows); mBaseData.stride = mBaseMat.elemSize() * mBaseMat.cols; mExtraData.data = mExtraMat.ptr(); 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(mExtraMat.cols); + mExtraData.height = static_cast(mExtraMat.rows); mExtraData.stride = mExtraMat.elemSize() * mExtraMat.cols; LOGI("LEAVE"); -- 2.34.1