From f5f91ed7f6dae882c6179a063567b4e6f11323be Mon Sep 17 00:00:00 2001 From: apavlenko Date: Thu, 24 Nov 2016 18:48:51 +0300 Subject: [PATCH] eliminating conflict with ivx.hpp --- 3rdparty/openvx/include/openvx_hal.hpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/3rdparty/openvx/include/openvx_hal.hpp b/3rdparty/openvx/include/openvx_hal.hpp index b027ff0e11..f067e40882 100644 --- a/3rdparty/openvx/include/openvx_hal.hpp +++ b/3rdparty/openvx/include/openvx_hal.hpp @@ -21,16 +21,16 @@ #if VX_VERSION == VX_VERSION_1_0 -#define VX_MEMORY_TYPE_HOST VX_IMPORT_TYPE_HOST -#define VX_INTERPOLATION_BILINEAR VX_INTERPOLATION_TYPE_BILINEAR -#define VX_INTERPOLATION_AREA VX_INTERPOLATION_TYPE_AREA -#define VX_INTERPOLATION_NEAREST_NEIGHBOR VX_INTERPOLATION_TYPE_NEAREST_NEIGHBOR -#define VX_IMAGE_RANGE VX_IMAGE_ATTRIBUTE_RANGE -#define VX_IMAGE_SPACE VX_IMAGE_ATTRIBUTE_SPACE -#define vx_border_t vx_border_mode_t -#define VX_BORDER_CONSTANT VX_BORDER_MODE_CONSTANT -#define VX_BORDER_REPLICATE VX_BORDER_MODE_REPLICATE -#define VX_CONTEXT_IMMEDIATE_BORDER VX_CONTEXT_ATTRIBUTE_IMMEDIATE_BORDER_MODE +static const vx_enum VX_MEMORY_TYPE_HOST = VX_IMPORT_TYPE_HOST; +static const vx_enum VX_INTERPOLATION_BILINEAR = VX_INTERPOLATION_TYPE_BILINEAR; +static const vx_enum VX_INTERPOLATION_AREA = VX_INTERPOLATION_TYPE_AREA; +static const vx_enum VX_INTERPOLATION_NEAREST_NEIGHBOR = VX_INTERPOLATION_TYPE_NEAREST_NEIGHBOR; +static const vx_enum VX_IMAGE_RANGE = VX_IMAGE_ATTRIBUTE_RANGE; +static const vx_enum VX_IMAGE_SPACE = VX_IMAGE_ATTRIBUTE_SPACE; +typedef vx_border_mode_t vx_border_t; +static const vx_enum VX_BORDER_CONSTANT = VX_BORDER_MODE_CONSTANT; +static const vx_enum VX_BORDER_REPLICATE = VX_BORDER_MODE_REPLICATE; +static const vx_enum VX_CONTEXT_IMMEDIATE_BORDER = VX_CONTEXT_ATTRIBUTE_IMMEDIATE_BORDER_MODE; #endif