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
649737b6
Commit
649737b6
authored
Apr 15, 2013
by
Vladislav Vinogradov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
removed obsolete DevMem2D class
parent
4c9773d5
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
38 deletions
+0
-38
gpu.hpp
modules/core/include/opencv2/core/gpu.hpp
+0
-11
gpu_types.hpp
modules/core/include/opencv2/core/gpu_types.hpp
+0
-27
No files found.
modules/core/include/opencv2/core/gpu.hpp
View file @
649737b6
...
@@ -418,11 +418,6 @@ public:
...
@@ -418,11 +418,6 @@ public:
template
<
typename
_Tp
>
operator
PtrStepSz
<
_Tp
>
()
const
;
template
<
typename
_Tp
>
operator
PtrStepSz
<
_Tp
>
()
const
;
template
<
typename
_Tp
>
operator
PtrStep
<
_Tp
>
()
const
;
template
<
typename
_Tp
>
operator
PtrStep
<
_Tp
>
()
const
;
// Deprecated function
__CV_GPU_DEPR_BEFORE__
template
<
typename
_Tp
>
operator
DevMem2D_
<
_Tp
>
()
const
__CV_GPU_DEPR_AFTER__
;
#undef __CV_GPU_DEPR_BEFORE__
#undef __CV_GPU_DEPR_AFTER__
/*! includes several bit-fields:
/*! includes several bit-fields:
- the magic signature
- the magic signature
- continuity flag
- continuity flag
...
@@ -681,12 +676,6 @@ GpuMat::operator PtrStep<T>() const
...
@@ -681,12 +676,6 @@ GpuMat::operator PtrStep<T>() const
return
PtrStep
<
T
>
((
T
*
)
data
,
step
);
return
PtrStep
<
T
>
((
T
*
)
data
,
step
);
}
}
template
<
class
T
>
inline
GpuMat
::
operator
DevMem2D_
<
T
>
()
const
{
return
DevMem2D_
<
T
>
(
rows
,
cols
,
(
T
*
)
data
,
step
);
}
static
inline
static
inline
void
swap
(
GpuMat
&
a
,
GpuMat
&
b
)
void
swap
(
GpuMat
&
a
,
GpuMat
&
b
)
{
{
...
...
modules/core/include/opencv2/core/gpu_types.hpp
View file @
649737b6
...
@@ -120,33 +120,6 @@ namespace cv
...
@@ -120,33 +120,6 @@ namespace cv
typedef
PtrStep
<
unsigned
char
>
PtrStepb
;
typedef
PtrStep
<
unsigned
char
>
PtrStepb
;
typedef
PtrStep
<
float
>
PtrStepf
;
typedef
PtrStep
<
float
>
PtrStepf
;
typedef
PtrStep
<
int
>
PtrStepi
;
typedef
PtrStep
<
int
>
PtrStepi
;
#if defined __GNUC__
#define __CV_GPU_DEPR_BEFORE__
#define __CV_GPU_DEPR_AFTER__ __attribute__ ((deprecated))
#elif defined(__MSVC__) //|| defined(__CUDACC__)
#pragma deprecated(DevMem2D_)
#define __CV_GPU_DEPR_BEFORE__ __declspec(deprecated)
#define __CV_GPU_DEPR_AFTER__
#else
#define __CV_GPU_DEPR_BEFORE__
#define __CV_GPU_DEPR_AFTER__
#endif
template
<
typename
T
>
struct
__CV_GPU_DEPR_BEFORE__
DevMem2D_
:
public
PtrStepSz
<
T
>
{
DevMem2D_
()
{}
DevMem2D_
(
int
rows_
,
int
cols_
,
T
*
data_
,
size_t
step_
)
:
PtrStepSz
<
T
>
(
rows_
,
cols_
,
data_
,
step_
)
{}
template
<
typename
U
>
explicit
__CV_GPU_DEPR_BEFORE__
DevMem2D_
(
const
DevMem2D_
<
U
>&
d
)
:
PtrStepSz
<
T
>
(
d
.
rows
,
d
.
cols
,
(
T
*
)
d
.
data
,
d
.
step
)
{}
}
__CV_GPU_DEPR_AFTER__
;
typedef
DevMem2D_
<
unsigned
char
>
DevMem2Db
;
typedef
DevMem2Db
DevMem2D
;
typedef
DevMem2D_
<
float
>
DevMem2Df
;
typedef
DevMem2D_
<
int
>
DevMem2Di
;
}
}
}
}
...
...
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