fix: check image is grey before applying the wallis filter

Author: BCOM\nduong

interfaces/SolARImageFilterWallisOpencv.h

@@ -17,7 +17,7 @@
 #ifndef INTERFACESSolARImageFilterWallisOpencv_H
 #define INTERFACESSolARImageFilterWallisOpencv_H
 #include <xpcf/component/ConfigurableBase.h>
-
+#include "interfaces/SolARImageConvertorOpencv.h"
 #include "api/image/IImageFilter.h"
 
 
@@ -84,8 +84,7 @@ class SolARImageFilterWallisOpencv : public org::bcom::xpcf::ConfigurableBase, v
     float m_B = 0.7f;
     uint32_t m_windowWidth = 14;
     std::string m_denoisingMethod = "None";
-
-
+    SolARImageConvertorOpencv m_convertor;
 };
 
 

src/SolARImageFilterWallisOpencv.cpp

@@ -15,7 +15,6 @@
  */
 
 #include "interfaces/SolARImageFilterWallisOpencv.h"
-#include "interfaces/SolARImageConvertorOpencv.h"
 #include "SolAROpenCVHelper.h"
 #include "opencv2/imgproc.hpp"
 #include "opencv2/photo.hpp"
@@ -67,10 +66,11 @@ xpcf::XPCFErrorCode SolARImageFilterWallisOpencv::onConfigured()
 
 FrameworkReturnCode SolARImageFilterWallisOpencv::filter(const SRef<SolAR::datastructure::Image> input, SRef<SolAR::datastructure::Image> & output)
 {
-
     SRef<datastructure::Image> imageGrey;
-    SolARImageConvertorOpencv convertor;
-    convertor.convert(input, imageGrey, datastructure::Image::ImageLayout::LAYOUT_GREY);
+    if (input->getImageLayout() != datastructure::Image::ImageLayout::LAYOUT_GREY)
+        m_convertor.convert(input, imageGrey, datastructure::Image::ImageLayout::LAYOUT_GREY);
+    else
+        imageGrey = input;
 
     cv::Mat cvImgGrey8U, cvImgFiltered, cvImgSmooth8U, cvImgSmooth64F, cvImgUniform64F, cvImgSum64F, cvImgCount64F, cvImgLocalMean64F, cvImgTemp64F, cvImgTemp2_64F, cvImgS_64F, cvKernel64F;
     SolAROpenCVHelper::mapToOpenCV(imageGrey,cvImgGrey8U);