Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
9dac2230
Commit
9dac2230
authored
Jun 13, 2012
by
Marina Kolpakova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed part of shadow warnings
parent
7dd00677
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
14 deletions
+16
-14
NCV.hpp
modules/gpu/src/nvidia/core/NCV.hpp
+16
-14
No files found.
modules/gpu/src/nvidia/core/NCV.hpp
View file @
9dac2230
...
@@ -142,7 +142,7 @@ struct NcvRect8u
...
@@ -142,7 +142,7 @@ struct NcvRect8u
Ncv8u
width
;
Ncv8u
width
;
Ncv8u
height
;
Ncv8u
height
;
__host__
__device__
NcvRect8u
()
:
x
(
0
),
y
(
0
),
width
(
0
),
height
(
0
)
{};
__host__
__device__
NcvRect8u
()
:
x
(
0
),
y
(
0
),
width
(
0
),
height
(
0
)
{};
__host__
__device__
NcvRect8u
(
Ncv8u
x
,
Ncv8u
y
,
Ncv8u
width
,
Ncv8u
height
)
:
x
(
x
),
y
(
y
),
width
(
width
),
height
(
height
)
{}
__host__
__device__
NcvRect8u
(
Ncv8u
x
_
,
Ncv8u
y_
,
Ncv8u
width_
,
Ncv8u
height_
)
:
x
(
x_
),
y
(
y_
),
width
(
width_
),
height
(
height_
)
{}
};
};
...
@@ -153,7 +153,8 @@ struct NcvRect32s
...
@@ -153,7 +153,8 @@ struct NcvRect32s
Ncv32s
width
;
///< Rectangle width.
Ncv32s
width
;
///< Rectangle width.
Ncv32s
height
;
///< Rectangle height.
Ncv32s
height
;
///< Rectangle height.
__host__
__device__
NcvRect32s
()
:
x
(
0
),
y
(
0
),
width
(
0
),
height
(
0
)
{};
__host__
__device__
NcvRect32s
()
:
x
(
0
),
y
(
0
),
width
(
0
),
height
(
0
)
{};
__host__
__device__
NcvRect32s
(
Ncv32s
x
,
Ncv32s
y
,
Ncv32s
width
,
Ncv32s
height
)
:
x
(
x
),
y
(
y
),
width
(
width
),
height
(
height
)
{}
__host__
__device__
NcvRect32s
(
Ncv32s
x_
,
Ncv32s
y_
,
Ncv32s
width_
,
Ncv32s
height_
)
:
x
(
x_
),
y
(
y_
),
width
(
width_
),
height
(
height_
)
{}
};
};
...
@@ -164,7 +165,8 @@ struct NcvRect32u
...
@@ -164,7 +165,8 @@ struct NcvRect32u
Ncv32u
width
;
///< Rectangle width.
Ncv32u
width
;
///< Rectangle width.
Ncv32u
height
;
///< Rectangle height.
Ncv32u
height
;
///< Rectangle height.
__host__
__device__
NcvRect32u
()
:
x
(
0
),
y
(
0
),
width
(
0
),
height
(
0
)
{};
__host__
__device__
NcvRect32u
()
:
x
(
0
),
y
(
0
),
width
(
0
),
height
(
0
)
{};
__host__
__device__
NcvRect32u
(
Ncv32u
x
,
Ncv32u
y
,
Ncv32u
width
,
Ncv32u
height
)
:
x
(
x
),
y
(
y
),
width
(
width
),
height
(
height
)
{}
__host__
__device__
NcvRect32u
(
Ncv32u
x_
,
Ncv32u
y_
,
Ncv32u
width_
,
Ncv32u
height_
)
:
x
(
x_
),
y
(
y_
),
width
(
width_
),
height
(
height_
)
{}
};
};
...
@@ -173,7 +175,7 @@ struct NcvSize32s
...
@@ -173,7 +175,7 @@ struct NcvSize32s
Ncv32s
width
;
///< Rectangle width.
Ncv32s
width
;
///< Rectangle width.
Ncv32s
height
;
///< Rectangle height.
Ncv32s
height
;
///< Rectangle height.
__host__
__device__
NcvSize32s
()
:
width
(
0
),
height
(
0
)
{};
__host__
__device__
NcvSize32s
()
:
width
(
0
),
height
(
0
)
{};
__host__
__device__
NcvSize32s
(
Ncv32s
width
,
Ncv32s
height
)
:
width
(
width
),
height
(
height
)
{}
__host__
__device__
NcvSize32s
(
Ncv32s
width
_
,
Ncv32s
height_
)
:
width
(
width_
),
height
(
height_
)
{}
};
};
...
@@ -182,7 +184,7 @@ struct NcvSize32u
...
@@ -182,7 +184,7 @@ struct NcvSize32u
Ncv32u
width
;
///< Rectangle width.
Ncv32u
width
;
///< Rectangle width.
Ncv32u
height
;
///< Rectangle height.
Ncv32u
height
;
///< Rectangle height.
__host__
__device__
NcvSize32u
()
:
width
(
0
),
height
(
0
)
{};
__host__
__device__
NcvSize32u
()
:
width
(
0
),
height
(
0
)
{};
__host__
__device__
NcvSize32u
(
Ncv32u
width
,
Ncv32u
height
)
:
width
(
width
),
height
(
height
)
{}
__host__
__device__
NcvSize32u
(
Ncv32u
width
_
,
Ncv32u
height_
)
:
width
(
width_
),
height
(
height_
)
{}
__host__
__device__
bool
operator
==
(
const
NcvSize32u
&
another
)
const
{
return
this
->
width
==
another
.
width
&&
this
->
height
==
another
.
height
;}
__host__
__device__
bool
operator
==
(
const
NcvSize32u
&
another
)
const
{
return
this
->
width
==
another
.
width
&&
this
->
height
==
another
.
height
;}
};
};
...
@@ -192,7 +194,7 @@ struct NcvPoint2D32s
...
@@ -192,7 +194,7 @@ struct NcvPoint2D32s
Ncv32s
x
;
///< Point X.
Ncv32s
x
;
///< Point X.
Ncv32s
y
;
///< Point Y.
Ncv32s
y
;
///< Point Y.
__host__
__device__
NcvPoint2D32s
()
:
x
(
0
),
y
(
0
)
{};
__host__
__device__
NcvPoint2D32s
()
:
x
(
0
),
y
(
0
)
{};
__host__
__device__
NcvPoint2D32s
(
Ncv32s
x
,
Ncv32s
y
)
:
x
(
x
),
y
(
y
)
{}
__host__
__device__
NcvPoint2D32s
(
Ncv32s
x
_
,
Ncv32s
y_
)
:
x
(
x_
),
y
(
y_
)
{}
};
};
...
@@ -201,7 +203,7 @@ struct NcvPoint2D32u
...
@@ -201,7 +203,7 @@ struct NcvPoint2D32u
Ncv32u
x
;
///< Point X.
Ncv32u
x
;
///< Point X.
Ncv32u
y
;
///< Point Y.
Ncv32u
y
;
///< Point Y.
__host__
__device__
NcvPoint2D32u
()
:
x
(
0
),
y
(
0
)
{};
__host__
__device__
NcvPoint2D32u
()
:
x
(
0
),
y
(
0
)
{};
__host__
__device__
NcvPoint2D32u
(
Ncv32u
x
,
Ncv32u
y
)
:
x
(
x
),
y
(
y
)
{}
__host__
__device__
NcvPoint2D32u
(
Ncv32u
x
_
,
Ncv32u
y_
)
:
x
(
x_
),
y
(
y_
)
{}
};
};
...
@@ -625,9 +627,9 @@ class NCVVectorAlloc : public NCVVector<T>
...
@@ -625,9 +627,9 @@ class NCVVectorAlloc : public NCVVector<T>
public
:
public
:
NCVVectorAlloc
(
INCVMemAllocator
&
allocator
,
Ncv32u
length
)
NCVVectorAlloc
(
INCVMemAllocator
&
allocator
_
,
Ncv32u
length
)
:
:
allocator
(
allocator
)
allocator
(
allocator
_
)
{
{
NCVStatus
ncvStat
;
NCVStatus
ncvStat
;
...
@@ -839,7 +841,7 @@ class NCVMatrixAlloc : public NCVMatrix<T>
...
@@ -839,7 +841,7 @@ class NCVMatrixAlloc : public NCVMatrix<T>
NCVMatrixAlloc
&
operator
=
(
const
NCVMatrixAlloc
&
);
NCVMatrixAlloc
&
operator
=
(
const
NCVMatrixAlloc
&
);
public
:
public
:
NCVMatrixAlloc
(
INCVMemAllocator
&
allocator
,
Ncv32u
width
,
Ncv32u
height
,
Ncv32u
pitch
=
0
)
NCVMatrixAlloc
(
INCVMemAllocator
&
allocator
,
Ncv32u
width
,
Ncv32u
height
,
Ncv32u
_
pitch
=
0
)
:
:
allocator
(
allocator
)
allocator
(
allocator
)
{
{
...
@@ -851,12 +853,12 @@ public:
...
@@ -851,12 +853,12 @@ public:
Ncv32u
widthBytes
=
width
*
sizeof
(
T
);
Ncv32u
widthBytes
=
width
*
sizeof
(
T
);
Ncv32u
pitchBytes
=
alignUp
(
widthBytes
,
allocator
.
alignment
());
Ncv32u
pitchBytes
=
alignUp
(
widthBytes
,
allocator
.
alignment
());
if
(
pitch
!=
0
)
if
(
_
pitch
!=
0
)
{
{
ncvAssertPrintReturn
(
pitch
>=
pitchBytes
&&
ncvAssertPrintReturn
(
_
pitch
>=
pitchBytes
&&
(
pitch
&
(
allocator
.
alignment
()
-
1
))
==
0
,
(
_
pitch
&
(
allocator
.
alignment
()
-
1
))
==
0
,
"NCVMatrixAlloc ctor:: incorrect pitch passed"
,
);
"NCVMatrixAlloc ctor:: incorrect pitch passed"
,
);
pitchBytes
=
pitch
;
pitchBytes
=
_
pitch
;
}
}
Ncv32u
requiredAllocSize
=
pitchBytes
*
height
;
Ncv32u
requiredAllocSize
=
pitchBytes
*
height
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment