[arrayfire] 175/248: Add intl/uintl to histogram and histeq

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch dfsg-clean
in repository arrayfire.

commit 5ff4efc25364a1333d875950eb60fdb462422dc5
Author: Shehzan Mohammed <shehzan at arrayfire.com>
Date:   Wed Oct 21 16:37:36 2015 -0400

    Add intl/uintl to histogram and histeq
---
 src/api/c/histeq.cpp             | 2 ++
 src/api/c/histogram.cpp          | 2 ++
 src/backend/cpu/histogram.cpp    | 2 ++
 src/backend/cuda/histogram.cu    | 2 ++
 src/backend/opencl/histogram.cpp | 2 ++
 test/histogram.cpp               | 2 +-
 6 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/api/c/histeq.cpp b/src/api/c/histeq.cpp
index 56ad3eb..78c3f16 100644
--- a/src/api/c/histeq.cpp
+++ b/src/api/c/histeq.cpp
@@ -79,6 +79,8 @@ af_err af_hist_equal(af_array *out, const af_array in, const af_array hist)
             case u32: output = hist_equal<uint  , uint>(in, hist); break;
             case s16: output = hist_equal<short , uint>(in, hist); break;
             case u16: output = hist_equal<ushort, uint>(in, hist); break;
+            case s64: output = hist_equal<intl  , uint>(in, hist); break;
+            case u64: output = hist_equal<uintl , uint>(in, hist); break;
             case u8 : output = hist_equal<uchar , uint>(in, hist); break;
             default : TYPE_ERROR(1, dataType);
         }
diff --git a/src/api/c/histogram.cpp b/src/api/c/histogram.cpp
index 3d6494c..cd6dee8 100644
--- a/src/api/c/histogram.cpp
+++ b/src/api/c/histogram.cpp
@@ -44,6 +44,8 @@ af_err af_histogram(af_array *out, const af_array in,
             case u32: output = histogram<uint  , uint>(in, nbins, minval, maxval, info.isLinear()); break;
             case s16: output = histogram<short , uint>(in, nbins, minval, maxval, info.isLinear()); break;
             case u16: output = histogram<ushort, uint>(in, nbins, minval, maxval, info.isLinear()); break;
+            case s64: output = histogram<intl  , uint>(in, nbins, minval, maxval, info.isLinear()); break;
+            case u64: output = histogram<uintl , uint>(in, nbins, minval, maxval, info.isLinear()); break;
             case u8 : output = histogram<uchar , uint>(in, nbins, minval, maxval, info.isLinear()); break;
             default : TYPE_ERROR(1, type);
         }
diff --git a/src/backend/cpu/histogram.cpp b/src/backend/cpu/histogram.cpp
index fe24a02..e382a0e 100644
--- a/src/backend/cpu/histogram.cpp
+++ b/src/backend/cpu/histogram.cpp
@@ -62,5 +62,7 @@ INSTANTIATE(uint  , uint)
 INSTANTIATE(uchar , uint)
 INSTANTIATE(short , uint)
 INSTANTIATE(ushort, uint)
+INSTANTIATE(intl  , uint)
+INSTANTIATE(uintl , uint)
 
 }
diff --git a/src/backend/cuda/histogram.cu b/src/backend/cuda/histogram.cu
index 8d8a757..d17d390 100644
--- a/src/backend/cuda/histogram.cu
+++ b/src/backend/cuda/histogram.cu
@@ -49,5 +49,7 @@ INSTANTIATE(uint  , uint)
 INSTANTIATE(uchar , uint)
 INSTANTIATE(short , uint)
 INSTANTIATE(ushort, uint)
+INSTANTIATE(intl  , uint)
+INSTANTIATE(uintl , uint)
 
 }
diff --git a/src/backend/opencl/histogram.cpp b/src/backend/opencl/histogram.cpp
index 3faa3b1..d7de991 100644
--- a/src/backend/opencl/histogram.cpp
+++ b/src/backend/opencl/histogram.cpp
@@ -48,5 +48,7 @@ INSTANTIATE(uint  , uint)
 INSTANTIATE(uchar , uint)
 INSTANTIATE(short , uint)
 INSTANTIATE(ushort, uint)
+INSTANTIATE(intl  , uint)
+INSTANTIATE(uintl , uint)
 
 }
diff --git a/test/histogram.cpp b/test/histogram.cpp
index 9689662..f1d7af5 100644
--- a/test/histogram.cpp
+++ b/test/histogram.cpp
@@ -27,7 +27,7 @@ class Histogram : public ::testing::Test
 };
 
 // create a list of types to be tested
-typedef ::testing::Types<float, double, int, uint, char, uchar, short, ushort> TestTypes;
+typedef ::testing::Types<float, double, int, uint, char, uchar, short, ushort, intl, uintl> TestTypes;
 
 // register the type list
 TYPED_TEST_CASE(Histogram, TestTypes);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/arrayfire.git