Merge pull request opencv#8211 from csukuangfj:csukuangfj-patch-3

alalek · alalek · commit bc8a91ed8327 · 2017-02-16T08:57:44.000Z
diff --git a/modules/core/src/ocl.cpp b/modules/core/src/ocl.cpp
@@ -5528,7 +5528,7 @@ struct PlatformInfo::Impl
         getDevices(devices, handle);
     }
 
-    String getStrProp(cl_device_info prop) const
+    String getStrProp(cl_platform_info prop) const
     {
         char buf[1024];
         size_t sz=0;

Original file line number	Diff line number	Diff line change
`@@ -5528,7 +5528,7 @@ struct PlatformInfo::Impl`
`5528`	`5528`	`getDevices(devices, handle);`
`5529`	`5529`	`}`
`5530`	`5530`
`5531`		`- String getStrProp(cl_device_info prop) const`
	`5531`	`+ String getStrProp(cl_platform_info prop) const`
`5532`	`5532`	`{`
`5533`	`5533`	`char buf[1024];`
`5534`	`5534`	`size_t sz=0;`