Merge branch 'master' into feat_visp_namespace

lagadic · May 27, 2024 · eb1e074 · eb1e074
2 parents 3877225 + c345d1c
commit eb1e074
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/cmake/templates/vpConfig.h.in b/cmake/templates/vpConfig.h.in
@@ -579,6 +579,9 @@
 #  define VISP_HAVE_DATASET_VERSION ${VISP_HAVE_DATASET_VERSION}
 #endif
 
+// Defined if Bayer conversion has to be skipped
+#cmakedefine VISP_SKIP_BAYER_CONVERSION
+
 // Defined if nullptr is available
 #cmakedefine VISP_HAVE_NULLPTR
 

diff --git a/modules/core/include/visp3/core/vpCircle.h b/modules/core/include/visp3/core/vpCircle.h
@@ -169,7 +169,6 @@ class VISP_EXPORT vpCircle : public vpForwardProjection
 #endif
 protected:
   void init() vp_override;
-
 };
 #if defined(ENABLE_VISP_NAMESPACE)
 }

diff --git a/modules/core/src/image/private/vpBayerConversion.h b/modules/core/src/image/private/vpBayerConversion.h
@@ -41,8 +41,12 @@
 #ifndef vpBAYERCONVERSION_H
 #define vpBAYERCONVERSION_H
 
+#include <visp3/core/vpConfig.h>
+
+#ifndef VISP_SKIP_BAYER_CONVERSION
 #include <cassert>
 
+
 #include <visp3/core/vpMath.h>
 
 // Workaround to avoid warning: "left operand of comma operator has no effect" when compiled in g++ with
@@ -1392,3 +1396,4 @@ void demosaicRGGBToRGBaMalvarTpl(const T *rggb, T *rgba, unsigned int width, uns
 }
 
 #endif
+#endif
diff --git a/modules/tracker/me/include/visp3/me/vpMe.h b/modules/tracker/me/include/visp3/me/vpMe.h
@@ -628,7 +628,7 @@ inline void from_json(const nlohmann::json &j, vpMe &me)
     assert((mus.size() == 2));
     me.setMu1(mus[0]);
     me.setMu2(mus[1]);
-  }
+}
   me.setMinSampleStep(j.value("minSampleStep", me.getMinSampleStep()));
   me.setSampleStep(j.value("sampleStep", me.getSampleStep()));
   me.setRange(j.value("range", me.getRange()));
-Original file line number
+Diff line change
@@ Expand Up / @@ -169,7 +169,6 @@ class VISP_EXPORT vpCircle : public vpForwardProjection @@
     #endif
     protected:
       void init() vp_override;
     };
     #if defined(ENABLE_VISP_NAMESPACE)
     }
@@ Expand Down @@