CodeMirror/waifu2x
1
0
Fork 0
mirror of synced 2024-06-28 11:10:25 +12:00
Code Issues Releases Wiki Activity

Use clamp

Browse source
This commit is contained in:
nagadomi 2016-09-24 08:17:37 +09:00
parent f1a45b19c5
commit d7ab10581c
4 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/alpha_util.lua
View file

@ -40,8 +40,7 @@ function alpha_util.make_border(rgb, alpha, offset)
collectgarbage() collectgarbage()
end end
end end
rgb[torch.gt(rgb, 1.0)] = 1.0 rgb:clamp(0.0, 1.0)
rgb[torch.lt(rgb, 0.0)] = 0.0
return rgb return rgb
end end

3
lib/data_augmentation.lua
View file

@ -26,8 +26,7 @@ function data_augmentation.color_noise(src, p, factor)
pca_space[i]:mul(color_scale[i]) pca_space[i]:mul(color_scale[i])
end end
local dest = torch.mm(pca_space:t(), cv:t()):t():contiguous():resizeAs(src) local dest = torch.mm(pca_space:t(), cv:t()):t():contiguous():resizeAs(src)
dest[torch.lt(dest, 0.0)] = 0.0 dest:clamp(0.0, 1.0)
dest[torch.gt(dest, 1.0)] = 1.0
if conversion then if conversion then
dest = iproc.float2byte(dest) dest = iproc.float2byte(dest)

6
lib/image_loader.lua
View file

@ -22,8 +22,7 @@ function image_loader.encode_png(rgb, options)
else else
rgb = rgb:clone():add(clip_eps8) rgb = rgb:clone():add(clip_eps8)
end end
rgb[torch.lt(rgb, 0.0)] = 0.0 rgb:clamp(0.0, 1.0)
rgb[torch.gt(rgb, 1.0)] = 1.0
rgb = rgb:mul(255):floor():div(255) rgb = rgb:mul(255):floor():div(255)
else else
if options.inplace then if options.inplace then
@ -31,8 +30,7 @@ function image_loader.encode_png(rgb, options)
else else
rgb = rgb:clone():add(clip_eps16) rgb = rgb:clone():add(clip_eps16)
end end
rgb[torch.lt(rgb, 0.0)] = 0.0 rgb:clamp(0.0, 1.0)
rgb[torch.gt(rgb, 1.0)] = 1.0
rgb = rgb:mul(65535):floor():div(65535) rgb = rgb:mul(65535):floor():div(65535)
end end
local im local im

6
lib/iproc.lua
View file

@ -44,8 +44,7 @@ function iproc.float2byte(src)
if src:type() == "torch.FloatTensor" then if src:type() == "torch.FloatTensor" then
conversion = true conversion = true
dest = (src + clip_eps8):mul(255.0) dest = (src + clip_eps8):mul(255.0)
dest[torch.lt(dest, 0.0)] = 0 dest:clamp(0, 255.0)
dest[torch.gt(dest, 255.0)] = 255.0
dest = dest:byte() dest = dest:byte()
end end
return dest, conversion return dest, conversion
@ -119,8 +118,7 @@ function iproc.white_noise(src, std, rgb_weights, gamma)
local dest local dest
if gamma ~= 0 then if gamma ~= 0 then
dest = src:clone():pow(gamma):add(noise) dest = src:clone():pow(gamma):add(noise)
dest[torch.lt(dest, 0.0)] = 0.0 dest:clamp(0.0, 1.0)
dest[torch.gt(dest, 1.0)] = 1.0
dest:pow(1.0 / gamma) dest:pow(1.0 / gamma)
else else
dest = src + noise dest = src + noise