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
pull/7039/head
Vadim Pisarevsky 9 years ago
parent b2698f24b0
commit d7ee62f03b
  1. 3
      modules/ml/src/data.cpp
  2. 2
      modules/ts/include/opencv2/ts/ts_perf.hpp

@ -747,9 +747,6 @@ public:
}
}
while(*stopstring != ']');
if( stopstring[1] != '\0' && stopstring[1] != ',')
CV_Error( CV_StsBadArg, errmsg );
}
}

@ -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) {}
};

Loading…
Cancel
Save