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
ad146e5a
Commit
ad146e5a
authored
May 30, 2018
by
Alexander Alekhin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
core: remove constructors from C API structures
POD structures can't have constructors.
parent
66d15e89
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
42 additions
and
8 deletions
+42
-8
types_c.h
modules/core/include/opencv2/core/types_c.h
+0
-0
matrix_c.cpp
modules/core/src/matrix_c.cpp
+11
-7
types_c.h
modules/imgproc/include/opencv2/imgproc/types_c.h
+31
-1
No files found.
modules/core/include/opencv2/core/types_c.h
View file @
ad146e5a
This diff is collapsed.
Click to expand it.
modules/core/src/matrix_c.cpp
View file @
ad146e5a
...
...
@@ -4,20 +4,24 @@
// glue
CvMatND
::
C
vMatND
(
const
cv
::
Mat
&
m
)
CvMatND
c
vMatND
(
const
cv
::
Mat
&
m
)
{
cvInitMatNDHeader
(
this
,
m
.
dims
,
m
.
size
,
m
.
type
(),
m
.
data
);
CvMatND
self
;
cvInitMatNDHeader
(
&
self
,
m
.
dims
,
m
.
size
,
m
.
type
(),
m
.
data
);
int
i
,
d
=
m
.
dims
;
for
(
i
=
0
;
i
<
d
;
i
++
)
dim
[
i
].
step
=
(
int
)
m
.
step
[
i
];
type
|=
m
.
flags
&
cv
::
Mat
::
CONTINUOUS_FLAG
;
self
.
dim
[
i
].
step
=
(
int
)
m
.
step
[
i
];
self
.
type
|=
m
.
flags
&
cv
::
Mat
::
CONTINUOUS_FLAG
;
return
self
;
}
_IplImage
::
_
IplImage
(
const
cv
::
Mat
&
m
)
_IplImage
cv
IplImage
(
const
cv
::
Mat
&
m
)
{
_IplImage
self
;
CV_Assert
(
m
.
dims
<=
2
);
cvInitImageHeader
(
this
,
m
.
size
(),
cvIplDepth
(
m
.
flags
),
m
.
channels
());
cvSetData
(
this
,
m
.
data
,
(
int
)
m
.
step
[
0
]);
cvInitImageHeader
(
&
self
,
cvSize
(
m
.
size
()),
cvIplDepth
(
m
.
flags
),
m
.
channels
());
cvSetData
(
&
self
,
m
.
data
,
(
int
)
m
.
step
[
0
]);
return
self
;
}
namespace
cv
{
...
...
modules/imgproc/include/opencv2/imgproc/types_c.h
View file @
ad146e5a
...
...
@@ -410,7 +410,7 @@ typedef struct CvMoments
double
mu20
,
mu11
,
mu02
,
mu30
,
mu21
,
mu12
,
mu03
;
/**< central moments */
double
inv_sqrt_m00
;
/**< m00 != 0 ? 1/sqrt(m00) : 0 */
#if
def __cplusplus
#if
defined(CV__ENABLE_C_API_CTORS) && defined(__cplusplus)
CvMoments
(){}
CvMoments
(
const
cv
::
Moments
&
m
)
{
...
...
@@ -430,6 +430,36 @@ typedef struct CvMoments
}
CvMoments
;
#ifdef __cplusplus
}
// extern "C"
CV_INLINE
CvMoments
cvMoments
()
{
#if !defined(CV__ENABLE_C_API_CTORS)
CvMoments
self
=
CV_STRUCT_INITIALIZER
;
return
self
;
#else
return
CvMoments
();
#endif
}
CV_INLINE
CvMoments
cvMoments
(
const
cv
::
Moments
&
m
)
{
#if !defined(CV__ENABLE_C_API_CTORS)
double
am00
=
std
::
abs
(
m
.
m00
);
CvMoments
self
=
{
m
.
m00
,
m
.
m10
,
m
.
m01
,
m
.
m20
,
m
.
m11
,
m
.
m02
,
m
.
m30
,
m
.
m21
,
m
.
m12
,
m
.
m03
,
m
.
mu20
,
m
.
mu11
,
m
.
mu02
,
m
.
mu30
,
m
.
mu21
,
m
.
mu12
,
m
.
mu03
,
am00
>
DBL_EPSILON
?
1
.
/
std
::
sqrt
(
am00
)
:
0
};
return
self
;
#else
return
CvMoments
(
m
);
#endif
}
extern
"C"
{
#endif // __cplusplus
/** Hu invariants */
typedef
struct
CvHuMoments
{
...
...
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