Chiebot-Mirror
/
opencv
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #7691 from LaurentBerger:I7676

Browse Source 
* Solve issue 7676

* I7676 bis
pull/7699/head
LaurentBerger 8 years ago committed by Alexander Alekhin
parent 866f8eb1e7
commit fb456eb69c
2 changed files with 19 additions and 19 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 18
      samples/cpp/detect_blob.cpp
  2. 20
      samples/cpp/detect_mser.cpp

18
samples/cpp/detect_blob.cpp
Unescape View File

@ -21,14 +21,14 @@ static String Legende(SimpleBlobDetector::Params &pAct)
String s = ""; String s = "";
if (pAct.filterByArea) if (pAct.filterByArea)
{ {
String inf = static_cast<ostringstream*>(&(ostringstream() << pAct.minArea))->str(); String inf = static_cast<const ostringstream&>(ostringstream() << pAct.minArea).str();
String sup = static_cast<ostringstream*>(&(ostringstream() << pAct.maxArea))->str(); String sup = static_cast<const ostringstream&>(ostringstream() << pAct.maxArea).str();
s = " Area range [" + inf + " to " + sup + "]"; s = " Area range [" + inf + " to " + sup + "]";
} }
if (pAct.filterByCircularity) if (pAct.filterByCircularity)
{ {
String inf = static_cast<ostringstream*>(&(ostringstream() << pAct.minCircularity))->str(); String inf = static_cast<const ostringstream&>(ostringstream() << pAct.minCircularity).str();
String sup = static_cast<ostringstream*>(&(ostringstream() << pAct.maxCircularity))->str(); String sup = static_cast<const ostringstream&>(ostringstream() << pAct.maxCircularity).str();
if (s.length() == 0) if (s.length() == 0)
s = " Circularity range [" + inf + " to " + sup + "]"; s = " Circularity range [" + inf + " to " + sup + "]";
else else
@ -36,7 +36,7 @@ static String Legende(SimpleBlobDetector::Params &pAct)
} }
if (pAct.filterByColor) if (pAct.filterByColor)
{ {
String inf = static_cast<ostringstream*>(&(ostringstream() << (int)pAct.blobColor))->str(); String inf = static_cast<const ostringstream&>(ostringstream() << (int)pAct.blobColor).str();
if (s.length() == 0) if (s.length() == 0)
s = " Blob color " + inf; s = " Blob color " + inf;
else else
@ -44,8 +44,8 @@ static String Legende(SimpleBlobDetector::Params &pAct)
} }
if (pAct.filterByConvexity) if (pAct.filterByConvexity)
{ {
String inf = static_cast<ostringstream*>(&(ostringstream() << pAct.minConvexity))->str(); String inf = static_cast<const ostringstream&>(ostringstream() << pAct.minConvexity).str();
String sup = static_cast<ostringstream*>(&(ostringstream() << pAct.maxConvexity))->str(); String sup = static_cast<const ostringstream&>(ostringstream() << pAct.maxConvexity).str();
if (s.length() == 0) if (s.length() == 0)
s = " Convexity range[" + inf + " to " + sup + "]"; s = " Convexity range[" + inf + " to " + sup + "]";
else else
@ -53,8 +53,8 @@ static String Legende(SimpleBlobDetector::Params &pAct)
} }
if (pAct.filterByInertia) if (pAct.filterByInertia)
{ {
String inf = static_cast<ostringstream*>(&(ostringstream() << pAct.minInertiaRatio))->str(); String inf = static_cast<const ostringstream&>(ostringstream() << pAct.minInertiaRatio).str();
String sup = static_cast<ostringstream*>(&(ostringstream() << pAct.maxInertiaRatio))->str(); String sup = static_cast<const ostringstream&>(ostringstream() << pAct.maxInertiaRatio).str();
if (s.length() == 0) if (s.length() == 0)
s = " Inertia ratio range [" + inf + " to " + sup + "]"; s = " Inertia ratio range [" + inf + " to " + sup + "]";
else else

20
samples/cpp/detect_mser.cpp
Unescape View File

@ -73,25 +73,25 @@ struct MSERParams
static String Legende(MSERParams &pAct) static String Legende(MSERParams &pAct)
{ {
String s=""; String s="";
String inf = static_cast<ostringstream*>(&(ostringstream() << pAct.minArea))->str(); String inf = static_cast<const ostringstream&>(ostringstream() << pAct.minArea).str();
String sup = static_cast<ostringstream*>(&(ostringstream() << pAct.maxArea))->str(); String sup = static_cast<const ostringstream&>(ostringstream() << pAct.maxArea).str();
s = " Area[" + inf + "," + sup + "]"; s = " Area[" + inf + "," + sup + "]";
inf = static_cast<ostringstream*>(&(ostringstream() << pAct.delta))->str(); inf = static_cast<const ostringstream&>(ostringstream() << pAct.delta).str();
s += " del. [" + inf + "]"; s += " del. [" + inf + "]";
inf = static_cast<ostringstream*>(&(ostringstream() << pAct.maxVariation))->str(); inf = static_cast<const ostringstream&>(ostringstream() << pAct.maxVariation).str();
s += " var. [" + inf + "]"; s += " var. [" + inf + "]";
inf = static_cast<ostringstream*>(&(ostringstream() << (int)pAct.minDiversity))->str(); inf = static_cast<const ostringstream&>(ostringstream() << (int)pAct.minDiversity).str();
s += " div. [" + inf + "]"; s += " div. [" + inf + "]";
inf = static_cast<ostringstream*>(&(ostringstream() << (int)pAct.pass2Only))->str(); inf = static_cast<const ostringstream&>(ostringstream() << (int)pAct.pass2Only).str();
s += " pas. [" + inf + "]"; s += " pas. [" + inf + "]";
inf = static_cast<ostringstream*>(&(ostringstream() << (int)pAct.maxEvolution))->str(); inf = static_cast<const ostringstream&>(ostringstream() << (int)pAct.maxEvolution).str();
s += "RGb-> evo. [" + inf + "]"; s += "RGb-> evo. [" + inf + "]";
inf = static_cast<ostringstream*>(&(ostringstream() << (int)pAct.areaThreshold))->str(); inf = static_cast<const ostringstream&>(ostringstream() << (int)pAct.areaThreshold).str();
s += " are. [" + inf + "]"; s += " are. [" + inf + "]";
inf = static_cast<ostringstream*>(&(ostringstream() << (int)pAct.minMargin))->str(); inf = static_cast<const ostringstream&>(ostringstream() << (int)pAct.minMargin).str();
s += " mar. [" + inf + "]"; s += " mar. [" + inf + "]";
inf = static_cast<ostringstream*>(&(ostringstream() << (int)pAct.edgeBlurSize))->str(); inf = static_cast<const ostringstream&>(ostringstream() << (int)pAct.edgeBlurSize).str();
s += " siz. [" + inf + "]"; s += " siz. [" + inf + "]";
return s; return s;
} }

Write Preview
Loading…
Cancel
Save