修复报错

今天无聊就看了看之前的代码，结果捉到个小虫。说起来也是当时马虎了——
sxjeru · Aug 5, 2023 · 02b646f · 02b646f
1 parent 7c307e8
commit 02b646f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/merge-1.cpp b/merge-1.cpp
@@ -91,8 +91,8 @@ void merge1() {
 				Mat imgO = imread(imgOpath);
 				Mat imgD = imread(imgDpath);
 				if (!imgO.data || !imgD.data) {
-					goto jump;		//判断图片是否存在
 					empty = true;
+					goto jump;		//判断图片是否存在
 				}
 				int x = stoi(para[j * 10 + 3]), y = stoi(para[j * 10 + 4]), w = stoi(para[j * 10 + 5]), h = stoi(para[j * 10 + 6]);	//string -> int
 				Mat roi(imgO(Rect(x, y, w, h)));
@@ -107,8 +107,8 @@ void merge1() {
 			else {
 				Mat imgO = imread(imgOpath);
 				if (!imgO.data) {
-					goto jump;		//判断图片是否存在
 					empty = true;
+					goto jump;		//判断图片是否存在
 				}
 				namedWindow("Viewer", WINDOW_NORMAL);
 				resizeWindow("Viewer", 1200, 675);

diff --git a/merge-2.cpp b/merge-2.cpp
@@ -101,8 +101,8 @@ void merge2() {
 				Mat imgO = imread(imgOpath, IMREAD_UNCHANGED);	//读取透明png
 				Mat imgD = imread(imgDpath, IMREAD_UNCHANGED);
 				if (!imgO.data || !imgD.data) {
-					goto jump;		//判断图片是否存在
 					empty = true;
+					goto jump;		//判断图片是否存在
 				}
 				if (imgD.channels() != 4) {
 					cvtColor(imgD, imgD, COLOR_BGR2BGRA);	//RGB -> RGBA
@@ -123,8 +123,8 @@ void merge2() {
 			else {
 				Mat imgO = imread(imgOpath, IMREAD_UNCHANGED);
 				if (!imgO.data) {
-					goto jump;		//判断图片是否存在
 					empty = true;
+					goto jump;		//判断图片是否存在
 				}
 				namedWindow("Viewer", WINDOW_NORMAL);
 				resizeWindow("Viewer", imgO.cols / 5.5, imgO.rows / 5.5);