From 0ffd4621c33c425250f1cc558d0efc06036e997b Mon Sep 17 00:00:00 2001 From: Elian Dib <elian.dib@inria.fr> Date: Wed, 24 Apr 2019 18:36:01 +0200 Subject: [PATCH] Changed padding accordingly --- pad.m | 20 +++++++++++--------- unpad.m | 5 +++-- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/pad.m b/pad.m index 3a9118a..e8aad25 100644 --- a/pad.m +++ b/pad.m @@ -2,17 +2,19 @@ function [LFRef,LFSizePad] = pad(LFRef,blockSize) %PAD Pad lightfield data % [LFRef,LFSizePad] = pad(LFRef,blockSize) -LFSize = size(LFRef); -imgRes = LFSize(1:2); -imgSize = LFSize(3:end); +LFSize = size(LFRef); +LFSize(3) = 0; +imgSize = LFSize(1:3); +imgRes = LFSize(4:end); -imgSizePad = ceil(imgSize/blockSize)*blockSize; -imgSizePad(3:end)=imgSize(3:end); -LFSizePad = [imgRes,imgSizePad]; -padSize = LFSizePad-LFSize; -padSizePre = floor(padSize/2); +imgSizePad = ceil(imgSize./blockSize).*blockSize; + +LFSizePad = [imgSizePad,imgRes]; + +padSize = LFSizePad-LFSize; +padSizePre = floor(padSize/2); padSizePost = padSize - padSizePre; -LFRef = padarray(LFRef,padSizePre,'replicate','pre'); +LFRef = padarray(LFRef,padSizePre ,'replicate','pre' ); LFRef = padarray(LFRef,padSizePost,'replicate','post'); end \ No newline at end of file diff --git a/unpad.m b/unpad.m index c9b6e56..b62c825 100644 --- a/unpad.m +++ b/unpad.m @@ -3,8 +3,9 @@ function LFRef = unpad(LFRef,LFSize) % LFRef = unpad(LFRef,LFSize) LFSizePad = size(LFRef); -padSize = LFSizePad-LFSize; -padSizePre = floor(padSize/2); + +padSize = LFSizePad-LFSize; +padSizePre = floor(padSize/2); padSizePost = padSize - padSizePre; gv = arrayfun(@(lfsizepad,pre,post) (1+pre):(lfsizepad-post),... -- GitLab