Namespace rework

framework/include/vx_array.h

@@ -31,6 +31,8 @@
 /*! \brief The internal representation of a \ref vx_array
  * \ingroup group_int_array
  */
+namespace corevx {
+
 class Array : public Reference
 {
 public:
@@ -296,4 +298,7 @@ class Array : public Reference
     vx_uint32 offset;
 };
 
+} // namespace corevx
+
+
 #endif /* VX_ARRAY_H */

framework/include/vx_context.h

@@ -38,6 +38,8 @@ extern const vx_char implementation[];
 /*! \brief The top level context data for the entire OpenVX instance
  * \ingroup group_int_context
  */
+namespace corevx {
+
 class Context : public Reference
 {
 public:
@@ -505,4 +507,7 @@ class Context : public Reference
     const vx_char* extension;
 };
 
+} // namespace corevx
+
+
 #endif /* VX_CONTEXT_H */

framework/include/vx_convolution.h

@@ -32,6 +32,8 @@
 /*! \brief A convolution is a special type of matrix (MxM)
  * \ingroup group_int_convolution
  */
+namespace corevx {
+
 class Convolution : public Matrix
 {
 public:
@@ -114,4 +116,7 @@ class Convolution : public Matrix
     vx_uint32 scale;
 };
 
+} // namespace corevx
+
+
 #endif /* VX_CONVOLUTION_H */

framework/include/vx_delay.h

@@ -26,6 +26,8 @@
 /*! \brief The internal representation of any delay object.
  * \ingroup group_int_delay
  */
+namespace corevx {
+
 class Delay : public Reference
 {
 public:
@@ -138,4 +140,6 @@ class Delay : public Reference
     vx_delay* pyr;
 };
 
+} // namespace corevx
+
 #endif /* VX_DELAY_H */

framework/include/vx_distribution.h

@@ -31,6 +31,8 @@
 /*! \brief A Distribution.
  * \ingroup group_int_distribution
  */
+namespace corevx {
+
 class Distribution : public Reference
 {
 public:
@@ -167,4 +169,7 @@ class Distribution : public Reference
     vx_int32 offset_y;
 };
 
+} // namespace corevx
+
+
 #endif /* VX_DISTRIBUTION_H */

framework/include/vx_error.h

@@ -30,6 +30,8 @@
 /*! \brief The internal representation of the error object.
  * \ingroup group_int_error
  */
+namespace corevx {
+
 class Error : public Reference
 {
 public:
@@ -85,6 +87,9 @@ class Error : public Reference
     vx_status status;
 };
 
+} // namespace corevx
+
+
 /*! \brief Matches the status code against all known error objects in the
  * context.
  * \param [in] context The pointer to the overall context.

framework/include/vx_event_queue.hpp

@@ -23,6 +23,8 @@
  * @brief Internal Event Queue Object
  *
  */
+namespace corevx {
+
 class EventQueue
 {
     // Registration structure that stores additional event parameters for a vx_reference.
@@ -256,3 +258,6 @@ private : bool enabled_;
         return std::chrono::duration_cast<std::chrono::nanoseconds>(now.time_since_epoch()).count();
     }
 };
+
+} // namespace corevx
+

framework/include/vx_graph.h

@@ -34,6 +34,8 @@
 /*! \brief The internal representation of a graph.
  * \ingroup group_int_graph
  */
+namespace corevx {
+
 class Graph : public Reference
 {
 private:
@@ -406,4 +408,7 @@ class Graph : public Reference
     vx_graph_schedule_mode_type_e scheduleMode;
 };
 
+} // namespace corevx
+
+
 #endif /* VX_GRAPH_H */

framework/include/vx_image.h

@@ -31,6 +31,8 @@
 /*! \brief The internal representation of a \ref vx_image
  * \ingroup group_int_image
  */
+namespace corevx {
+
 class Image : public Reference
 {
 public:
@@ -417,4 +419,7 @@ class Image : public Reference
 #endif
 };
 
+} // namespace corevx
+
+
 #endif /* VX_IMAGE_H */

framework/include/vx_import.h

@@ -32,6 +32,8 @@
 /*! \brief The internal representation of a \ref vx_import
  * \ingroup group_int_import
  */
+namespace corevx {
+
 class Import : public Reference
 {
 public:
@@ -132,4 +134,7 @@ class Import : public Reference
     vx_reference* refs;
 };
 
+} // namespace corevx
+
+
 #endif /* VX_IMPORT_H */

framework/include/vx_internal.h

@@ -199,7 +199,8 @@
 /*! \brief Used to determine is a type is an image.
  * \ingroup group_int_macros
  */
-#define VX_TYPE_IS_IMAGE(type)  (Image::isSupportedFourcc(type) == vx_true_e)
+// Ensure namespaced Image is referenced
+#define VX_TYPE_IS_IMAGE(type)  (corevx::Image::isSupportedFourcc(type) == vx_true_e)
 
 /*! \brief Used to determine if a type is a scalar.
  * \ingroup group_int_macros
@@ -426,10 +427,9 @@ typedef struct vx_processor_t {
 // forward declarations
 struct vx_threadpool_t;
 struct vx_threadpool_worker_t;
-class Target;
-using vx_target = Target*;
-class Error;
-using vx_error = Error*;
+namespace corevx { class Target; class Error; }
+using vx_target = corevx::Target*;
+using vx_error = corevx::Error*;
 
 /*! \brief The function pointer to the worker function.
  * \param [in] worker The per-thread worker data structure.

framework/include/vx_kernel.h

@@ -35,6 +35,8 @@
 /*! \brief The internal representation of an abstract kernel.
  * \ingroup group_int_kernel
  */
