From f9c52894833cb4da02bb6f245409c3e20b4a67fd Mon Sep 17 00:00:00 2001 From: Elena Gvozdeva Date: Fri, 4 Apr 2014 12:08:22 +0400 Subject: [PATCH] fixed --- modules/core/test/test_ippasync.cpp | 4 ++-- samples/cpp/tutorial_code/core/ippasync/ippasync_sample.cpp | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/modules/core/test/test_ippasync.cpp b/modules/core/test/test_ippasync.cpp index 2d30e7a..bd37ffa 100644 --- a/modules/core/test/test_ippasync.cpp +++ b/modules/core/test/test_ippasync.cpp @@ -49,7 +49,7 @@ PARAM_TEST_CASE(IPPAsync, MatDepth, Channels, hppAccelType) TEST_P(IPPAsync, accuracy) { sts = hppCreateInstance(accelType, 0, &accel); - if (sts!=HPP_STATUS_NO_ERROR) printf("hppStatus= %d\n",sts); + if (sts!=HPP_STATUS_NO_ERROR) printf("hppStatus = %d\n",sts); CV_Assert(sts==HPP_STATUS_NO_ERROR); virtMatrix = hppiCreateVirtualMatrices(accel, 2); @@ -133,7 +133,7 @@ PARAM_TEST_CASE(IPPAsyncShared, Channels, hppAccelType) TEST_P(IPPAsyncShared, accuracy) { sts = hppCreateInstance(accelType, 0, &accel); - if (sts!=HPP_STATUS_NO_ERROR) printf("hppStatus= %d\n",sts); + if (sts!=HPP_STATUS_NO_ERROR) printf("hppStatus = %d\n",sts); CV_Assert(sts==HPP_STATUS_NO_ERROR); virtMatrix = hppiCreateVirtualMatrices(accel, 2); diff --git a/samples/cpp/tutorial_code/core/ippasync/ippasync_sample.cpp b/samples/cpp/tutorial_code/core/ippasync/ippasync_sample.cpp index 3c5e8d3..0cfc5e6 100644 --- a/samples/cpp/tutorial_code/core/ippasync/ippasync_sample.cpp +++ b/samples/cpp/tutorial_code/core/ippasync/ippasync_sample.cpp @@ -37,7 +37,7 @@ const char* keys = { "{c camera | | use camera or not}" "{fn file_name|baboon.jpg | image file }" - "{a accel |cpu | accelerator type: auto (default), cpu, gpu}" + "{a accel |auto | accelerator type: auto (default), cpu, gpu}" }; //this is a sample for hppiSobel functions @@ -92,8 +92,7 @@ int main(int argc, const char** argv) sAccel = accelType == HPP_ACCEL_TYPE_CPU ? "cpu": accelType == HPP_ACCEL_TYPE_GPU ? "gpu": - accelType == HPP_ACCEL_TYPE_GPU_VIA_DX9 ? "gpu": - accelType == HPP_ACCEL_TYPE_OCL ? "ocl": "?"; + accelType == HPP_ACCEL_TYPE_GPU_VIA_DX9 ? "gpu dx9": "?"; printf("accelType %s\n", sAccel.c_str()); -- 2.7.4