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
b70b5a30
Commit
b70b5a30
authored
Apr 30, 2013
by
alexandre benoit
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
corrections required for portability. To be validated by buildbot
parent
1976b3d9
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
retina.hpp
modules/contrib/include/opencv2/contrib/retina.hpp
+2
-2
retina.cpp
modules/contrib/src/retina.cpp
+3
-3
No files found.
modules/contrib/include/opencv2/contrib/retina.hpp
View file @
b70b5a30
...
...
@@ -294,8 +294,8 @@ public:
*/
virtual
void
activateContoursProcessing
(
const
bool
activate
)
=
0
;
};
Ptr
<
Retina
>
createRetina
(
Size
inputSize
);
Ptr
<
Retina
>
createRetina
(
Size
inputSize
,
const
bool
colorMode
,
RETINA_COLORSAMPLINGMETHOD
colorSamplingMethod
=
RETINA_COLOR_BAYER
,
const
bool
useRetinaLogSampling
=
false
,
const
double
reductionFactor
=
1.0
,
const
double
samplingStrenght
=
10.0
);
CV_EXPORTS
Ptr
<
Retina
>
createRetina
(
Size
inputSize
);
CV_EXPORTS
Ptr
<
Retina
>
createRetina
(
Size
inputSize
,
const
bool
colorMode
,
RETINA_COLORSAMPLINGMETHOD
colorSamplingMethod
=
RETINA_COLOR_BAYER
,
const
bool
useRetinaLogSampling
=
false
,
const
double
reductionFactor
=
1.0
,
const
double
samplingStrenght
=
10.0
);
}
#endif
/* __OPENCV_CONTRIB_RETINA_HPP__ */
...
...
modules/contrib/src/retina.cpp
View file @
b70b5a30
...
...
@@ -565,7 +565,7 @@ void RetinaImpl::getParvoRAW(cv::Mat &parvoOutputBufferCopy){
const
Mat
RetinaImpl
::
getMagnoRAW
()
const
{
// create a cv::Mat header for the valarray
//const cv::Mat output=
return
Mat
(
_retinaFilter
->
getMovingContours
().
size
(),
1
,
CV_32F
,
(
void
*
)
&
_retinaFilter
->
getMovingContours
()[
0
]
);
return
Mat
(
_retinaFilter
->
getMovingContours
().
size
(),
1
,
CV_32F
,
(
void
*
)
(
&
_retinaFilter
->
getMovingContours
()[
0
])
);
}
...
...
@@ -573,11 +573,11 @@ const Mat RetinaImpl::getParvoRAW() const {
if
(
_retinaFilter
->
getColorMode
())
// check if color mode is enabled
{
// create a cv::Mat table (for RGB planes as a single vector)
return
Mat
(
_retinaFilter
->
getColorOutput
().
size
(),
1
,
CV_32F
,
(
void
*
)
&
_retinaFilter
->
getColorOutput
()[
0
]
);
return
Mat
(
_retinaFilter
->
getColorOutput
().
size
(),
1
,
CV_32F
,
(
void
*
)
&
(
_retinaFilter
->
getColorOutput
()[
0
])
);
}
// otherwise, output is gray level
// create a cv::Mat header for the valarray
return
Mat
(
_retinaFilter
->
getContours
().
size
(),
1
,
CV_32F
,
(
void
*
)
&
_retinaFilter
->
getContours
()[
0
]
);
return
Mat
(
_retinaFilter
->
getContours
().
size
(),
1
,
CV_32F
,
(
void
*
)
&
(
_retinaFilter
->
getContours
()[
0
])
);
}
// private method called by constructirs
...
...
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