Merge pull request #742 from bitwangyaoyao:2.4_fix

2013-04-11 11:33:45 +04:00
parent 0c64fc61dc 8cc5b98051
commit 9ba25e9d09
9 changed files with 543 additions and 630 deletions
--- a/modules/ocl/src/initialization.cpp
+++ b/modules/ocl/src/initialization.cpp
@@ -397,6 +397,15 @@ namespace cv

                }
                break;
+            case IS_CPU_DEVICE:
+                {
+                    cl_device_type devicetype;
+                    openCLSafeCall(clGetDeviceInfo(impl->devices[impl->devnum], 
+                                    CL_DEVICE_TYPE, sizeof(cl_device_type), 
+                                    &devicetype, NULL));
+                    *(bool*)info = (devicetype == CVCL_DEVICE_TYPE_CPU);
+                }
+                break;
            default:
                CV_Error(-1, "Invalid device info type");
                break;