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

CUIで出力のwidthとheightを同時に指定できるようにした

Browse Source
This commit is contained in:
lltcggie 2017-03-20 22:09:59 +09:00
parent 1a2777b884
commit 73da394996
1 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
waifu2x-caffe/Source.cpp
View File

@ -108,6 +108,9 @@ int main(int argc, char** argv)
TCLAP::ValueArg<double> cmdScaleHeight("h", "scale_height", TCLAP::ValueArg<double> cmdScaleHeight("h", "scale_height",
"custom scale height", false, 0, "double", cmd); "custom scale height", false, 0, "double", cmd);
TCLAP::ValueArg<int> cmdScaleWidthHeight("", "scale_width_height",
"custom scale width and height", false, 0, "double", cmd);
TCLAP::ValueArg<std::string> cmdModelPath("", "model_dir", TCLAP::ValueArg<std::string> cmdModelPath("", "model_dir",
"path to custom model directory (don't append last / )", false, "path to custom model directory (don't append last / )", false,
"models/upconv_7_anime_style_art_rgb", "string", cmd); "models/upconv_7_anime_style_art_rgb", "string", cmd);
@ -174,18 +177,6 @@ int main(int argc, char** argv)
boost::optional<int> ScaleWidth; boost::optional<int> ScaleWidth;
boost::optional<int> ScaleHeight; boost::optional<int> ScaleHeight;
int valid_num = 0;
if (cmdScaleWidth.getValue() > 0)
valid_num++;
if (cmdScaleHeight.getValue() > 0)
valid_num++;
if (valid_num > 1)
{
printf("エラー: scale_widthとscale_heightは同時に指定できません\n");
return 1;
}
int crop_w = cmdCropSizeFile.getValue(); int crop_w = cmdCropSizeFile.getValue();
int crop_h = cmdCropSizeFile.getValue(); int crop_h = cmdCropSizeFile.getValue();
@ -197,9 +188,10 @@ int main(int argc, char** argv)
if (cmdScaleWidth.getValue() > 0) if (cmdScaleWidth.getValue() > 0)
ScaleWidth = cmdScaleWidth.getValue(); ScaleWidth = cmdScaleWidth.getValue();
else if (cmdScaleHeight.getValue() > 0) if (cmdScaleHeight.getValue() > 0)
ScaleHeight = cmdScaleHeight.getValue(); ScaleHeight = cmdScaleHeight.getValue();
else
if (cmdScaleWidth.getValue() == 0 && cmdScaleHeight.getValue() == 0)
ScaleRatio = cmdScaleRatio.getValue(); ScaleRatio = cmdScaleRatio.getValue();
const boost::filesystem::path input_path(boost::filesystem::absolute((cmdInputFile.getValue()))); const boost::filesystem::path input_path(boost::filesystem::absolute((cmdInputFile.getValue())));
@ -238,9 +230,11 @@ int main(int argc, char** argv)
{ {
if(ScaleRatio) if(ScaleRatio)
addstr += "(x" + std::to_string(*ScaleRatio) + ")"; addstr += "(x" + std::to_string(*ScaleRatio) + ")";
else if (ScaleWidth && ScaleHeight)
addstr += "(" + std::to_string(*ScaleWidth) + "x" + std::to_string(*ScaleHeight) + ")";
else if (ScaleWidth) else if (ScaleWidth)
addstr += "(width " + std::to_string(*ScaleWidth) + ")"; addstr += "(width " + std::to_string(*ScaleWidth) + ")";
else else if (ScaleHeight)
addstr += "(height " + std::to_string(*ScaleHeight) + ")"; addstr += "(height " + std::to_string(*ScaleHeight) + ")";
} }
@ -352,6 +346,8 @@ int main(int argc, char** argv)
{ {
if (ScaleRatio) if (ScaleRatio)
addstr += "(x" + std::to_string(*ScaleRatio) + ")"; addstr += "(x" + std::to_string(*ScaleRatio) + ")";
else if (ScaleWidth && ScaleHeight)
addstr += "(" + std::to_string(*ScaleWidth) + "x" + std::to_string(*ScaleHeight) + ")";
else if (ScaleWidth) else if (ScaleWidth)
addstr += "(width " + std::to_string(*ScaleWidth) + ")"; addstr += "(width " + std::to_string(*ScaleWidth) + ")";
else else