generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed gpu module HOG test failing on x64 OS

Browse Source
This commit is contained in:
Alexey Spizhevoy 2011-03-24 12:09:29 +00:00
parent d888b81052
commit ad693d7311
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/gpu/test/test_hog.cpp
View File

@ -94,16 +94,16 @@ struct CV_GpuHogDetectTestRunner: cv::gpu::HOGDescriptor
f.write((char*)&val, sizeof(val)); f.write((char*)&val, sizeof(val));
} }
} }
size_t nlocations = locations.size(); int nlocations = locations.size();
f.write((char*)&nlocations, sizeof(nlocations)); f.write((char*)&nlocations, sizeof(nlocations));
for (size_t i = 0; i < locations.size(); ++i) for (int i = 0; i < locations.size(); ++i)
f.write((char*)&locations[i], sizeof(locations[i])); f.write((char*)&locations[i], sizeof(locations[i]));
} }
#else #else
void compare(const cv::Mat& block_hists, const std::vector<cv::Point>& locations) void compare(const cv::Mat& block_hists, const std::vector<cv::Point>& locations)
{ {
int rows, cols; int rows, cols;
size_t nlocations; int nlocations;
f.read((char*)&rows, sizeof(rows)); f.read((char*)&rows, sizeof(rows));
f.read((char*)&cols, sizeof(cols)); f.read((char*)&cols, sizeof(cols));
@ -119,8 +119,8 @@ struct CV_GpuHogDetectTestRunner: cv::gpu::HOGDescriptor
} }
} }
f.read((char*)&nlocations, sizeof(nlocations)); f.read((char*)&nlocations, sizeof(nlocations));
CHECK(nlocations == locations.size(), cvtest::TS::FAIL_INVALID_OUTPUT); CHECK(nlocations == static_cast<int>(locations.size()), cvtest::TS::FAIL_INVALID_OUTPUT);
for (size_t i = 0; i < nlocations; ++i) for (int i = 0; i < nlocations; ++i)
{ {
cv::Point location; cv::Point location;
f.read((char*)&location, sizeof(location)); f.read((char*)&location, sizeof(location));