Fix segmentation fault in cv::Mat::forEach

jexner · jexner · commit b45e784bebe3 · 2017-03-23T18:48:59.000+01:00
This issue concerns only matrices with more dimensions than columns. See opencv#8447
diff --git a/modules/core/include/opencv2/core/utility.hpp b/modules/core/include/opencv2/core/utility.hpp
@@ -507,7 +507,7 @@ void Mat::forEach_impl(const Functor& operation) {
                     this->rowCall2(row, COLS);
                 }
             } else {
-                std::vector<int> idx(COLS); /// idx is modified in this->rowCall
+                std::vector<int> idx(DIMS); /// idx is modified in this->rowCall
                 idx[DIMS - 2] = range.start - 1;
 
                 for (int line_num = range.start; line_num < range.end; ++line_num) {

Original file line number	Diff line number	Diff line change
`@@ -507,7 +507,7 @@ void Mat::forEach_impl(const Functor& operation) {`
`507`	`507`	`this->rowCall2(row, COLS);`
`508`	`508`	`}`
`509`	`509`	`} else {`
`510`		`- std::vector<int> idx(COLS); /// idx is modified in this->rowCall`
	`510`	`+ std::vector<int> idx(DIMS); /// idx is modified in this->rowCall`
`511`	`511`	`idx[DIMS - 2] = range.start - 1;`
`512`	`512`
`513`	`513`	`for (int line_num = range.start; line_num < range.end; ++line_num) {`