Merge pull request #425 from asmaloney:vector_empty

6dc3b662 · Andrey Kamaev · OpenCV Buildbot · 58c4d5f4 · ac8744af · 6dc3b662
Commit 6dc3b662 authored Feb 04, 2013 by Andrey Kamaev Committed by OpenCV Buildbot Feb 04, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 4 deletions

chamfermatching.cpp modules/contrib/src/chamfermatching.cpp +2 -4

No files found.
--- a/modules/contrib/src/chamfermatching.cpp
+++ b/modules/contrib/src/chamfermatching.cpp
@@ -930,15 +930,13 @@ void ChamferMatcher::Template::show() const
 void ChamferMatcher::Matching::addTemplateFromImage(Mat& templ, float scale)
 {
    Template* cmt = new Template(templ, scale);
-    if(templates.size() > 0)
-        templates.clear();
+    templates.clear();
    templates.push_back(cmt);
    cmt->show();
 }

 void ChamferMatcher::Matching::addTemplate(Template& template_){
-    if(templates.size() > 0)
-        templates.clear();
+    templates.clear();
    templates.push_back(&template_);
 }
 /**