diff --git a/modules/core/src/system.cpp b/modules/core/src/system.cpp index c7b31c05fb..a49f5e74a1 100644 --- a/modules/core/src/system.cpp +++ b/modules/core/src/system.cpp @@ -528,8 +528,8 @@ CV_IMPL const char* cvErrorStr( int status ) case CV_StsBadMemBlock : return "Memory block has been corrupted"; case CV_StsAssert : return "Assertion failed"; case CV_GpuNotSupported : return "No GPU support"; - case CV_GpuApiCallError : return "GPU API error"; - case CV_GpuNppCallError : return "NPP API error"; + case CV_GpuApiCallError : return "Gpu Api call"; + case CV_GpuNppCallError : return "Npp Api call"; }; sprintf(buf, "Unknown %s code %d", status >= 0 ? "status":"error", status); diff --git a/modules/gpu/include/opencv2/gpu/gpu.hpp b/modules/gpu/include/opencv2/gpu/gpu.hpp index 752d4df809..61a6887744 100644 --- a/modules/gpu/include/opencv2/gpu/gpu.hpp +++ b/modules/gpu/include/opencv2/gpu/gpu.hpp @@ -995,6 +995,7 @@ namespace cv double getWinSigma() const; static vector getDefaultPeopleDetector(); + static vector getDefaultPeopleDetector_64x128(); void setSVMDetector(const vector& detector); bool checkDetectorSize() const; diff --git a/modules/gpu/src/hog.cpp b/modules/gpu/src/hog.cpp index 88e97210db..cba17093c2 100644 --- a/modules/gpu/src/hog.cpp +++ b/modules/gpu/src/hog.cpp @@ -56,6 +56,7 @@ void cv::gpu::HOGDescriptor::detectMultiScale(const GpuMat&, vector&, doub int cv::gpu::HOGDescriptor::numPartsWithin(int, int, int) { throw_nogpu(); return 0; } cv::Size cv::gpu::HOGDescriptor::numPartsWithin(cv::Size, cv::Size, cv::Size) { throw_nogpu(); return cv::Size(); } std::vector cv::gpu::HOGDescriptor::getDefaultPeopleDetector() { throw_nogpu(); return std::vector(); } +std::vector cv::gpu::HOGDescriptor::getDefaultPeopleDetector_64x128() { throw_nogpu(); return std::vector(); } #else @@ -309,6 +310,11 @@ cv::Size cv::gpu::HOGDescriptor::numPartsWithin(cv::Size size, cv::Size part_siz } std::vector cv::gpu::HOGDescriptor::getDefaultPeopleDetector() +{ + return getDefaultPeopleDetector_64x128(); +} + +std::vector cv::gpu::HOGDescriptor::getDefaultPeopleDetector_64x128() { static const float detector[] = { 0.05359386f, -0.14721455f, -0.05532170f, 0.05077307f, diff --git a/tests/gpu/src/hog.cpp b/tests/gpu/src/hog.cpp index e3f2719236..cc3e903c64 100644 --- a/tests/gpu/src/hog.cpp +++ b/tests/gpu/src/hog.cpp @@ -109,6 +109,8 @@ struct CV_GpuHogTest : public CvTest cv::gpu::HOGDescriptor hog; hog.setSVMDetector(cv::gpu::HOGDescriptor::getDefaultPeopleDetector()); + //cpu detector may be updated soon + //hog.setSVMDetector(cv::HOGDescriptor::getDefaultPeopleDetector()); std::vector locations;