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
e7bab669
Commit
e7bab669
authored
Jan 09, 2013
by
marina.kolpakova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
replace cv::Mat to Input/Output arrays
parent
184ae44d
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
5 deletions
+8
-5
fpool.cpp
apps/sft/fpool.cpp
+1
-1
fpool.hpp
apps/sft/include/sft/fpool.hpp
+6
-3
ml.hpp
modules/ml/include/opencv2/ml/ml.hpp
+1
-1
No files found.
apps/sft/fpool.cpp
View file @
e7bab669
...
@@ -54,7 +54,7 @@ sft::ICFFeaturePool::ICFFeaturePool(cv::Size m, int n) : FeaturePool(), model(m)
...
@@ -54,7 +54,7 @@ sft::ICFFeaturePool::ICFFeaturePool(cv::Size m, int n) : FeaturePool(), model(m)
fill
(
nfeatures
);
fill
(
nfeatures
);
}
}
void
sft
::
ICFFeaturePool
::
preprocess
(
c
onst
Mat
&
frame
,
Mat
&
integrals
)
const
void
sft
::
ICFFeaturePool
::
preprocess
(
c
v
::
InputArray
frame
,
cv
::
OutputArray
integrals
)
const
{
{
preprocessor
.
apply
(
frame
,
integrals
);
preprocessor
.
apply
(
frame
,
integrals
);
}
}
...
...
apps/sft/include/sft/fpool.hpp
View file @
e7bab669
...
@@ -56,9 +56,12 @@ class Preprocessor
...
@@ -56,9 +56,12 @@ class Preprocessor
public
:
public
:
Preprocessor
()
{}
Preprocessor
()
{}
void
apply
(
c
onst
cv
::
Mat
&
frame
,
cv
::
Mat
&
integrals
)
const
void
apply
(
c
v
::
InputArray
_frame
,
cv
::
OutputArray
_integrals
)
const
//const cv::Mat& frame, cv::Mat& integrals
{
{
CV_Assert
(
frame
.
type
()
==
CV_8UC3
);
CV_Assert
(
_frame
.
type
()
==
CV_8UC3
);
cv
::
Mat
frame
=
_frame
.
getMat
();
cv
::
Mat
&
integrals
=
_integrals
.
getMatRef
();
int
h
=
frame
.
rows
;
int
h
=
frame
.
rows
;
int
w
=
frame
.
cols
;
int
w
=
frame
.
cols
;
...
@@ -165,7 +168,7 @@ public:
...
@@ -165,7 +168,7 @@ public:
virtual
int
size
()
const
{
return
(
int
)
pool
.
size
();
}
virtual
int
size
()
const
{
return
(
int
)
pool
.
size
();
}
virtual
float
apply
(
int
fi
,
int
si
,
const
cv
::
Mat
&
integrals
)
const
;
virtual
float
apply
(
int
fi
,
int
si
,
const
cv
::
Mat
&
integrals
)
const
;
virtual
void
preprocess
(
c
onst
cv
::
Mat
&
frame
,
cv
::
Mat
&
integrals
)
const
;
virtual
void
preprocess
(
c
v
::
InputArray
_frame
,
cv
::
OutputArray
_
integrals
)
const
;
virtual
void
write
(
cv
::
FileStorage
&
fs
,
int
index
)
const
;
virtual
void
write
(
cv
::
FileStorage
&
fs
,
int
index
)
const
;
virtual
~
ICFFeaturePool
();
virtual
~
ICFFeaturePool
();
...
...
modules/ml/include/opencv2/ml/ml.hpp
View file @
e7bab669
...
@@ -2140,7 +2140,7 @@ public:
...
@@ -2140,7 +2140,7 @@ public:
virtual
float
apply
(
int
fi
,
int
si
,
const
Mat
&
integrals
)
const
=
0
;
virtual
float
apply
(
int
fi
,
int
si
,
const
Mat
&
integrals
)
const
=
0
;
virtual
void
write
(
cv
::
FileStorage
&
fs
,
int
index
)
const
=
0
;
virtual
void
write
(
cv
::
FileStorage
&
fs
,
int
index
)
const
=
0
;
virtual
void
preprocess
(
const
Mat
&
frame
,
Mat
&
integrals
)
const
=
0
;
virtual
void
preprocess
(
InputArray
frame
,
OutputArray
integrals
)
const
=
0
;
virtual
~
FeaturePool
();
virtual
~
FeaturePool
();
};
};
...
...
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