Merge branch '2.4'

2013-04-12 15:35:38 +04:00
parent b0933dd473 abe2ea59ed
commit 3b364330ad
75 changed files with 1259 additions and 3979 deletions
--- a/modules/ocl/include/opencv2/ocl/private/util.hpp
+++ b/modules/ocl/include/opencv2/ocl/private/util.hpp
@@ -127,8 +127,9 @@ namespace cv
        // currently only support wavefront size queries
        enum DEVICE_INFO
        {
-             WAVEFRONT_SIZE,            //in AMD speak
-             WARP_SIZE = WAVEFRONT_SIZE //in nvidia speak
+            WAVEFRONT_SIZE,             //in AMD speak
+            WARP_SIZE = WAVEFRONT_SIZE, //in nvidia speak
+            IS_CPU_DEVICE               //check if the device is CPU
        };
        //info should have been pre-allocated
        void CV_EXPORTS queryDeviceInfo(DEVICE_INFO info_type, void* info);