1
0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 15:23:05 +04:00

Merge remote-tracking branch 'upstream/3.4' into merge-3.4

This commit is contained in:
Alexander Alekhin
2018-07-09 19:31:45 +03:00
148 changed files with 2773 additions and 2038 deletions
+2 -2
View File
@@ -1579,7 +1579,7 @@ public:
return;
AutoBuffer<double> vbuf(var_count);
double* v = vbuf;
double* v = vbuf.data();
Mat new_sv(df_count, var_count, CV_32F);
vector<DecisionFunc> new_df;
@@ -1914,7 +1914,7 @@ public:
int class_count = !svm->class_labels.empty() ? (int)svm->class_labels.total() : svmType == ONE_CLASS ? 1 : 0;
AutoBuffer<float> _buffer(sv_total + (class_count+1)*2);
float* buffer = _buffer;
float* buffer = _buffer.data();
int i, j, dfi, k, si;