Merge pull request opencv#1089 from SpecLad:contract-violations

AaronPlay · Jul 4, 2013 · 4d45b3e · 4d45b3e
2 parents 70deda3 + 0daf4b8
commit 4d45b3e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/modules/core/include/opencv2/core/cvstd.hpp b/modules/core/include/opencv2/core/cvstd.hpp
@@ -580,6 +580,8 @@ String::~String()
 inline
 String& String::operator=(const String& str)
 {
+    if (&str == this) return *this;
+
     deallocate();
     if (str.cstr_) CV_XADD(((int*)str.cstr_)-1, 1);
     cstr_ = str.cstr_;

diff --git a/modules/core/src/command_line_parser.cpp b/modules/core/src/command_line_parser.cpp
@@ -136,18 +136,13 @@ void CommandLineParser::getByIndex(int index, bool space_delete, int type, void*
 
 static bool cmp_params(const CommandLineParserParams & p1, const CommandLineParserParams & p2)
 {
+    if (p1.number < p2.number)
+        return true;
+
     if (p1.number > p2.number)
         return false;
 
-    if (p1.number == -1 && p2.number == -1)
-    {
-        if (p1.keys[0].compare(p2.keys[0]) > 0)
-        {
-            return false;
-        }
-    }
-
-    return true;
+    return p1.keys[0].compare(p2.keys[0]) < 0;
 }
 
 CommandLineParser::CommandLineParser(int argc, const char* const argv[], const String& keys)