From dde22d8e73b3f147fe2744912b8f25f3e89013f4 Mon Sep 17 00:00:00 2001 From: lltcggie Date: Tue, 2 Jun 2015 22:37:29 +0900 Subject: [PATCH] =?UTF-8?q?GPU=E3=81=8B=E3=82=89CPU=E3=81=B8=E3=83=A1?= =?UTF-8?q?=E3=83=A2=E3=83=AA=E8=BB=A2=E9=80=81=E3=81=99=E3=82=8B=E3=81=A8?= =?UTF-8?q?=E3=81=8D=E3=81=AB=E4=B8=80=E6=8B=AC=E3=81=A7=E8=BB=A2=E9=80=81?= =?UTF-8?q?=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/waifu2x.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/common/waifu2x.cpp b/common/waifu2x.cpp index e6916d8..05d5f45 100644 --- a/common/waifu2x.cpp +++ b/common/waifu2x.cpp @@ -391,8 +391,14 @@ eWaifu2xError ReconstructImage(boost::shared_ptr> net, cv::Mat ptr = b->gpu_data(); // 結果を入力画像にコピー(後に処理する部分とここで上書きする部分は被らないから、入力画像を上書きしても大丈夫) - for (int i = 0; i < block_size; i++) - caffe::caffe_copy(block_size, ptr + i * block_size, imptr + (h + i) * Line + w); + + caffe::caffe_copy(block_size * block_size, ptr, block.data()); + + { + float *fptr = block.data(); + for (int i = 0; i < block_size; i++) + memcpy(imptr + (h + i) * Line + w, fptr + i * block_size, block_size * sizeof(float)); + } } } }