[arrayfire] 160/248: Add s16 and u16 types to histogram (graphics)

[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 f3e73088ad445accd176df3b7695038a04553f96
Author: Shehzan Mohammed <shehzan at arrayfire.com>
Date:   Fri Oct 30 10:40:54 2015 -0400

    Add s16 and u16 types to histogram (graphics)
---
 src/api/c/hist.cpp                   | 2 ++
 src/backend/cuda/hist_graphics.cu    | 2 ++
 src/backend/opencl/hist_graphics.cpp | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/src/api/c/hist.cpp b/src/api/c/hist.cpp
index e4e3eb6..4ddf43b 100644
--- a/src/api/c/hist.cpp
+++ b/src/api/c/hist.cpp
@@ -70,6 +70,8 @@ af_err af_draw_hist(const af_window wind, const af_array X, const double minval,
             case f32: hist = setup_histogram<float  >(X, minval, maxval); break;
             case s32: hist = setup_histogram<int    >(X, minval, maxval); break;
             case u32: hist = setup_histogram<uint   >(X, minval, maxval); break;
+            case s16: hist = setup_histogram<short  >(X, minval, maxval); break;
+            case u16: hist = setup_histogram<ushort >(X, minval, maxval); break;
             case u8 : hist = setup_histogram<uchar  >(X, minval, maxval); break;
             default:  TYPE_ERROR(1, Xtype);
         }
diff --git a/src/backend/cuda/hist_graphics.cu b/src/backend/cuda/hist_graphics.cu
index 69cb22c..2ce0c19 100644
--- a/src/backend/cuda/hist_graphics.cu
+++ b/src/backend/cuda/hist_graphics.cu
@@ -46,6 +46,8 @@ void copy_histogram(const Array<T> &data, const fg::Histogram* hist)
 INSTANTIATE(float)
 INSTANTIATE(int)
 INSTANTIATE(uint)
+INSTANTIATE(short)
+INSTANTIATE(ushort)
 INSTANTIATE(uchar)
 
 }
diff --git a/src/backend/opencl/hist_graphics.cpp b/src/backend/opencl/hist_graphics.cpp
index cde15a1..022bcf1 100644
--- a/src/backend/opencl/hist_graphics.cpp
+++ b/src/backend/opencl/hist_graphics.cpp
@@ -60,6 +60,8 @@ void copy_histogram(const Array<T> &data, const fg::Histogram* hist)
 INSTANTIATE(float)
 INSTANTIATE(int)
 INSTANTIATE(uint)
+INSTANTIATE(short)
+INSTANTIATE(ushort)
 INSTANTIATE(uchar)
 
 }

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