Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cts
6 changes: 3 additions & 3 deletions kernels/c_model/c_statistics.c
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ vx_status vxMeanStdDev(vx_image input, vx_scalar mean, vx_scalar stddev)
// nodeless version of the MinMaxLoc kernel
static void analyzeMinMaxValue(vx_uint32 x, vx_uint32 y, vx_int64 v,
vx_int64 *pMinVal, vx_int64 *pMaxVal,
vx_uint32 *pMinCount, vx_uint32 *pMaxCount,
vx_size *pMinCount, vx_size *pMaxCount,
vx_array minLoc, vx_array maxLoc)
{
vx_coordinates2d_t loc;
Expand Down Expand Up @@ -157,8 +157,8 @@ vx_status vxMinMaxLoc(vx_image input, vx_scalar minVal, vx_scalar maxVal, vx_arr
vx_df_image format;
vx_int64 iMinVal = INT64_MAX;
vx_int64 iMaxVal = INT64_MIN;
vx_uint32 iMinCount = 0;
vx_uint32 iMaxCount = 0;
vx_size iMinCount = 0;
vx_size iMaxCount = 0;
vx_map_id map_id = 0;
vx_status status = VX_SUCCESS;

Expand Down
18 changes: 9 additions & 9 deletions kernels/venum/venum_statistics.c
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ vx_status vxMeanStdDev(vx_image input, vx_scalar mean, vx_scalar stddev)
// nodeless version of the MinMaxLoc kernel
static void analyzeMinMaxValue(vx_uint32 x, vx_uint32 y, vx_int64 v,
vx_int64 *pMinVal, vx_int64 *pMaxVal,
vx_uint32 *pMinCount, vx_uint32 *pMaxCount,
vx_size *pMinCount, vx_size *pMaxCount,
vx_array minLoc, vx_array maxLoc)
{
vx_coordinates2d_t loc;
Expand Down Expand Up @@ -436,7 +436,7 @@ static void addLoc16(vx_uint32 y, vx_uint32 x, uint16x8_t *pvPred, vx_array arrL

static void calcMinMaxLocu8(vx_uint8 *src_base, vx_imagepatch_addressing_t *src_addr,
vx_int64 *pMinVal, vx_int64 *pMaxVal,
vx_uint32 *pMinCount, vx_uint32 *pMaxCount,
vx_size *pMinCount, vx_size *pMaxCount,
vx_array minLoc, vx_array maxLoc)
{
vx_uint32 y, x;
Expand All @@ -447,8 +447,8 @@ static void calcMinMaxLocu8(vx_uint8 *src_base, vx_imagepatch_addressing_t *src_
vx_uint32 w16 = (src_addr->dim_x >> 4) << 4;
vx_int64 iMinVal = 0;
vx_int64 iMaxVal = 0;
vx_uint32 iMinCount = 0;
vx_uint32 iMaxCount = 0;
vx_size iMinCount = 0;
vx_size iMaxCount = 0;
for (y = 0; y < src_addr->dim_y; y++)
{
vx_uint8 *ptr_src = src_base + y * src_addr->stride_y;
Expand Down Expand Up @@ -546,7 +546,7 @@ static void calcMinMaxLocu8(vx_uint8 *src_base, vx_imagepatch_addressing_t *src_

static void calcMinMaxLocs16(vx_int16 *src_base, vx_imagepatch_addressing_t *src_addr,
vx_int64 *pMinVal, vx_int64 *pMaxVal,
vx_uint32 *pMinCount, vx_uint32 *pMaxCount,
vx_size *pMinCount, vx_size *pMaxCount,
vx_array minLoc, vx_array maxLoc)
{
vx_uint32 y, x;
Expand All @@ -557,8 +557,8 @@ static void calcMinMaxLocs16(vx_int16 *src_base, vx_imagepatch_addressing_t *src
vx_uint32 w16 = (src_addr->dim_x >> 4) << 4;
vx_int64 iMinVal = 0;
vx_int64 iMaxVal = 0;
vx_uint32 iMinCount = 0;
vx_uint32 iMaxCount = 0;
vx_size iMinCount = 0;
vx_size iMaxCount = 0;
for (y = 0; y < src_addr->dim_y; y++)
{
vx_uint8 *ptr_src = (vx_uint8 *)src_base + y * src_addr->stride_y;
Expand Down Expand Up @@ -660,8 +660,8 @@ vx_status vxMinMaxLoc(vx_image input, vx_scalar minVal, vx_scalar maxVal, vx_arr
vx_df_image format;
vx_int64 iMinVal = INT64_MAX;
vx_int64 iMaxVal = INT64_MIN;
vx_uint32 iMinCount = 0;
vx_uint32 iMaxCount = 0;
vx_size iMinCount = 0;
vx_size iMaxCount = 0;
vx_map_id map_id = 0;
vx_status status = VX_SUCCESS;

Expand Down
2 changes: 1 addition & 1 deletion sample/targets/c_model/vx_minmaxloc.c
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ static vx_status VX_CALLBACK vxMinMaxLocOutputValidator(vx_node node, vx_uint32
}
if ((index == 5) || (index == 6))
{
ptr->dim.scalar.type = VX_TYPE_UINT32;
ptr->dim.scalar.type = VX_TYPE_SIZE;
status = VX_SUCCESS;
}
return status;
Expand Down
2 changes: 1 addition & 1 deletion sample/targets/venum/vx_minmaxloc.c
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ static vx_status VX_CALLBACK vxMinMaxLocOutputValidator(vx_node node, vx_uint32
}
if ((index == 5) || (index == 6))
{
ptr->dim.scalar.type = VX_TYPE_UINT32;
ptr->dim.scalar.type = VX_TYPE_SIZE;
status = VX_SUCCESS;
}
return status;
Expand Down
Loading