Apply changes of dfs-adaptation which changes DfsInputData and getDepthData()

[Version] 1.0.9-0
[Issue type] update

https://review.tizen.org/gerrit/#/c/platform/core/multimedia/dfs-adaptation/+/279930 Change inputFormat in DfsInputData structure to format

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

diff --git a/packaging/dfs-opencv.spec b/packaging/dfs-opencv.spec
index 90dad4d056ab89561211f77989bd221bf3c161bd..0a86ec4b6b24997b24229777967d92ce0838ece5 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.8
+Version:    1.0.9
 Release:    0
 Group:      Multimedia/Libraries
 License:    Apache-2.0

diff --git a/src/dfs_opencv.cpp b/src/dfs_opencv.cpp
index 1d67282f4083dc762f7d7b5a89284125a56bd61f..9100d13033e157810f9e840f19120add97187801 100644 (file)
--- a/src/dfs_opencv.cpp
+++ b/src/dfs_opencv.cpp
@@ -327,7 +327,7 @@ namespace DfsAdaptationImpl
                int dataCvType = 1;
                cv::Mat baseMat, extraMat;
 
-               if (data.inputFormat == DFS_DATA_INPUT_FORMAT_COUPLED_SBS) {
+               if (data.format == DFS_DATA_INPUT_FORMAT_COUPLED_SBS) {
                        LOGI("side-by-side");
                        if (cv::Size(data.width >> 1, data.height) != mImageSize) {
                                throw std::runtime_error("invalid size");
@@ -474,7 +474,7 @@ namespace DfsAdaptationImpl
                LOGI("LEAVE");
        }
 
-       DfsOutputData& DfsOCV::getDepthData()
+       DfsOutputData& DfsOCV::getOutputData()
        {
                LOGI("ENTER");
 

diff --git a/src/dfs_opencv_private.h b/src/dfs_opencv_private.h
index 42123677a4b00fc3c44c1143bc56c81018f3f9ba..2506779446529a9c599071530759e98ba058f0e3 100644 (file)
--- a/src/dfs_opencv_private.h
+++ b/src/dfs_opencv_private.h
@@ -136,7 +136,7 @@ namespace DfsAdaptationImpl
                                                size_t minDisp, size_t maxDisp, std::string stereoConfigPath) override;
                void run(DfsInputData& data) override;
 
-               DfsOutputData& getDepthData() override;
+               DfsOutputData& getOutputData() override;
 
        };
 }