generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #3294 from mshabunin:fix-ios-warnings-24

Browse Source
This commit is contained in:
Vadim Pisarevsky
2014-11-05 11:35:19 +00:00
parent 23b28a6700 0c3722be82
commit b476bf2a00
37 changed files with 159 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/features2d/src/freak.cpp
View File

@@ -44,8 +44,6 @@
namespace cv
{
static const double FREAK_SQRT2 = 1.4142135623731;
static const double FREAK_INV_SQRT2 = 1.0 / FREAK_SQRT2;
static const double FREAK_LOG2 = 0.693147180559945;
static const int FREAK_NB_ORIENTATION = 256;
static const int FREAK_NB_POINTS = 43;

8
modules/features2d/src/mser.cpp
View File

@@ -233,7 +233,7 @@ MSERNewHistory( MSERConnectedComp* comp, MSERGrowHistory* history )
history->shortcut = comp->history->shortcut;
history->stable = comp->history->stable;
}
history->val = comp->grey_level;
history->val = (int)comp->grey_level;
history->size = comp->size;
comp->history = history;
}
@@ -263,7 +263,7 @@ MSERMergeComp( MSERConnectedComp* comp1,
}
if ( NULL != comp2->history && comp2->history->stable > history->stable )
history->stable = comp2->history->stable;
history->val = comp1->grey_level;
history->val = (int)comp1->grey_level;
history->size = comp1->size;
// put comp1 to history
comp->var = comp1->var;
@@ -288,7 +288,7 @@ MSERMergeComp( MSERConnectedComp* comp1,
}
if ( NULL != comp1->history && comp1->history->stable > history->stable )
history->stable = comp1->history->stable;
history->val = comp2->grey_level;
history->val = (int)comp2->grey_level;
history->size = comp2->size;
// put comp2 to history
comp->var = comp2->var;
@@ -312,7 +312,7 @@ static float
MSERVariationCalc( MSERConnectedComp* comp, int delta )
{
MSERGrowHistory* history = comp->history;
int val = comp->grey_level;
int val = (int)comp->grey_level;
if ( NULL != history )
{
MSERGrowHistory* shortcut = history->shortcut;

1
modules/features2d/src/orb.cpp
View File

@@ -43,7 +43,6 @@ namespace cv
{
const float HARRIS_K = 0.04f;
const int DESCRIPTOR_SIZE = 32;
/**
* Function that computes the Harris responses in a