Mirror/waifu2x-caffe
1
0
Fork 0
mirror of https://github.com/lltcggie/waifu2x-caffe.git synced 2025-06-26 13:42:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

ビルドエラー、リンクエラーになる箇所を修正

Browse Source
This commit is contained in:
lltcggie 2018-10-17 03:55:18 +09:00
parent 5fcbf4d657
commit ccaaf677f7
3 changed files with 25 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
common/waifu2x.cpp
View File

@ -41,12 +41,14 @@
#pragma comment(lib, "opencv_core" CV_VERSION_STR CV_EXT_STR) #pragma comment(lib, "opencv_core" CV_VERSION_STR CV_EXT_STR)
#pragma comment(lib, "opencv_imgcodecs" CV_VERSION_STR CV_EXT_STR) #pragma comment(lib, "opencv_imgcodecs" CV_VERSION_STR CV_EXT_STR)
#pragma comment(lib, "opencv_imgproc" CV_VERSION_STR CV_EXT_STR) #pragma comment(lib, "opencv_imgproc" CV_VERSION_STR CV_EXT_STR)
//#pragma comment(lib, "IlmImf" CV_EXT_STR) #pragma comment(lib, "IlmImf" CV_EXT_STR)
//#pragma comment(lib, "libjasper" CV_EXT_STR) #pragma comment(lib, "ippicvmt.lib")
//#pragma comment(lib, "libjpeg" CV_EXT_STR) #pragma comment(lib, "libjasper" CV_EXT_STR)
//#pragma comment(lib, "libpng" CV_EXT_STR) #pragma comment(lib, "libjpeg-turbo" CV_EXT_STR)
//#pragma comment(lib, "libtiff" CV_EXT_STR) #pragma comment(lib, "libpng" CV_EXT_STR)
//#pragma comment(lib, "libwebp" CV_EXT_STR) #pragma comment(lib, "libtiff" CV_EXT_STR)
#pragma comment(lib, "libwebp" CV_EXT_STR)
#pragma comment(lib, "zlib" CV_EXT_STR)
#pragma comment(lib, "libopenblas.dll.a") #pragma comment(lib, "libopenblas.dll.a")
#pragma comment(lib, "cudart.lib") #pragma comment(lib, "cudart.lib")
@ -56,32 +58,27 @@
#ifdef _DEBUG #ifdef _DEBUG
#pragma comment(lib, "caffe-d.lib") #pragma comment(lib, "caffe-d.lib")
#pragma comment(lib, "proto-d.lib") #pragma comment(lib, "caffeproto-d.lib")
#pragma comment(lib, "libboost_system-vc120-mt-gd-1_59.lib") #pragma comment(lib, "libprotobufd.lib")
#pragma comment(lib, "libboost_thread-vc120-mt-gd-1_59.lib")
#pragma comment(lib, "libboost_filesystem-vc120-mt-gd-1_59.lib")
#pragma comment(lib, "glogd.lib") #pragma comment(lib, "glogd.lib")
#pragma comment(lib, "gflagsd.lib") #pragma comment(lib, "gflagsd.lib")
#pragma comment(lib, "libprotobufd.lib") #pragma comment(lib, "libboost_system-vc140-mt-gd-1_61.lib")
#pragma comment(lib, "libhdf5_hl_D.lib") #pragma comment(lib, "boost_thread-vc140-mt-gd-1_61.lib")
#pragma comment(lib, "libhdf5_D.lib") #pragma comment(lib, "boost_filesystem-vc140-mt-gd-1_61.lib")
#pragma comment(lib, "zlibstaticd.lib") #pragma comment(lib, "boost_iostreams-vc140-mt-gd-1_61.lib")
//#pragma comment(lib, "zlibstaticd.lib")
#pragma comment(lib, "libboost_iostreams-vc120-mt-gd-1_59.lib")
#else #else
#pragma comment(lib, "caffe.lib") #pragma comment(lib, "caffe.lib")
#pragma comment(lib, "proto.lib") #pragma comment(lib, "caffeproto.lib")
#pragma comment(lib, "libboost_system-vc120-mt-1_59.lib") #pragma comment(lib, "libprotobuf.lib")
#pragma comment(lib, "libboost_thread-vc120-mt-1_59.lib")
#pragma comment(lib, "libboost_filesystem-vc120-mt-1_59.lib")
#pragma comment(lib, "glog.lib") #pragma comment(lib, "glog.lib")
#pragma comment(lib, "gflags.lib") #pragma comment(lib, "gflags.lib")
#pragma comment(lib, "libprotobuf.lib") #pragma comment(lib, "libboost_system-vc140-mt-1_61.lib")
#pragma comment(lib, "libhdf5_hl.lib") #pragma comment(lib, "boost_thread-vc140-mt-1_61.lib")
#pragma comment(lib, "libhdf5.lib") #pragma comment(lib, "boost_filesystem-vc140-mt-1_61.lib")
#pragma comment(lib, "zlibstatic.lib") #pragma comment(lib, "boost_iostreams-vc140-mt-1_61.lib")
#pragma comment(lib, "libboost_iostreams-vc120-mt-1_59.lib")
#endif #endif
#endif #endif

3
waifu2x-caffe-gui/LangStringList.h
View File

@ -94,7 +94,8 @@ private:
if (LangList.size() > 0) if (LangList.size() > 0)
return LangList[0]; return LangList[0];
return stLangSetting(); static stLangSetting empty;
return empty;
} }
void ReadLangFile(const stLangSetting &lang, std::unordered_map<std::wstring, std::wstring> &langStringMap) const void ReadLangFile(const stLangSetting &lang, std::unordered_map<std::wstring, std::wstring> &langStringMap) const

2
waifu2x-caffe-gui/MainDialog.cpp
View File

@ -839,7 +839,7 @@ void DialogEvent::ProcessWaifu2x()
ret = w.waifu2x(p.first, p.second, ScaleRatio, ScaleWidth, ScaleHeight, [this]() ret = w.waifu2x(p.first, p.second, ScaleRatio, ScaleWidth, ScaleHeight, [this]()
{ {
return cancelFlag; return cancelFlag.load();
}, crop_size, crop_size, output_quality, output_depth, use_tta, batch_size); }, crop_size, crop_size, output_quality, output_depth, use_tta, batch_size);
num++; num++;