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
95608b1b
Commit
95608b1b
authored
Feb 18, 2016
by
Dan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
free -> deallocate
parent
c0e34934
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
utility.hpp
modules/core/include/opencv2/core/cuda/utility.hpp
+1
-1
gpu_mat.cu
modules/core/src/cuda/gpu_mat.cu
+1
-1
No files found.
modules/core/include/opencv2/core/cuda/utility.hpp
View file @
95608b1b
...
...
@@ -59,7 +59,7 @@ namespace cv { namespace cuda { namespace device
typedef
uchar
value_type
;
virtual
__device__
__host__
uchar
*
allocate
(
size_t
numBytes
)
=
0
;
virtual
__device__
__host__
void
free
(
uchar
*
ptr
)
=
0
;
virtual
__device__
__host__
void
deallocate
(
uchar
*
ptr
,
size_t
numBytes
)
=
0
;
static
ThrustAllocator
&
getAllocator
();
static
void
setAllocator
(
ThrustAllocator
*
allocator
);
};
...
...
modules/core/src/cuda/gpu_mat.cu
View file @
95608b1b
...
...
@@ -71,7 +71,7 @@ namespace
return NULL;
#endif
}
__device__ __host__ void
free(uchar* ptr
)
__device__ __host__ void
deallocate(uchar* ptr, size_t numBytes
)
{
#ifndef __CUDA_ARCH__
CV_CUDEV_SAFE_CALL(cudaFree(ptr));
...
...
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