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

trailing whitespace and some bracket

Browse Source
This commit is contained in:
laurentBerger 2015-05-16 19:29:12 +02:00
parent 68e9d19743
commit 7cf5de0ed0
1 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
samples/cpp/detect_mser.cpp
View File

@ -34,7 +34,7 @@ static void help()
" ./detect_mser <image1(without parameter a syntehtic image is used as default)>\n" " ./detect_mser <image1(without parameter a syntehtic image is used as default)>\n"
"Press esc key when image window is active to change descriptor parameter\n"; "Press esc key when image window is active to change descriptor parameter\n";
"Press 2, 8, 4, 6, +,- or 5 keys in openGL windows to change view or use mouse\n"; "Press 2, 8, 4, 6, +,- or 5 keys in openGL windows to change view or use mouse\n";
} }
struct MSERParams struct MSERParams
{ {
@ -158,7 +158,7 @@ static void onMouse(int event, int x, int y, int flags, void*)
prevPhi = -1000; prevPhi = -1000;
} }
if (prevTheta != -1000) if (prevTheta != -1000)
{ {
if (x - prevTheta<0) if (x - prevTheta<0)
{ {
thetaObs +=(float)0.02; thetaObs +=(float)0.02;
@ -179,23 +179,33 @@ static void onMouse(int event, int x, int y, int flags, void*)
prevPhi = y; prevPhi = y;
} }
if (event==EVENT_MOUSEWHEEL) if (event==EVENT_MOUSEWHEEL)
{
if (getMouseWheelDelta(flags)>0) if (getMouseWheelDelta(flags)>0)
rObs += (float)0.1; rObs += (float)0.1;
else else
rObs -= (float)0.1; rObs -= (float)0.1;
float pi = (float)acos(-1.0); }
float pi = (float)acos(-1.0);
if (thetaObs>pi) if (thetaObs>pi)
{ {
thetaObs = -2 * pi + thetaObs; thetaObs = -2 * pi + thetaObs;
} }
if (thetaObs<-pi) if (thetaObs<-pi)
{
thetaObs = 2 * pi + thetaObs; thetaObs = 2 * pi + thetaObs;
}
if (phiObs>pi / 2) if (phiObs>pi / 2)
{
phiObs = pi / 2 - (float)0.0001; phiObs = pi / 2 - (float)0.0001;
}
if (phiObs<-pi / 2) if (phiObs<-pi / 2)
{
phiObs = -pi / 2 + (float)0.00001; phiObs = -pi / 2 + (float)0.00001;
}
if (rObs<0) if (rObs<0)
{
rObs = 0; rObs = 0;
}
} }
@ -360,17 +370,15 @@ Mat MakeSyntheticImage()
p0 = Point(600, 600); p0 = Point(600, 600);
for (int i = 0; i<13; i++) for (int i = 0; i<13; i++)
{ {
circle(img, p0, width[i] / 2, Scalar(color[i]), 1); circle(img, p0, width[i] / 2, Scalar(color[i]), 1);
floodFill(img, p0, Scalar(color[i])); floodFill(img, p0, Scalar(color[i]));
}
}
int histSize = 256; int histSize = 256;
float range[] = { 0, 256 }; float range[] = { 0, 256 };
const float* histRange[] = { range }; const float* histRange[] = { range };
Mat hist; Mat hist;
// we compute the histogram // we compute the histogram
calcHist(&img, 1, 0, Mat(), hist, 1, &histSize, histRange, true, false); calcHist(&img, 1, 0, Mat(), hist, 1, &histSize, histRange, true, false);
cout << "****************Maximal region************************\n"; cout << "****************Maximal region************************\n";
for (int i = 0; i < hist.rows ; i++) for (int i = 0; i < hist.rows ; i++)
@ -478,7 +486,7 @@ int main(int argc, char *argv[])
plan.push_back(img); plan.push_back(img);
merge(plan,result); merge(plan,result);
} }
try try
{ {
// We can detect regions using detectRegions method // We can detect regions using detectRegions method
vector<KeyPoint> keyImg; vector<KeyPoint> keyImg;
@ -518,7 +526,3 @@ int main(int argc, char *argv[])
} }
return 0; return 0;
} }