From c64f1a31e43d3589c926d131b60052bbb7e1bbe4 Mon Sep 17 00:00:00 2001 From: thibault allenet <thibault.allenet@cea.fr> Date: Mon, 29 Jan 2024 09:58:43 +0000 Subject: [PATCH] Change opencv imread flag to IMREAD_UNCHANGED --- .../aidge/backend/opencv/stimuli/StimuliImpl_opencv_imread.hpp | 2 +- unit_tests/Test_Stimuli.cpp | 2 +- unit_tests/Test_StimuliImpl_opencv_imread.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/aidge/backend/opencv/stimuli/StimuliImpl_opencv_imread.hpp b/include/aidge/backend/opencv/stimuli/StimuliImpl_opencv_imread.hpp index 78590a1..49e983b 100644 --- a/include/aidge/backend/opencv/stimuli/StimuliImpl_opencv_imread.hpp +++ b/include/aidge/backend/opencv/stimuli/StimuliImpl_opencv_imread.hpp @@ -30,7 +30,7 @@ namespace Aidge { class StimuliImpl_opencv_imread : public StimuliImpl { public: - StimuliImpl_opencv_imread(const std::string& dataPath="", int colorFlag=cv::IMREAD_COLOR) : + StimuliImpl_opencv_imread(const std::string& dataPath="", int colorFlag=cv::IMREAD_UNCHANGED) : mDataPath(dataPath), mColorFlag(colorFlag) {} virtual ~StimuliImpl_opencv_imread() {}; diff --git a/unit_tests/Test_Stimuli.cpp b/unit_tests/Test_Stimuli.cpp index cf11584..48b0022 100644 --- a/unit_tests/Test_Stimuli.cpp +++ b/unit_tests/Test_Stimuli.cpp @@ -14,7 +14,7 @@ using namespace Aidge; TEST_CASE("Stimuli creation", "[Stimuli][OpenCV]") { SECTION("Instanciation & load an image") { // Load image with imread - cv::Mat true_mat = cv::imread("/data1/is156025/tb256203/dev/eclipse_aidge/aidge/user_tests/train-images-idx3-ubyte[00001].pgm"); + cv::Mat true_mat = cv::imread("/data1/is156025/tb256203/dev/eclipse_aidge/aidge/user_tests/train-images-idx3-ubyte[00001].pgm", cv::IMREAD_UNCHANGED); REQUIRE(true_mat.empty()==false); // Create Stimuli diff --git a/unit_tests/Test_StimuliImpl_opencv_imread.cpp b/unit_tests/Test_StimuliImpl_opencv_imread.cpp index ef3b048..2b19d99 100644 --- a/unit_tests/Test_StimuliImpl_opencv_imread.cpp +++ b/unit_tests/Test_StimuliImpl_opencv_imread.cpp @@ -15,7 +15,7 @@ TEST_CASE("StimuliImpl_opencv_imread creation", "[StimuliImpl_opencv_imread][Ope SECTION("Instanciation & load an image") { // Load image with imread // cv::Mat true_mat = cv::imread("/data1/is156025/tb256203/dev/eclipse_aidge/aidge/user_tests/Lenna.png"); - cv::Mat true_mat = cv::imread("/data1/is156025/tb256203/dev/eclipse_aidge/aidge/user_tests/train-images-idx3-ubyte[00001].pgm"); + cv::Mat true_mat = cv::imread("/data1/is156025/tb256203/dev/eclipse_aidge/aidge/user_tests/train-images-idx3-ubyte[00001].pgm", cv::IMREAD_UNCHANGED); REQUIRE(true_mat.empty()==false); // Create StimuliImpl_opencv_imread -- GitLab