Merge remote-tracking branch 'GitHub/PROGrand/patch-1'

abreheret · abreheret · commit 7f2148cd1bda · 2018-08-13T11:44:16.000+02:00
diff --git a/src/utils.cpp b/src/utils.cpp
@@ -161,11 +161,11 @@ QImage removeBorder(const QImage & mask_id, const Id2Labels & labels, cv::Size w
 bool isFullZero(const QImage& image) {
 	for (int y = 0; y < image.height(); y++) {
 		const uchar * line = image.scanLine(y);
-		for (int x = 0; x < image.width(); x++) {
+		for (int x = 0; x < image.bytesPerLine(); x++) {
 			if (line[x] > 0)
 				return false;
 		}
 	}
 	return true;
 }
-//-------------------------------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------------------

Original file line number	Diff line number	Diff line change
`@@ -161,11 +161,11 @@ QImage removeBorder(const QImage & mask_id, const Id2Labels & labels, cv::Size w`
`161`	`161`	`bool isFullZero(const QImage& image) {`
`162`	`162`	`for (int y = 0; y < image.height(); y++) {`
`163`	`163`	`const uchar * line = image.scanLine(y);`
`164`		`- for (int x = 0; x < image.width(); x++) {`
	`164`	`+ for (int x = 0; x < image.bytesPerLine(); x++) {`
`165`	`165`	`if (line[x] > 0)`
`166`	`166`	`return false;`
`167`	`167`	`}`
`168`	`168`	`}`
`169`	`169`	`return true;`
`170`	`170`	`}`
`171`		`-//-------------------------------------------------------------------------------------------------------------`
	`171`	`+//-------------------------------------------------------------------------------------------------------------`