Merge pull request #595 from bitwangyaoyao:2.4_perfTest

eaaba133 · Andrey Kamaev · OpenCV Buildbot · 85c7a36f · 8f3883a2 · eaaba133
Commit eaaba133 authored Mar 01, 2013 by Andrey Kamaev Committed by OpenCV Buildbot Mar 01, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

performance.cpp samples/ocl/performance.cpp +1 -1

No files found.
--- a/samples/ocl/performance.cpp
+++ b/samples/ocl/performance.cpp
@@ -4345,7 +4345,7 @@ int main(int argc, const char *argv[])
        {
            if (device == devidx)
            {
-                ocl::setDevice(oclinfo[i], j);
+                ocl::setDevice(oclinfo[i], (int)j);
                TestSystem::instance().setRecordName(oclinfo[i].DeviceName[j]);
                printf("\nuse %d: %s\n", devidx, oclinfo[i].DeviceName[j].c_str());
                goto END_DEV;