ノイズ除去と拡大でUpCUnetではなくCUnetが使われていたのを修正 resolved #141

lltcggie · Jan 15, 2019 · 3f26c04 · 3f26c04 · Ledestin-Z · Aug 13, 2019
1 parent cc711eb
commit 3f26c04
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/common/waifu2x.cpp b/common/waifu2x.cpp
@@ -655,9 +655,12 @@ Waifu2x::eWaifu2xError Waifu2x::Init(const eWaifu2xModelType mode, const int noi
 		if (ret != Waifu2x::eWaifu2xError_OK)
 			return ret;
 
-		mHasNoiseScaleOnly = info.has_noise_scale && !info.has_noise_only;
+		mHasNoiseScaleOnly = info.has_noise_scale;
 		mInputPlane = info.channels;
 
+		if (mode == eWaifu2xModelTypeNoise && info.has_noise_only) // ノイズ除去だけかつノイズ除去モデルが存在するのであればノイズ除去スケールモデルは使わないようにする
+			mHasNoiseScaleOnly = false;
+
 		if (mode == eWaifu2xModelTypeNoise || mode == eWaifu2xModelTypeNoiseScale || mode == eWaifu2xModelTypeAutoScale)
 		{
 			std::string base_name;