summaryrefslogtreecommitdiffstats
path: root/Wrappers
diff options
context:
space:
mode:
authoralgol <dkazanc@hotmail.com>2018-05-01 15:30:28 +0100
committeralgol <dkazanc@hotmail.com>2018-05-01 15:30:28 +0100
commitc4f50db4f5b318aad785ae577908d37fe05f53d2 (patch)
tree217fd021d20742d6c285711d69b9739b5a18be7a /Wrappers
parent42a10faa06bd56bff3f0f1804ddcdf1a3e1283cd (diff)
downloadregularization-c4f50db4f5b318aad785ae577908d37fe05f53d2.tar.gz
regularization-c4f50db4f5b318aad785ae577908d37fe05f53d2.tar.bz2
regularization-c4f50db4f5b318aad785ae577908d37fe05f53d2.tar.xz
regularization-c4f50db4f5b318aad785ae577908d37fe05f53d2.zip
some updates in demo
Diffstat (limited to 'Wrappers')
-rw-r--r--Wrappers/Python/demos/demo_cpu_inpainters.py2
-rw-r--r--Wrappers/Python/src/cpu_regularisers.pyx2
2 files changed, 2 insertions, 2 deletions
diff --git a/Wrappers/Python/demos/demo_cpu_inpainters.py b/Wrappers/Python/demos/demo_cpu_inpainters.py
index ab7ed2f..9a677c4 100644
--- a/Wrappers/Python/demos/demo_cpu_inpainters.py
+++ b/Wrappers/Python/demos/demo_cpu_inpainters.py
@@ -167,7 +167,7 @@ pars = {'algorithm' : NVM_INP, \
}
start_time = timeit.default_timer()
-nvm_inp = NVM_INP(pars['input'],
+(nvm_inp, mask_upd) = NVM_INP(pars['input'],
pars['maskData'],
pars['SW_increment'],
pars['number_of_iterations'])
diff --git a/Wrappers/Python/src/cpu_regularisers.pyx b/Wrappers/Python/src/cpu_regularisers.pyx
index 19dd707..52befd7 100644
--- a/Wrappers/Python/src/cpu_regularisers.pyx
+++ b/Wrappers/Python/src/cpu_regularisers.pyx
@@ -397,4 +397,4 @@ def NVM_INP_2D(np.ndarray[np.float32_t, ndim=2, mode="c"] inputData,
SW_increment, iterationsNumb,
dims[0], dims[1], 1)
- return outputData
+ return (outputData, maskData_upd)