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
71ff228a
Commit
71ff228a
authored
Aug 13, 2014
by
Vadim Pisarevsky
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #3089 from Adil-Ibragimov:fix_cuda_constness
parents
12c69ad4
dfd0b297
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
6 deletions
+6
-6
cuda.hpp
modules/core/include/opencv2/core/cuda.hpp
+2
-2
gpu_mat.cu
modules/core/src/cuda/gpu_mat.cu
+1
-1
cuda_gpu_mat.cpp
modules/core/src/cuda_gpu_mat.cpp
+2
-2
cuda_host_mem.cpp
modules/core/src/cuda_host_mem.cpp
+1
-1
No files found.
modules/core/include/opencv2/core/cuda.hpp
View file @
71ff228a
...
...
@@ -261,7 +261,7 @@ public:
int
*
refcount
;
//! helper fields used in locateROI and adjustROI
const
uchar
*
datastart
;
uchar
*
datastart
;
const
uchar
*
dataend
;
//! allocator
...
...
@@ -349,7 +349,7 @@ public:
uchar
*
data
;
int
*
refcount
;
const
uchar
*
datastart
;
uchar
*
datastart
;
const
uchar
*
dataend
;
AllocType
alloc_type
;
...
...
modules/core/src/cuda/gpu_mat.cu
View file @
71ff228a
...
...
@@ -160,7 +160,7 @@ void cv::cuda::GpuMat::release()
if (refcount && CV_XADD(refcount, -1) == 1)
allocator->free(this);
data
= datastart = dataend
= 0;
data
end = data = datastart
= 0;
step = rows = cols = 0;
refcount = 0;
}
...
...
modules/core/src/cuda_gpu_mat.cpp
View file @
71ff228a
...
...
@@ -49,7 +49,7 @@ using namespace cv::cuda;
cv
::
cuda
::
GpuMat
::
GpuMat
(
int
rows_
,
int
cols_
,
int
type_
,
void
*
data_
,
size_t
step_
)
:
flags
(
Mat
::
MAGIC_VAL
+
(
type_
&
Mat
::
TYPE_MASK
)),
rows
(
rows_
),
cols
(
cols_
),
step
(
step_
),
data
((
uchar
*
)
data_
),
refcount
(
0
),
datastart
((
uchar
*
)
data_
),
dataend
((
uchar
*
)
data_
),
datastart
((
uchar
*
)
data_
),
dataend
((
const
uchar
*
)
data_
),
allocator
(
defaultAllocator
())
{
size_t
minstep
=
cols
*
elemSize
();
...
...
@@ -75,7 +75,7 @@ cv::cuda::GpuMat::GpuMat(int rows_, int cols_, int type_, void* data_, size_t st
cv
::
cuda
::
GpuMat
::
GpuMat
(
Size
size_
,
int
type_
,
void
*
data_
,
size_t
step_
)
:
flags
(
Mat
::
MAGIC_VAL
+
(
type_
&
Mat
::
TYPE_MASK
)),
rows
(
size_
.
height
),
cols
(
size_
.
width
),
step
(
step_
),
data
((
uchar
*
)
data_
),
refcount
(
0
),
datastart
((
uchar
*
)
data_
),
dataend
((
uchar
*
)
data_
),
datastart
((
uchar
*
)
data_
),
dataend
((
const
uchar
*
)
data_
),
allocator
(
defaultAllocator
())
{
size_t
minstep
=
cols
*
elemSize
();
...
...
modules/core/src/cuda_host_mem.cpp
View file @
71ff228a
...
...
@@ -175,7 +175,7 @@ void cv::cuda::CudaMem::release()
fastFree
(
refcount
);
}
data
=
datastart
=
dataend
=
0
;
data
end
=
data
=
datastart
=
0
;
step
=
rows
=
cols
=
0
;
refcount
=
0
;
#endif
...
...
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