Merge pull request #825 from pengx17:2.4_query_cpu_wavesize

bf551df4 · Andrey Kamaev · OpenCV Buildbot · 5eff4f83 · 6f63a5d8 · bf551df4
Commit bf551df4 authored Apr 17, 2013 by Andrey Kamaev Committed by OpenCV Buildbot Apr 17, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 0 deletions

initialization.cpp modules/ocl/src/initialization.cpp +7 -0

No files found.
--- a/modules/ocl/src/initialization.cpp
+++ b/modules/ocl/src/initialization.cpp
@@ -366,6 +366,13 @@ namespace cv
            {
            case WAVEFRONT_SIZE:
                {
+                    bool is_cpu = false;
+                    queryDeviceInfo(IS_CPU_DEVICE, &is_cpu);
+                    if(is_cpu)
+                    {
+                        *(int*)info = 1;
+                        return;
+                    }
 #ifdef CL_DEVICE_WAVEFRONT_WIDTH_AMD
                    try
                    {