Change run(DfsInputData& data) to run(DfsInputData& input)

[Version] 1.0.9-1
[Issue type] update

DfsInputData has a member variable, named of data. So, it makes
confusing when run()'s parameter is named of data.
For example, to access data of DfsInputData, data.data has to be used.
So, this changes the run()'s parameter name to input.

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

diff --git a/packaging/dfs-opencv.spec b/packaging/dfs-opencv.spec
index 0a86ec4b6b24997b24229777967d92ce0838ece5..00fd471b5aebbac912503ae5d1ff5f42f44c2602 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.9
-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 9100d13033e157810f9e840f19120add97187801..dc77b8473643f9a29ee071389246f637e874056b 100644 (file)
--- a/src/dfs_opencv.cpp
+++ b/src/dfs_opencv.cpp
@@ -316,29 +316,29 @@ namespace DfsAdaptationImpl
                return results;
        }
 
-       void DfsOCV::run(DfsInputData& data)
+       void DfsOCV::run(DfsInputData& input)
        {
                LOGI("ENTER");
 
-               if (!data.data) {
+               if (!input.data) {
                        throw std::runtime_error("invalid data pointer");
                }
 
                int dataCvType = 1;
                cv::Mat baseMat, extraMat;
 
-               if (data.format == DFS_DATA_INPUT_FORMAT_COUPLED_SBS) {
+               if (input.format == DFS_DATA_INPUT_FORMAT_COUPLED_SBS) {
                        LOGI("side-by-side");
-                       if (cv::Size(data.width >> 1, data.height) != mImageSize) {
+                       if (cv::Size(input.width >> 1, input.height) != mImageSize) {
                                throw std::runtime_error("invalid size");
                        }
 
-                       dataCvType = convertDfsDataTypeToCV(data.type);
+                       dataCvType = convertDfsDataTypeToCV(input.type);
                        if (dataCvType < 0) {
                                throw std::runtime_error("invalid data type");
                        }
-                       cv::Mat mat(cv::Size(data.width, data.height), dataCvType, data.data);
-                       LOGI("%zd x %zd", data.width, data.height);
+                       cv::Mat mat(cv::Size(input.width, input.height), dataCvType, input.data);
+                       LOGI("%zd x %zd", input.width, input.height);
                        baseMat = mat(cv::Rect(0, 0,
                                                mImageSize.width,
                                                mImageSize.height)).clone();
@@ -346,24 +346,24 @@ namespace DfsAdaptationImpl
                                                mImageSize.width,
                                                mImageSize.height)).clone();
                } else {
-                       if (cv::Size(data.width, data.height) != mImageSize ||
-                               cv::Size(data.width, data.height) != mImageSize) {
+                       if (cv::Size(input.width, input.height) != mImageSize ||
+                               cv::Size(input.width, input.height) != mImageSize) {
                                LOGE("%zd x %zd but image size is %d x %d",
-                                               data.width, data.height, mImageSize.width, mImageSize.height);
+                                               input.width, input.height, mImageSize.width, mImageSize.height);
                                throw std::runtime_error("invalid size");
                        }
-                       dataCvType = convertDfsDataTypeToCV(data.type);
+                       dataCvType = convertDfsDataTypeToCV(input.type);
                        if (dataCvType < 0) {
                                LOGE("dataCvType: %d", dataCvType);
                                throw std::runtime_error("invalid data type");
                        }
 
-                       baseMat = cv::Mat(cv::Size(data.width, data.height),
+                       baseMat = cv::Mat(cv::Size(input.width, input.height),
                                                        dataCvType,
-                                                       data.data);;
-                       extraMat = cv::Mat(cv::Size(data.width, data.height),
+                                                       input.data);;
+                       extraMat = cv::Mat(cv::Size(input.width, input.height),
                                                        dataCvType,
-                                                       data.extraData);
+                                                       input.extraData);
                }
 
                if (baseMat.size() != extraMat.size()) {

diff --git a/src/dfs_opencv_private.h b/src/dfs_opencv_private.h
index 2506779446529a9c599071530759e98ba058f0e3..4e8ebf37a63dd055154fa412c0f168612a46b9c9 100644 (file)
--- a/src/dfs_opencv_private.h
+++ b/src/dfs_opencv_private.h
@@ -134,7 +134,7 @@ namespace DfsAdaptationImpl
 
                void initialize(DfsParameter& param, size_t width, size_t height,
                                                size_t minDisp, size_t maxDisp, std::string stereoConfigPath) override;
-               void run(DfsInputData& data) override;
+               void run(DfsInputData& input) override;
 
                DfsOutputData& getOutputData() override;