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

Yモデルで強制終了するバグ修正

Browse Source
This commit is contained in:
lltcggie 2016-07-03 21:23:02 +09:00
parent 04a9fe915d
commit 330a68f8a3
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
common/cNet.cpp
View File

@ -738,27 +738,19 @@ Waifu2x::eWaifu2xError cNet::ReconstructImage(const bool UseTTA, const int crop_
const float *fptr = outputBlockBuf + (output_block_plane_size * n); const float *fptr = outputBlockBuf + (output_block_plane_size * n);
const auto Line = outim.step1();
// 結果を出力画像にコピー // 結果を出力画像にコピー
if (outim.channels() == 1) if (outim.channels() == 1)
{ {
for (int i = 0; i < output_crop_block_height; i++) for (int i = 0; i < output_crop_block_height; i++)
memcpy(imptr + (h + i) * InputLine + w, fptr + (i + output_crop_h) * output_block_width + output_crop_w, output_crop_block_width * sizeof(float)); memcpy(imptr + (h + i) * Line + w, fptr + (i + output_crop_h) * output_block_width + output_crop_w, output_crop_block_width * sizeof(float));
} }
else else
{ {
const auto LinePixel = outim.step1() / outim.channels(); const auto LinePixel = Line / outim.channels();
const auto Channel = outim.channels(); const auto Channel = outim.channels();
//for (int i = 0; i < output_no_padding_block_height; i++)
//{
// for (int j = 0; j < output_no_padding_block_width; j++)
// {
// for (int ch = 0; ch < Channel; ch++)
// imptr[((h + i) * LinePixel + (w + j)) * Channel + ch]
// = fptr[(ch * output_block_height + i + output_crop_h) * output_block_width + j + output_padding];
// }
//}
for (int i = 0; i < output_crop_block_height; i++) for (int i = 0; i < output_crop_block_height; i++)
{ {
for (int j = 0; j < output_crop_block_width; j++) for (int j = 0; j < output_crop_block_width; j++)