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
e903ce10
Commit
e903ce10
authored
Jan 10, 2013
by
marina.kolpakova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix wartings for 32bit build
parent
c0462358
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
23 additions
and
4 deletions
+23
-4
fpool.cpp
apps/sft/fpool.cpp
+11
-2
octave.cpp
modules/ml/src/octave.cpp
+12
-2
No files found.
apps/sft/fpool.cpp
View file @
e903ce10
...
...
@@ -76,6 +76,15 @@ void sft::write(cv::FileStorage& fs, const string&, const ICF& f)
sft
::
ICFFeaturePool
::~
ICFFeaturePool
(){}
// #define USE_LONG_SEEDS
#if defined USE_LONG_SEEDS
# define FEATURE_RECT_SEED 8854342234LU
#else
# define FEATURE_RECT_SEED 88543422LU
#endif
# define DCHANNELS_SEED 314152314LU
#undef USE_LONG_SEEDS
void
sft
::
ICFFeaturePool
::
fill
(
int
desired
)
{
int
mw
=
model
.
width
;
...
...
@@ -88,8 +97,8 @@ void sft::ICFFeaturePool::fill(int desired)
pool
.
reserve
(
nfeatures
);
sft
::
Random
::
engine
eng
(
8854342234LU
);
sft
::
Random
::
engine
eng_ch
(
314152314LU
);
sft
::
Random
::
engine
eng
(
FEATURE_RECT_SEED
);
sft
::
Random
::
engine
eng_ch
(
DCHANNELS_SEED
);
sft
::
Random
::
uniform
chRand
(
0
,
N_CHANNELS
-
1
);
...
...
modules/ml/src/octave.cpp
View file @
e903ce10
...
...
@@ -239,11 +239,21 @@ void cv::Octave::processPositives(const Dataset* dataset, const FeaturePool* poo
nnegatives
=
cvRound
(
nnegatives
*
total
/
(
double
)
npositives
);
}
// #define USE_LONG_SEEDS
#if defined USE_LONG_SEEDS
# define INDEX_ENGINE_SEED 764224349868LU
#else
# define INDEX_ENGINE_SEED 76422434LU
#endif
# define DX_DY_SEED 65633343LU
#undef USE_LONG_SEEDS
void
cv
::
Octave
::
generateNegatives
(
const
Dataset
*
dataset
,
const
FeaturePool
*
pool
)
{
// ToDo: set seed, use offsets
sft
::
Random
::
engine
eng
(
65633343LU
);
sft
::
Random
::
engine
idxEng
(
764224349868LU
);
sft
::
Random
::
engine
eng
(
DX_DY_SEED
);
sft
::
Random
::
engine
idxEng
(
INDEX_ENGINE_SEED
);
int
h
=
boundingBox
.
height
;
...
...
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