Merge pull request opencv#9054 from zhmu:upstream

alalek · alalek · commit 7621cc19dccc · 2017-07-03T16:04:11.000Z
diff --git a/modules/ml/src/data.cpp b/modules/ml/src/data.cpp
@@ -403,7 +403,7 @@ class TrainDataImpl : public TrainData
             Mat(tempCatMap).copyTo(catMap);
         }
 
-        if( varType.at<uchar>(ninputvars) == VAR_CATEGORICAL )
+        if( noutputvars > 0 && varType.at<uchar>(ninputvars) == VAR_CATEGORICAL )
         {
             preprocessCategorical(responses, &normCatResponses, labels, &counters, sortbuf);
             Mat(labels).copyTo(classLabels);

Original file line number	Diff line number	Diff line change
`@@ -403,7 +403,7 @@ class TrainDataImpl : public TrainData`
`403`	`403`	`Mat(tempCatMap).copyTo(catMap);`
`404`	`404`	`}`
`405`	`405`
`406`		`- if( varType.at<uchar>(ninputvars) == VAR_CATEGORICAL )`
	`406`	`+ if( noutputvars > 0 && varType.at<uchar>(ninputvars) == VAR_CATEGORICAL )`
`407`	`407`	`{`
`408`	`408`	`preprocessCategorical(responses, &normCatResponses, labels, &counters, sortbuf);`
`409`	`409`	`Mat(labels).copyTo(classLabels);`