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

Waifu2x::WriteMat()をstaticに変更

Browse Source
This commit is contained in:
lltcggie 2016-02-04 14:14:40 +09:00
parent fcf5ce07f9
commit d348cc9f37
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/waifu2x.cpp
View File

@ -1300,7 +1300,7 @@ static void Waifu2x_stbi_write_func(void *context, void *data, int size)
osp->write((const char *)data, size); osp->write((const char *)data, size);
} }
Waifu2x::eWaifu2xError Waifu2x::WriteMat(const cv::Mat &im, const boost::filesystem::path &output_file) Waifu2x::eWaifu2xError Waifu2x::WriteMat(const cv::Mat &im, const boost::filesystem::path &output_file, const boost::optional<int> &output_quality)
{ {
const boost::filesystem::path ip(output_file); const boost::filesystem::path ip(output_file);
const std::string ext = ip.extension().string(); const std::string ext = ip.extension().string();
@ -1715,7 +1715,7 @@ Waifu2x::eWaifu2xError Waifu2x::waifu2x(const boost::filesystem::path &input_fil
cv::merge(planes, write_iamge); cv::merge(planes, write_iamge);
} }
ret = WriteMat(write_iamge, output_file); ret = WriteMat(write_iamge, output_file, output_quality);
if (ret != eWaifu2xError_OK) if (ret != eWaifu2xError_OK)
return ret; return ret;

2
common/waifu2x.h
View File

@ -126,7 +126,7 @@ private:
, const boost::filesystem::path &modelbin_path, const boost::filesystem::path &caffemodel_path, const std::string &process); , const boost::filesystem::path &modelbin_path, const boost::filesystem::path &caffemodel_path, const std::string &process);
eWaifu2xError SetParameter(caffe::NetParameter &param, const std::string &process) const; eWaifu2xError SetParameter(caffe::NetParameter &param, const std::string &process) const;
eWaifu2xError ReconstructImage(boost::shared_ptr<caffe::Net<float>> net, cv::Mat &im); eWaifu2xError ReconstructImage(boost::shared_ptr<caffe::Net<float>> net, cv::Mat &im);
eWaifu2xError WriteMat(const cv::Mat &im, const boost::filesystem::path &output_file); static eWaifu2xError WriteMat(const cv::Mat &im, const boost::filesystem::path &output_file, const boost::optional<int> &output_quality);
eWaifu2xError BeforeReconstructFloatMatProcess(const cv::Mat &in, cv::Mat &out, bool &convertBGRflag); eWaifu2xError BeforeReconstructFloatMatProcess(const cv::Mat &in, cv::Mat &out, bool &convertBGRflag);
eWaifu2xError ReconstructFloatMat(const bool isReconstructNoise, const bool isReconstructScale, const waifu2xCancelFunc cancel_func, const cv::Mat &in, cv::Mat &out); eWaifu2xError ReconstructFloatMat(const bool isReconstructNoise, const bool isReconstructScale, const waifu2xCancelFunc cancel_func, const cv::Mat &in, cv::Mat &out);