From d7ee62f03bff1ccc5ff4bdf6014056f6936adc71 Mon Sep 17 00:00:00 2001 From: Vadim Pisarevsky Date: Thu, 4 Aug 2016 12:52:10 +0300 Subject: [PATCH] 1. fix warning from Xcode 7.x 2. fixed parsing of "cat[range_spec]ord[range_spec]" type specification string when using ml::TrainData::loadFromCSV(). Thanks to A. Kaehler for reporting it --- modules/ml/src/data.cpp | 3 --- modules/ts/include/opencv2/ts/ts_perf.hpp | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/modules/ml/src/data.cpp b/modules/ml/src/data.cpp index ad652568c7..465163c927 100644 --- a/modules/ml/src/data.cpp +++ b/modules/ml/src/data.cpp @@ -747,9 +747,6 @@ public: } } while(*stopstring != ']'); - - if( stopstring[1] != '\0' && stopstring[1] != ',') - CV_Error( CV_StsBadArg, errmsg ); } } diff --git a/modules/ts/include/opencv2/ts/ts_perf.hpp b/modules/ts/include/opencv2/ts/ts_perf.hpp index c8bddf3fcd..09998998b5 100644 --- a/modules/ts/include/opencv2/ts/ts_perf.hpp +++ b/modules/ts/include/opencv2/ts/ts_perf.hpp @@ -371,8 +371,8 @@ public: class PerfSkipTestException: public cv::Exception { - int dummy; // workaround for MacOSX Xcode 7.3 bug (don't make class "empty") public: + int dummy; // workaround for MacOSX Xcode 7.3 bug (don't make class "empty") PerfSkipTestException() : dummy(0) {} };