From 3da98bcfc3b7a9a5ff4cac78598fc633aa36ad05 Mon Sep 17 00:00:00 2001 From: lltcggie Date: Sun, 20 Mar 2016 03:09:10 +0900 Subject: [PATCH] =?UTF-8?q?=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB=E3=82=92?= =?UTF-8?q?=E8=A4=87=E6=95=B0=E5=85=A5=E5=8A=9B=E3=81=99=E3=82=8B=E3=81=A8?= =?UTF-8?q?=E5=87=BA=E5=8A=9B=E6=8B=A1=E5=BC=B5=E5=AD=90=E3=81=8C=E9=81=A9?= =?UTF-8?q?=E7=94=A8=E3=81=95=E3=82=8C=E3=81=A6=E3=81=84=E3=81=AA=E3=81=8B?= =?UTF-8?q?=E3=81=A3=E3=81=9F=E3=83=90=E3=82=B0=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- waifu2x-caffe-gui/Source.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/waifu2x-caffe-gui/Source.cpp b/waifu2x-caffe-gui/Source.cpp index 13beec2..00deb9c 100644 --- a/waifu2x-caffe-gui/Source.cpp +++ b/waifu2x-caffe-gui/Source.cpp @@ -619,7 +619,7 @@ private: const boost::filesystem::path input_path(boost::filesystem::absolute(input)); const boost::filesystem::path output_path(boost::filesystem::absolute(output_str)); - const auto filenameFunc = [&output_path](const tstring &path) -> std::wstring + const auto outilenameFunc = [&output_path](const tstring &path) -> std::wstring { const auto out = output_path / path; return out.wstring(); @@ -691,8 +691,10 @@ private: } } else - file_paths.emplace_back(input_path.wstring(), filenameFunc(input_path.filename().wstring())); - + { + const auto out = output_path / (input_path.stem().wstring() + outputExt); + file_paths.emplace_back(input_path.wstring(), out.wstring()); + } }; {