summaryrefslogtreecommitdiffstats
path: root/Wrappers/Python/src
diff options
context:
space:
mode:
authorDaniil Kazantsev <dkazanc@hotmail.com>2018-05-02 15:47:19 +0100
committerDaniil Kazantsev <dkazanc@hotmail.com>2018-05-02 15:47:19 +0100
commit37ae2bdb0a15298f312e9f6545a465d4d20c57f1 (patch)
treeab57969c171b7bbb6f0c4cb5e7b8d7feb71a0721 /Wrappers/Python/src
parent14edd18d07c871c0a355d70e68350a899014dbc7 (diff)
downloadregularization-37ae2bdb0a15298f312e9f6545a465d4d20c57f1.tar.gz
regularization-37ae2bdb0a15298f312e9f6545a465d4d20c57f1.tar.bz2
regularization-37ae2bdb0a15298f312e9f6545a465d4d20c57f1.tar.xz
regularization-37ae2bdb0a15298f312e9f6545a465d4d20c57f1.zip
bugs of NVM are fixed
Diffstat (limited to 'Wrappers/Python/src')
-rw-r--r--Wrappers/Python/src/cpu_regularisers.pyx4
1 files changed, 2 insertions, 2 deletions
diff --git a/Wrappers/Python/src/cpu_regularisers.pyx b/Wrappers/Python/src/cpu_regularisers.pyx
index 732b4cb..c934f1d 100644
--- a/Wrappers/Python/src/cpu_regularisers.pyx
+++ b/Wrappers/Python/src/cpu_regularisers.pyx
@@ -26,7 +26,7 @@ cdef extern float TNV_CPU_main(float *Input, float *u, float lambdaPar, int maxI
cdef extern float dTV_FGP_CPU_main(float *Input, float *InputRef, float *Output, float lambdaPar, int iterationsNumb, float epsil, float eta, int methodTV, int nonneg, int printM, int dimX, int dimY, int dimZ);
cdef extern float Diffusion_Inpaint_CPU_main(float *Input, unsigned char *Mask, float *Output, float lambdaPar, float sigmaPar, int iterationsNumb, float tau, int penaltytype, int dimX, int dimY, int dimZ);
-cdef extern float NonlocalMarching_Inpaint_main(float *Input, unsigned char *M, float *Output, unsigned char *M_upd, int SW_increment, int iterationsNumb, int dimX, int dimY, int dimZ);
+cdef extern float NonlocalMarching_Inpaint_main(float *Input, unsigned char *M, float *Output, unsigned char *M_upd, int SW_increment, int iterationsNumb, int trigger, int dimX, int dimY, int dimZ);
#****************************************************************#
#********************** Total-variation ROF *********************#
#****************************************************************#
@@ -396,6 +396,6 @@ def NVM_INP_2D(np.ndarray[np.float32_t, ndim=2, mode="c"] inputData,
# Run Inpaiting by Nonlocal vertical marching method for 2D data
NonlocalMarching_Inpaint_main(&inputData[0,0], &maskData[0,0], &outputData[0,0],
&maskData_upd[0,0],
- SW_increment, iterationsNumb, dims[1], dims[0], 1)
+ SW_increment, iterationsNumb, 1, dims[1], dims[0], 1)
return (outputData, maskData_upd)