CodeMirror/waifu2x
1
0
Fork 0
mirror of synced 2024-06-01 10:39:30 +12:00
Code Issues Releases Wiki Activity

Use iproc.crop instead of image.crop

Browse source
This commit is contained in:
nagadomi 2015-11-08 22:11:36 +09:00
parent 6e41796328
commit 7d67afb982
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/iproc.lua
View file

@ -6,7 +6,7 @@ local iproc = {}
function iproc.crop_mod4(src)
local w = src:size(3) % 4
local h = src:size(2) % 4
return image.crop(src, 0, 0, src:size(3) - w, src:size(2) - h)
return iproc.crop(src, 0, 0, src:size(3) - w, src:size(2) - h)
end
function iproc.crop(src, w1, h1, w2, h2)
local dest

8
lib/reconstruct.lua
View file

@ -94,7 +94,7 @@ function reconstruct.image_y(model, x, offset, block_size)
y[torch.lt(y, 0)] = 0
y[torch.gt(y, 1)] = 1
yuv[1]:copy(y)
local output = image.yuv2rgb(image.crop(yuv,
local output = image.yuv2rgb(iproc.crop(yuv,
pad_w1, pad_h1,
yuv:size(3) - pad_w2, yuv:size(2) - pad_h2))
output[torch.lt(output, 0)] = 0
@ -126,7 +126,7 @@ function reconstruct.scale_y(model, scale, x, offset, block_size)
y[torch.lt(y, 0)] = 0
y[torch.gt(y, 1)] = 1
yuv_jinc[1]:copy(y)
local output = image.yuv2rgb(image.crop(yuv_jinc,
local output = image.yuv2rgb(iproc.crop(yuv_jinc,
pad_w1, pad_h1,
yuv_jinc:size(3) - pad_w2, yuv_jinc:size(2) - pad_h2))
output[torch.lt(output, 0)] = 0
@ -151,7 +151,7 @@ function reconstruct.image_rgb(model, x, offset, block_size)
local pad_w2 = (w - offset) - x:size(3)
local input = iproc.padding(x, pad_w1, pad_w2, pad_h1, pad_h2)
local y = reconstruct_rgb(model, input, offset, block_size)
local output = image.crop(y,
local output = iproc.crop(y,
pad_w1, pad_h1,
y:size(3) - pad_w2, y:size(2) - pad_h2)
collectgarbage()
@ -178,7 +178,7 @@ function reconstruct.scale_rgb(model, scale, x, offset, block_size)
local pad_w2 = (w - offset) - x:size(3)
local input = iproc.padding(x, pad_w1, pad_w2, pad_h1, pad_h2)
local y = reconstruct_rgb(model, input, offset, block_size)
local output = image.crop(y,
local output = iproc.crop(y,
pad_w1, pad_h1,
y:size(3) - pad_w2, y:size(2) - pad_h2)
output[torch.lt(output, 0)] = 0