diff options
| author | Daniil Kazantsev <dkazanc@hotmail.com> | 2018-05-02 15:47:19 +0100 |
|---|---|---|
| committer | Daniil Kazantsev <dkazanc@hotmail.com> | 2018-05-02 15:47:19 +0100 |
| commit | 37ae2bdb0a15298f312e9f6545a465d4d20c57f1 (patch) | |
| tree | ab57969c171b7bbb6f0c4cb5e7b8d7feb71a0721 /Wrappers | |
| parent | 14edd18d07c871c0a355d70e68350a899014dbc7 (diff) | |
| download | regularization-37ae2bdb0a15298f312e9f6545a465d4d20c57f1.tar.gz regularization-37ae2bdb0a15298f312e9f6545a465d4d20c57f1.tar.bz2 regularization-37ae2bdb0a15298f312e9f6545a465d4d20c57f1.tar.xz regularization-37ae2bdb0a15298f312e9f6545a465d4d20c57f1.zip | |
bugs of NVM are fixed
Diffstat (limited to 'Wrappers')
| -rw-r--r-- | Wrappers/Matlab/mex_compile/regularisers_CPU/NonlocalMarching_Inpaint.c | 2 | ||||
| -rw-r--r-- | Wrappers/Python/src/cpu_regularisers.pyx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Wrappers/Matlab/mex_compile/regularisers_CPU/NonlocalMarching_Inpaint.c b/Wrappers/Matlab/mex_compile/regularisers_CPU/NonlocalMarching_Inpaint.c index 5e4ab1f..36cf05c 100644 --- a/Wrappers/Matlab/mex_compile/regularisers_CPU/NonlocalMarching_Inpaint.c +++ b/Wrappers/Matlab/mex_compile/regularisers_CPU/NonlocalMarching_Inpaint.c @@ -78,5 +78,5 @@ void mexFunction( if (number_of_dims == 3) { mexErrMsgTxt("Currently 2D supported only"); } - NonlocalMarching_Inpaint_main(Input, Mask, Output, Mask_upd, SW_increment, iterations, dimX, dimY, dimZ); + NonlocalMarching_Inpaint_main(Input, Mask, Output, Mask_upd, SW_increment, iterations, 0, dimX, dimY, dimZ); }
\ No newline at end of file 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) |