reduce color instantiates for tiny build

ee316758 · Vladislav Vinogradov · 6d7a61cb · ee316758 · ee316758 · ee316758
Commit ee316758 authored Mar 04, 2015 by Vladislav Vinogradov
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 20 additions and 8 deletions

color.cpp modules/gpu/src/color.cpp +0 -0

color.cu modules/gpu/src/cuda/color.cu +10 -4

cvt_color_internal.h modules/gpu/src/cvt_color_internal.h +10 -4

No files found.
--- a/modules/gpu/src/color.cpp
+++ b/modules/gpu/src/color.cpp
--- a/modules/gpu/src/cuda/color.cu
+++ b/modules/gpu/src/cuda/color.cu
@@ -235,10 +235,16 @@ namespace cv { namespace gpu { namespace device
 #define OPENCV_GPU_IMPLEMENT_CVTCOLOR_ONE(name) \
    OPENCV_GPU_IMPLEMENT_CVTCOLOR(name, name ## _traits)

-#define OPENCV_GPU_IMPLEMENT_CVTCOLOR_ALL(name) \
-    OPENCV_GPU_IMPLEMENT_CVTCOLOR(name ## _8u, name ## _traits<uchar>) \
-    OPENCV_GPU_IMPLEMENT_CVTCOLOR(name ## _16u, name ## _traits<ushort>) \
-    OPENCV_GPU_IMPLEMENT_CVTCOLOR(name ## _32f, name ## _traits<float>)
+#ifdef OPENCV_TINY_GPU_MODULE
+    #define OPENCV_GPU_IMPLEMENT_CVTCOLOR_ALL(name) \
+        OPENCV_GPU_IMPLEMENT_CVTCOLOR(name ## _8u, name ## _traits<uchar>) \
+        OPENCV_GPU_IMPLEMENT_CVTCOLOR(name ## _32f, name ## _traits<float>)
+#else
+    #define OPENCV_GPU_IMPLEMENT_CVTCOLOR_ALL(name) \
+        OPENCV_GPU_IMPLEMENT_CVTCOLOR(name ## _8u, name ## _traits<uchar>) \
+        OPENCV_GPU_IMPLEMENT_CVTCOLOR(name ## _16u, name ## _traits<ushort>) \
+        OPENCV_GPU_IMPLEMENT_CVTCOLOR(name ## _32f, name ## _traits<float>)
+#endif

 #define OPENCV_GPU_IMPLEMENT_CVTCOLOR_8U32F(name) \
    OPENCV_GPU_IMPLEMENT_CVTCOLOR(name ## _8u, name ## _traits<uchar>) \

--- a/modules/gpu/src/cvt_color_internal.h
+++ b/modules/gpu/src/cvt_color_internal.h
@@ -48,10 +48,16 @@ namespace cv { namespace gpu { namespace device
 #define OPENCV_GPU_DECLARE_CVTCOLOR_ONE(name) \
    void name(PtrStepSzb src, PtrStepSzb dst, cudaStream_t stream);

-#define OPENCV_GPU_DECLARE_CVTCOLOR_ALL(name)       \
-    OPENCV_GPU_DECLARE_CVTCOLOR_ONE(name ## _8u)    \
-    OPENCV_GPU_DECLARE_CVTCOLOR_ONE(name ## _16u)   \
-    OPENCV_GPU_DECLARE_CVTCOLOR_ONE(name ## _32f)
+#ifdef OPENCV_TINY_GPU_MODULE
+    #define OPENCV_GPU_DECLARE_CVTCOLOR_ALL(name)       \
+        OPENCV_GPU_DECLARE_CVTCOLOR_ONE(name ## _8u)    \
+        OPENCV_GPU_DECLARE_CVTCOLOR_ONE(name ## _32f)
+#else
+    #define OPENCV_GPU_DECLARE_CVTCOLOR_ALL(name)       \
+        OPENCV_GPU_DECLARE_CVTCOLOR_ONE(name ## _8u)    \
+        OPENCV_GPU_DECLARE_CVTCOLOR_ONE(name ## _16u)   \
+        OPENCV_GPU_DECLARE_CVTCOLOR_ONE(name ## _32f)
+#endif

 #define OPENCV_GPU_DECLARE_CVTCOLOR_8U32F(name)    \
    OPENCV_GPU_DECLARE_CVTCOLOR_ONE(name ## _8u)   \