From 4e5c3ed6986dfad85a41c425d3efbac59db5facf Mon Sep 17 00:00:00 2001
From: lltcggie <lltcggie@gmail.com>
Date: Sun, 6 Dec 2015 17:17:16 +0900
Subject: [PATCH] =?UTF-8?q?=E5=BC=95=E6=95=B0=E3=81=8C=E3=81=86=E3=81=BE?=
 =?UTF-8?q?=E3=81=8F=E4=BD=BF=E3=82=8F=E3=82=8C=E3=81=A6=E3=81=84=E3=81=AA?=
 =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=9F=E3=81=AE=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/waifu2x.cpp | 10 +++++-----
 common/waifu2x.h   |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/common/waifu2x.cpp b/common/waifu2x.cpp
index b6c353b..cbc0769 100644
--- a/common/waifu2x.cpp
+++ b/common/waifu2x.cpp
@@ -470,7 +470,7 @@ Waifu2x::eWaifu2xError Waifu2x::ConstractNet(boost::shared_ptr<caffe::Net<float>
 	caffe::NetParameter param;
 	if (isModelExist && isModelBinExist && caffe::ReadProtoFromBinaryFile(modelbin_path, &param))
 	{
-		const auto ret = SetParameter(param);
+		const auto ret = SetParameter(param, process);
 		if (ret != eWaifu2xError_OK)
 			return ret;
 
@@ -481,7 +481,7 @@ Waifu2x::eWaifu2xError Waifu2x::ConstractNet(boost::shared_ptr<caffe::Net<float>
 	}
 	else
 	{
-		const auto ret = LoadParameterFromJson(net, model_path, param_path);
+		const auto ret = LoadParameterFromJson(net, model_path, param_path, process);
 		if (ret != eWaifu2xError_OK)
 			return ret;
 	}
@@ -489,7 +489,7 @@ Waifu2x::eWaifu2xError Waifu2x::ConstractNet(boost::shared_ptr<caffe::Net<float>
 	return eWaifu2xError_OK;
 }
 
-Waifu2x::eWaifu2xError Waifu2x::SetParameter(caffe::NetParameter &param) const
+Waifu2x::eWaifu2xError Waifu2x::SetParameter(caffe::NetParameter &param, const std::string &process) const
 {
 	param.mutable_state()->set_phase(caffe::TEST);
 
@@ -527,7 +527,7 @@ Waifu2x::eWaifu2xError Waifu2x::SetParameter(caffe::NetParameter &param) const
 	return eWaifu2xError_OK;
 }
 
-Waifu2x::eWaifu2xError Waifu2x::LoadParameterFromJson(boost::shared_ptr<caffe::Net<float>> &net, const std::string &model_path, const std::string &param_path)
+Waifu2x::eWaifu2xError Waifu2x::LoadParameterFromJson(boost::shared_ptr<caffe::Net<float>> &net, const std::string &model_path, const std::string &param_path, const std::string &process)
 {
 	const std::string caffemodel_path = param_path + ".caffemodel";
 	const std::string modelbin_path = model_path + ".protobin";
@@ -538,7 +538,7 @@ Waifu2x::eWaifu2xError Waifu2x::LoadParameterFromJson(boost::shared_ptr<caffe::N
 
 	caffe::WriteProtoToBinaryFile(param, modelbin_path);
 
-	const auto ret = SetParameter(param);
+	const auto ret = SetParameter(param, process);
 	if (ret != eWaifu2xError_OK)
 		return ret;
 
diff --git a/common/waifu2x.h b/common/waifu2x.h
index e6ac4fc..cf83fb1 100644
--- a/common/waifu2x.h
+++ b/common/waifu2x.h
@@ -103,8 +103,8 @@ private:
 	eWaifu2xError Zoom2xAndPaddingImage(const cv::Mat &input, cv::Mat &output, cv::Size_<int> &zoom_size);
 	eWaifu2xError CreateZoomColorImage(const cv::Mat &float_image, const cv::Size_<int> &zoom_size, std::vector<cv::Mat> &cubic_planes);
 	eWaifu2xError ConstractNet(boost::shared_ptr<caffe::Net<float>> &net, const std::string &model_path, const std::string &param_path, const std::string &process);
-	eWaifu2xError LoadParameterFromJson(boost::shared_ptr<caffe::Net<float>> &net, const std::string &model_path, const std::string &param_path);
-	eWaifu2xError SetParameter(caffe::NetParameter &param) const;
+	eWaifu2xError LoadParameterFromJson(boost::shared_ptr<caffe::Net<float>> &net, const std::string &model_path, const std::string &param_path, const std::string &process);
+	eWaifu2xError SetParameter(caffe::NetParameter &param, const std::string &process) const;
 	eWaifu2xError ReconstructImage(boost::shared_ptr<caffe::Net<float>> net, cv::Mat &im);
 	eWaifu2xError WriteMat(const cv::Mat &im, const std::string &output_file);