From 0bde00a88a210908bf82602fa79d2fd055fe1949 Mon Sep 17 00:00:00 2001
From: Leonid Beynenson <Leonid.Beynenson@itseez.com>
Date: Thu, 20 Sep 2012 17:58:44 +0400
Subject: [PATCH] Changed CommandLineParser to make it less verbose when it is
 unrequired.

---
 modules/core/src/command_line_parser.cpp | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/modules/core/src/command_line_parser.cpp b/modules/core/src/command_line_parser.cpp
index 3dbb1ac..8f998ab 100644
--- a/modules/core/src/command_line_parser.cpp
+++ b/modules/core/src/command_line_parser.cpp
@@ -72,14 +72,14 @@ static void from_str(const string& str, int type, void* dst)
     else if( type == Param::STRING )
         ss >> *(string*)dst;
     else
-        CV_Error(CV_StsBadArg, "unknown/unsupported parameter type");
+        throw cv::Exception(CV_StsBadArg, "unknown/unsupported parameter type", __func__, __FILE__, __LINE__);
     
     if (ss.fail())
     {
         string err_msg = "can not convert: [" + str +
         + "] to [" + get_type_name(type) + "]";
         
-        CV_Error(CV_StsBadArg, err_msg);
+        throw cv::Exception(CV_StsBadArg, err_msg, __func__, __FILE__, __LINE__);
     }
 }
 
@@ -417,14 +417,15 @@ vector<string> CommandLineParser::Impl::split_range_string(const string& _str, c
         {
             if (begin == true)
             {
-                CV_Error(CV_StsParseError,
+                throw cv::Exception(CV_StsParseError,
                          string("error in split_range_string(")
                          + str
                          + string(", ")
                          + string(1, fs)
                          + string(", ")
                          + string(1, ss)
-                         + string(")")
+                         + string(")"),
+                         __func__, __FILE__, __LINE__
                          );
             }
             begin = true;
@@ -436,14 +437,15 @@ vector<string> CommandLineParser::Impl::split_range_string(const string& _str, c
         {
             if (begin == false)
             {
-                CV_Error(CV_StsParseError,
+                throw cv::Exception(CV_StsParseError,
                          string("error in split_range_string(")
                          + str
                          + string(", ")
                          + string(1, fs)
                          + string(", ")
                          + string(1, ss)
-                         + string(")")
+                         + string(")"),
+                         __func__, __FILE__, __LINE__
                          );
             }
             begin = false;
@@ -459,15 +461,16 @@ vector<string> CommandLineParser::Impl::split_range_string(const string& _str, c
 
     if (begin == true)
     {
-        CV_Error(CV_StsParseError,
+        throw cv::Exception(CV_StsParseError,
                  string("error in split_range_string(")
                  + str
                  + string(", ")
                  + string(1, fs)
                  + string(", ")
                  + string(1, ss)
-                 + string(")")
-                 );
+                 + string(")"),
+                 __func__, __FILE__, __LINE__
+                );
     }
 
     return vec;
-- 
2.7.4