From 57fbdf42253c126eb1e9e4af4b610bc39b42c90d Mon Sep 17 00:00:00 2001
From: lltcggie <lltcggie@gmail.com>
Date: Wed, 3 Jun 2015 03:52:29 +0900
Subject: [PATCH] =?UTF-8?q?GUI=E3=81=A7crop=5Fsize=E3=82=92=E6=8C=87?=
 =?UTF-8?q?=E5=AE=9A=E5=87=BA=E6=9D=A5=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?=
 =?UTF-8?q?=E3=81=97=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 waifu2x-caffe-gui/Resource.rc | Bin 8626 -> 8870 bytes
 waifu2x-caffe-gui/Source.cpp  |  19 ++++++++++++++++++-
 waifu2x-caffe-gui/resource.h  | Bin 2726 -> 2910 bytes
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/waifu2x-caffe-gui/Resource.rc b/waifu2x-caffe-gui/Resource.rc
index fed00ccee2ce8639e496e36b27e03708ce35ab70..ef3eb63ad4f924fd61a7ffaab965b835d04cdfd6 100644
GIT binary patch
delta 274
zcmdnwyv%ij8waZ?gCT?AW^WEdCT4R6v(5Ef%#0w$<a(~q&9}JcaPXQim@=3!=m3=&
zFj!9R6_eaNN2H38*^<G0vZPohH;_h>tmlR)w}2>~Y#<)RZwgdl%3uUm2NItto+@Yr
zG){-X3~ICmgTdsFB8HP4Bs{<-cS}s4tS6+!#THZ)wAEmV!7hWzexg$1#z0qq46_82
zKxYEkMnD7mMeNm`8G;!683GvM8G;!+8KM|mfpQ@AmOvWhc91?Zprb#EXiomd#<$r(
T@&O~WDbQX=Y5mPk(gkb)1FAUo

delta 177
zcmZ4Hy2*Ki8waZigE52YW^WEdCT0T$gU$6^%#0w$<a(~q&9}JcaPS&4m@`-~=r9<9
z;N)I0$<1>_su-D#fE-D&Ol~6v10>0MZkTdQ24j%o$p+$4{6;_(rVJnwWQf`1nc}H}
thG0X@7)-#T1`H;XKZ+Pmc98G@o7^oieY2R<J4Qy6$^9~ho6Tej*Z@0(CUO7(

diff --git a/waifu2x-caffe-gui/Source.cpp b/waifu2x-caffe-gui/Source.cpp
index 9118efb..e3660e9 100644
--- a/waifu2x-caffe-gui/Source.cpp
+++ b/waifu2x-caffe-gui/Source.cpp
@@ -152,7 +152,7 @@ private:
 				scale_ratio = 2.0;
 				ret = false;
 
-				MessageBox(dh, TEXT("拡大率は数字である必要があります"), TEXT("エラー"), MB_OK | MB_ICONERROR);
+				MessageBox(dh, TEXT("拡大率は0.0より大きい正数である必要があります"), TEXT("エラー"), MB_OK | MB_ICONERROR);
 			}
 		}
 
@@ -179,6 +179,22 @@ private:
 			inputFileExt = buf;
 		}
 
+		{
+			char buf[AR_PATH_MAX] = "";
+			GetWindowTextA(GetDlgItem(dh, IDC_EDIT_CROP_SIZE), buf, _countof(buf));
+			buf[_countof(buf) - 1] = '\0';
+
+			char *ptr = nullptr;
+			crop_size = strtol (buf, &ptr, 10);
+			if (!ptr || *ptr != '\0')
+			{
+				crop_size = 128;
+				ret = false;
+
+				MessageBox(dh, TEXT("分割サイズは0より大きい整数である必要があります"), TEXT("エラー"), MB_OK | MB_ICONERROR);
+			}
+		}
+
 		return ret;
 	}
 
@@ -559,6 +575,7 @@ public:
 		SetWindowTextA(GetDlgItem(hWnd, IDC_EDIT_SCALE_RATIO), text);
 		SetWindowTextA(GetDlgItem(hWnd, IDC_EDIT_OUT_EXT), outputExt.c_str());
 		SetWindowTextA(GetDlgItem(hWnd, IDC_EDIT_INPUT_EXT_LIST), inputFileExt.c_str());
+		SetWindowTextA(GetDlgItem(hWnd, IDC_EDIT_CROP_SIZE), std::to_string(crop_size).c_str());
 	}
 
 	void Cancel(HWND hWnd, WPARAM wParam, LPARAM lParam, LPVOID lpData)
diff --git a/waifu2x-caffe-gui/resource.h b/waifu2x-caffe-gui/resource.h
index eff5780ccdd9a9e1cf18daa9c617c9d130a1cf01..7df8cd7e0943cf21dad0153762a7695b69818070 100644
GIT binary patch
delta 74
zcmV-Q0JZ<772X!GLI{)Q2Ot46ld%UWlW+nGlOzfllYRjb5kmk{08ao=0AB!807(E^
g07a9b0U-l205G#X2<ZU<F_R$z6_elz6q8U2R{UiXN&o-=

delta 24
gcmca7woG(`6UXLX98VZ0&)^W7{D4zrG6#1U0Dn0N82|tP