[arrayfire] 159/248: Add s16 and u16 types to surface (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 ec6d55dd270d406bf38e47d3e9658445b3f4d04f
Author: Shehzan Mohammed <shehzan at arrayfire.com>
Date:   Fri Oct 30 10:39:29 2015 -0400

    Add s16 and u16 types to surface (graphics)
---
 src/api/c/graphics_common.hpp  | 2 +-
 src/api/c/surface.cpp          | 2 ++
 src/backend/cuda/surface.cu    | 2 ++
 src/backend/opencl/surface.cpp | 2 ++
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/api/c/graphics_common.hpp b/src/api/c/graphics_common.hpp
index f649fe9..39225e6 100644
--- a/src/api/c/graphics_common.hpp
+++ b/src/api/c/graphics_common.hpp
@@ -73,7 +73,7 @@ class ForgeManager
         PlotMap_t       mPltMap;
         Plot3Map_t      mPlt3Map;
         HistogramMap_t  mHstMap;
-	SurfaceMap_t	mSfcMap;
+        SurfaceMap_t    mSfcMap;
 
     public:
         static ForgeManager& getInstance();
diff --git a/src/api/c/surface.cpp b/src/api/c/surface.cpp
index d1ae00c..0ac74c5 100644
--- a/src/api/c/surface.cpp
+++ b/src/api/c/surface.cpp
@@ -116,6 +116,8 @@ af_err af_draw_surface(const af_window wind, const af_array xVals, const af_arra
             case f32: surface = setup_surface<float  >(xVals, yVals , S); break;
             case s32: surface = setup_surface<int    >(xVals, yVals , S); break;
             case u32: surface = setup_surface<uint   >(xVals, yVals , S); break;
+            case s16: surface = setup_surface<short  >(xVals, yVals , S); break;
+            case u16: surface = setup_surface<ushort >(xVals, yVals , S); break;
             case u8 : surface = setup_surface<uchar  >(xVals, yVals , S); break;
             default:  TYPE_ERROR(1, Xtype);
         }
diff --git a/src/backend/cuda/surface.cu b/src/backend/cuda/surface.cu
index cb8bf4e..fcb9f81 100644
--- a/src/backend/cuda/surface.cu
+++ b/src/backend/cuda/surface.cu
@@ -52,6 +52,8 @@ INSTANTIATE(float)
 INSTANTIATE(double)
 INSTANTIATE(int)
 INSTANTIATE(uint)
+INSTANTIATE(short)
+INSTANTIATE(ushort)
 INSTANTIATE(uchar)
 
 }
diff --git a/src/backend/opencl/surface.cpp b/src/backend/opencl/surface.cpp
index 587ad38..8116941 100644
--- a/src/backend/opencl/surface.cpp
+++ b/src/backend/opencl/surface.cpp
@@ -66,6 +66,8 @@ INSTANTIATE(float)
 INSTANTIATE(double)
 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