Skip to content

O
opencv
Commit bfecea48 authored by Andrey Pavlenko's avatar Andrey Pavlenko Committed by Rostislav Vasilikhin
Browse files
Options

warnings in ivx.hpp fixed 

* fixing 1.0.1

* fixing build without c++11

* hiding warnings
parent d7db2201
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 8 deletions
3rdparty/openvx/include/ivx.hpp
View file @ bfecea48
...@@ -89,8 +89,8 @@ class RuntimeError : public std::runtime_error ...@@ -89,8 +89,8 @@ class RuntimeError : public std::runtime_error
{ {
public: public:
/// Constructor /// Constructor
explicit RuntimeError(vx_status status, const std::string& msg = "") explicit RuntimeError(vx_status st, const std::string& msg = "")
: runtime_error(msg), _status(status) : runtime_error(msg), _status(st)
{} {}
/// OpenVX error code /// OpenVX error code
...@@ -142,7 +142,7 @@ template <vx_enum E> using EnumToType_t = typename EnumToType<E>::type; ...@@ -142,7 +142,7 @@ template <vx_enum E> using EnumToType_t = typename EnumToType<E>::type;
#endif #endif
/// Gets size in bytes for the provided OpenVX type enum /// Gets size in bytes for the provided OpenVX type enum
vx_size enumToTypeSize(vx_enum type) inline vx_size enumToTypeSize(vx_enum type)
{ {
switch (type) switch (type)
{ {
...@@ -1314,16 +1314,16 @@ public: ...@@ -1314,16 +1314,16 @@ public:
{ return _mapId; } { return _mapId; }
#else #else
/// reference to vx_rectangle_t for the current mapping /// reference to vx_rectangle_t for the current mapping
const vx_rectangle_t& rect() const const vx_rectangle_t& rectangle() const
{ return _rect; } { return _rect; }
/// Image plane index for the current mapping /// Image plane index for the current mapping
vx_uint32 planeIdx() const vx_uint32 planeIndex() const
{ return _planeIdx; } { return _planeIdx; }
#endif // VX_VERSION_1_1 #endif // VX_VERSION_1_1
/// vx_image for the current mapping /// vx_image for the current mapping
vx_image img() const vx_image image() const
{ return _img; } { return _img; }
/// where this patch is mapped /// where this patch is mapped
...@@ -1393,6 +1393,7 @@ public: ...@@ -1393,6 +1393,7 @@ public:
IVX_CHECK_STATUS(vxMapImagePatch(img, &rect, planeIdx, &_mapId, &_addr, &_data, usage, _memType, flags) ); IVX_CHECK_STATUS(vxMapImagePatch(img, &rect, planeIdx, &_mapId, &_addr, &_data, usage, _memType, flags) );
#else #else
IVX_CHECK_STATUS(vxAccessImagePatch(img, &rect, planeIdx, &_addr, &_data, usage)); IVX_CHECK_STATUS(vxAccessImagePatch(img, &rect, planeIdx, &_addr, &_data, usage));
(void)flags;
_rect = rect; _rect = rect;
_planeIdx = planeIdx; _planeIdx = planeIdx;
#endif #endif
...@@ -1565,8 +1566,8 @@ static const vx_enum ...@@ -1565,8 +1566,8 @@ static const vx_enum
/// vxQueryThreshold() wrapper /// vxQueryThreshold() wrapper
template<typename T> template<typename T>
void query(vx_enum att, T& value) const void query(vx_enum att, T& val) const
{ IVX_CHECK_STATUS( vxQueryThreshold(ref, att, &value, sizeof(value)) ); } { IVX_CHECK_STATUS( vxQueryThreshold(ref, att, &value, sizeof(val)) ); }
/// vxQueryThreshold(VX_THRESHOLD_TYPE) wrapper /// vxQueryThreshold(VX_THRESHOLD_TYPE) wrapper
vx_enum type() const vx_enum type() const
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment