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

removed /EHa flag for cuda compilation

Browse Source
This commit is contained in:
Anatoly Baksheev
2012-08-23 15:46:19 +04:00
parent 290030d030
commit e60a50c43c
4 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
modules/gpu/test/test_labeling.cpp
View File

@@ -87,6 +87,7 @@ namespace {
unsigned char* source = (unsigned char*)image.data;
int width = image.cols;
int height = image.rows;
int step1 = (int)image.step1();
for (int j = 0; j < image.rows; ++j)
for (int i = 0; i < image.cols; ++i)
@@ -102,7 +103,7 @@ namespace {
while (top >= stack)
{
int* dl = &dist_labels[p.y * pitch + p.x];
unsigned char* sp = &source[p.y * image.step1() + p.x];
unsigned char* sp = &source[p.y * step1 + p.x];
dl[0] = cc;
@@ -115,11 +116,11 @@ namespace {
*top++ = dot::make(p.x - 1, p.y);
//bottom
if( p.y < (height - 1) && dl[+pitch] == -1 && inInt(sp[0], sp[+image.step1()]))
if( p.y < (height - 1) && dl[+pitch] == -1 && inInt(sp[0], sp[+step1]))
*top++ = dot::make(p.x, p.y + 1);
//top
if( p.y > 0 && dl[-pitch] == -1 && inInt(sp[0], sp[-image.step1()]))
if( p.y > 0 && dl[-pitch] == -1 && inInt(sp[0], sp[-step1]))
*top++ = dot::make(p.x, p.y - 1);
p = *--top;