+namespace corevx {
+
 class Kernel : public Reference
 {
 public:
@@ -458,4 +460,7 @@ class Kernel : public Reference
     vx_uint32 pipeUpCounter;
 };
 
+} // namespace corevx
+
+
 #endif /* VX_KERNEL_H */

framework/include/vx_log.h

@@ -31,6 +31,8 @@
  * @brief Logger utility class that wraps spdlog functionality
  * @ingroup group_int_log
  */
+namespace corevx {
+
 class Logger
 {
 public:
@@ -61,4 +63,7 @@ class Logger
     static void addLogEntry(vx_reference ref, vx_status status, const char *message, va_list ap);
 };
 
+} // namespace corevx
+
+
 #endif /* VX_LOG_H */

framework/include/vx_lut.h

@@ -27,5 +27,8 @@
  * \ingroup group_internal
  * \brief The Internal LUT API.
  */
+namespace corevx {
+
+} // namespace corevx
 
 #endif /* VX_LUT_H */

framework/include/vx_matrix.h

@@ -30,6 +30,8 @@
 /*! \brief The internal matrix structure.
  * \ingroup group_int_matrix
  */
+namespace corevx {
+
 class Matrix : public Reference
 {
 public:
@@ -146,4 +148,7 @@ class Matrix : public Reference
     vx_enum pattern;
 };
 
+} // namespace corevx
+
+
 #endif /* VX_MATRIX_H */

framework/include/vx_memory.h

@@ -29,6 +29,8 @@
 /*! \brief The internal representation of a \ref vx_memory_t
  * \ingroup group_int_memory
  */
+namespace corevx {
+
 class Memory
 {
 public:
@@ -78,4 +80,7 @@ class Memory
                                             vx_uint32 p);
 };
 
+} // namespace corevx
+
+
 #endif /* VX_MEMORY_H */

framework/include/vx_meta_format.h

@@ -35,6 +35,8 @@
  * framework to automatically create the data object, if needed.
  * \ingroup group_int_meta_format
  */
+namespace corevx {
+
 class MetaFormat : public Reference
 {
 public:
@@ -246,6 +248,9 @@ class MetaFormat : public Reference
     vx_kernel_image_valid_rectangle_f set_valid_rectangle_callback;
 };
 
+} // namespace corevx
+
+
 /*! \brief Creates a metaformat object.
  * \param [in] context The overall context object.
  * \ingroup group_int_meta_format

framework/include/vx_node.h

@@ -55,6 +55,8 @@ vx_graph vxGetChildGraphOfNode(vx_node node);
 /*! \brief The internal representation of a node.
  * \ingroup group_int_node
  */
+namespace corevx {
+
 class Node : public Reference
 {
 public:
@@ -296,4 +298,7 @@ class Node : public Reference
     vx_node_state_e     state;
 };
 
+} // namespace corevx
+
+
 #endif /* VX_NODE_H */

framework/include/vx_object_array.h

@@ -31,6 +31,8 @@
 /*! \brief The internal representation of a \ref vx_object_array
  * \ingroup group_int_object_array
  */
+namespace corevx {
+
 class ObjectArray : public Reference
 {
 public:
@@ -140,4 +142,7 @@ class ObjectArray : public Reference
     vx_enum item_type;
 };
 
+} // namespace corevx
+
+
 #endif /* VX_OBJECT_ARRAY_H */

framework/include/vx_osal.h

@@ -28,6 +28,7 @@
  * \ingroup group_internal
  * \brief The Internal Operating System Abstraction Layer API.
  */
+namespace corevx {
 
 /**
  * @brief OS Abstraction Layer Utility Class
@@ -313,4 +314,6 @@ class Osal
     static vx_symbol_t getSymbol(vx_module_handle_t mod, const vx_char * name);
 };
 
+} // namespace corevx
+
 #endif /* VX_OSAL_H */

framework/include/vx_parameter.h

@@ -30,6 +30,8 @@
 /*! \brief The internal representation of a parameter.
  * \ingroup group_int_parameter
  */
+namespace corevx {
+
 class Parameter : public Reference
 {
 public:
@@ -171,4 +173,7 @@ class Parameter : public Reference
     vx_kernel      kernel;
 };
 
+} // namespace corevx
+
+
 #endif /* VX_PARAMETER_H */

framework/include/vx_pyramid.h

@@ -31,6 +31,8 @@
 /*! \brief A pyramid object. Contains a set of scaled images.
  * \ingroup group_int_pyramid
  */
+namespace corevx {
+
 class Pyramid : public Reference
 {
 public:
@@ -147,4 +149,7 @@ class Pyramid : public Reference
     vx_df_image format;
 };
 
+} // namespace corevx
+
+
 #endif /* VX_PYRAMID_H */

framework/include/vx_reference.h

@@ -35,6 +35,8 @@
  *  to allow casting to this type.
  * \ingroup group_int_reference
  */
+namespace corevx {
+
 class Reference {
 public:
     /**
@@ -215,4 +217,7 @@ class Reference {
     vx_char name[VX_MAX_REFERENCE_NAME];
 };
 
+} // namespace corevx
+
+
 #endif /* VX_REFERENCE_H */