Skip to content

Commit e755802

Browse files
pavankypavanky
committed
Changing api of few functions to match v2.1
- Functions affected rotate, resize, histogram, meanshift
1 parent 0a8ba35 commit e755802

File tree

7 files changed

+26
-16
lines changed

7 files changed

+26
-16
lines changed

‎include/af/image.h‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ AFAPI void saveImage(const char* filename, const array& in);
2222

2323
AFAPI array resize(const array& in, const dim_type odim0, const dim_type odim1, const interpType method=AF_INTERP_NEAREST);
2424

25-
AFAPI array resize(const array& in, const float scale0, const float scale1, const interpType method=AF_INTERP_NEAREST);
25+
AFAPI array resize(const float scale0, const float scale1, const array& in, const interpType method=AF_INTERP_NEAREST);
2626

27-
AFAPI array resize(const array& in, const float scale, const interpType method=AF_INTERP_NEAREST);
27+
AFAPI array resize(const float scale, const array& in, const interpType method=AF_INTERP_NEAREST);
2828

29-
AFAPI array rotate(const array& in, const float theta, const interpType method=AF_INTERP_NEAREST, const bool crop=true);
29+
AFAPI array rotate(const array& in, const float theta, const bool crop=true, const interpType method=AF_INTERP_NEAREST);
3030

3131
AFAPI array transform(const array& in, const array& transform, const dim_type odim0, const dim_type odim1, const interpType method=AF_INTERP_NEAREST, const bool inverse=true);
3232

@@ -40,7 +40,9 @@ AFAPI array bilateral(const array &in, const float spatial_sigma, const float ch
4040

4141
AFAPI array histogram(const array &in, const unsigned nbins, const double minval, const double maxval);
4242

43-
AFAPI array meanshift(const array& in, const float spatial_sigma, const float chromatic_sigma, const unsigned iter, const bool is_color);
43+
AFAPI array histogram(const array &in, const unsigned nbins);
44+
45+
AFAPI array meanshift(const array& in, const float spatial_sigma, const float chromatic_sigma, const unsigned iter, const bool is_color=false);
4446

4547
AFAPI array medfilt(const array& in, dim_type wind_length = 3, dim_type wind_width = 3, padType edge_pad = AF_ZERO);
4648

@@ -81,7 +83,7 @@ extern "C" {
8183

8284
// Rotate
8385
AFAPI af_err af_rotate(af_array *out, const af_array in, const float theta,
84-
const af_interp_type method, const bool crop);
86+
const bool crop, const af_interp_type method);
8587
// Translate
8688
AFAPI af_err af_translate(af_array *out, const af_array in, const float trans0, const float trans1,
8789
const dim_type odim0, const dim_type odim1, const af_interp_type method);

‎src/api/c/rotate.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,9 @@ static inline af_array rotate(const af_array in, const float theta, const af::di
2525
}
2626

2727

28-
af_err af_rotate(af_array *out, const af_array in, const float theta, const af_interp_type method,
29-
const bool crop)
28+
af_err af_rotate(af_array *out, const af_array in, const float theta,
29+
const bool crop,
30+
const af_interp_type method)
3031
{
3132
af_err ret = AF_SUCCESS;
3233
try {
@@ -65,4 +66,3 @@ af_err af_rotate(af_array *out, const af_array in, const float theta, const af_i
6566

6667
return ret;
6768
}
68-

‎src/api/cpp/histogram.cpp‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
********************************************************/
99

1010
#include <af/image.h>
11+
#include <af/algorithm.h>
1112
#include "error.hpp"
1213

1314
namespace af
@@ -20,4 +21,11 @@ array histogram(const array &in, const unsigned nbins, const double minval, cons
2021
return array(out);
2122
}
2223

24+
array histogram(const array &in, const unsigned nbins)
25+
{
26+
af_array out = 0;
27+
AF_THROW(af_histogram(&out, in.get(), nbins, min<double>(in), max<double>(in)));
28+
return array(out);
29+
}
30+
2331
}

‎src/api/cpp/resize.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ array resize(const array &in, const dim_type odim0, const dim_type odim1, const
2020
return array(out);
2121
}
2222

23-
array resize(const array &in, const float scale0, const float scale1, const interpType method)
23+
array resize(const float scale0, const float scale1, const array &in, const interpType method)
2424
{
2525
af_array out = 0;
2626
AF_THROW(af_resize(&out, in.get(), in.dims(0) * scale0, in.dims(1) * scale1, method));
2727
return array(out);
2828
}
2929

30-
array resize(const array &in, const float scale, const interpType method)
30+
array resize(const float scale, const array &in, const interpType method)
3131
{
3232
af_array out = 0;
3333
AF_THROW(af_resize(&out, in.get(), in.dims(0) * scale, in.dims(1) * scale, method));

‎src/api/cpp/rotate.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
namespace af
1414
{
1515

16-
array rotate(const array& in, const float theta, const interpType method, const bool crop)
16+
array rotate(const array& in, const float theta, const bool crop, const interpType method)
1717
{
1818
af_array out = 0;
19-
AF_THROW(af_rotate(&out, in.get(), theta, method, crop));
19+
AF_THROW(af_rotate(&out, in.get(), theta, crop, method));
2020
return array(out);
2121
}
2222

‎test/rotate.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ void rotateTest(string pTestFile, const unsigned resultIdx, const float angle, c
7070
ASSERT_EQ(AF_SUCCESS, af_create_array(&inArray, &(in[0].front()), dims.ndims(), dims.get(), (af_dtype) af::dtype_traits<T>::af_type));
7171
}
7272

73-
ASSERT_EQ(AF_SUCCESS, af_rotate(&outArray, inArray, theta, AF_INTERP_NEAREST, crop));
73+
ASSERT_EQ(AF_SUCCESS, af_rotate(&outArray, inArray, theta, crop, AF_INTERP_NEAREST));
7474

7575
// Get result
7676
T* outData = new T[tests[resultIdx].size()];
@@ -181,7 +181,7 @@ TEST(Rotate, CPP)
181181
float theta = angle * PI / 180.0f;
182182

183183
af::array input(dims, &(in[0].front()));
184-
af::array output = af::rotate(input, theta, AF_INTERP_NEAREST, crop);
184+
af::array output = af::rotate(input, theta, crop, AF_INTERP_NEAREST);
185185

186186
// Get result
187187
float* outData = new float[tests[resultIdx].size()];

‎test/rotate_linear.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ void rotateTest(string pTestFile, const unsigned resultIdx, const float angle, c
7070
ASSERT_EQ(AF_SUCCESS, af_create_array(&inArray, &(in[0].front()), dims.ndims(), dims.get(), (af_dtype) af::dtype_traits<T>::af_type));
7171
}
7272

73-
ASSERT_EQ(AF_SUCCESS, af_rotate(&outArray, inArray, theta, AF_INTERP_BILINEAR, crop));
73+
ASSERT_EQ(AF_SUCCESS, af_rotate(&outArray, inArray, theta, crop, AF_INTERP_BILINEAR));
7474

7575
// Get result
7676
T* outData = new T[tests[resultIdx].size()];
@@ -181,7 +181,7 @@ TEST(Rotate, CPP)
181181
float theta = angle * PI / 180.0f;
182182

183183
af::array input(dims, &(in[0].front()));
184-
af::array output = af::rotate(input, theta, AF_INTERP_BILINEAR, crop);
184+
af::array output = af::rotate(input, theta, crop, AF_INTERP_BILINEAR);
185185

186186
// Get result
187187
float* outData = new float[tests[resultIdx].size()];

0 commit comments

Comments
 (0)