From 2bb139fb03a8443e7e01cfa9fa9eccb3e2d405db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Sat, 10 Nov 2012 08:39:27 +0100 Subject: [PATCH] Wrap lines --- skimage/filter/rank/_crank16.pyx | 18 ++++++++++++------ skimage/filter/rank/_crank16_percentiles.pyx | 18 ++++++++++++------ skimage/filter/rank/_crank8_percentiles.pyx | 9 ++++++--- 3 files changed, 30 insertions(+), 15 deletions(-) diff --git a/skimage/filter/rank/_crank16.pyx b/skimage/filter/rank/_crank16.pyx index bb3f7c7d..9c4b8fe1 100644 --- a/skimage/filter/rank/_crank16.pyx +++ b/skimage/filter/rank/_crank16.pyx @@ -122,9 +122,12 @@ cdef inline np.uint16_t kernel_mean(Py_ssize_t * histo, Py_ssize_t pop, return (0) -cdef inline np.uint16_t kernel_meansubstraction(Py_ssize_t * histo, Py_ssize_t pop, - np.uint16_t g, Py_ssize_t bitdepth, - Py_ssize_t maxbin, Py_ssize_t midbin, +cdef inline np.uint16_t kernel_meansubstraction(Py_ssize_t * histo, + Py_ssize_t pop, + np.uint16_t g, + Py_ssize_t bitdepth, + Py_ssize_t maxbin, + Py_ssize_t midbin, float p0, float p1, Py_ssize_t s0, Py_ssize_t s1): cdef Py_ssize_t i @@ -188,9 +191,12 @@ cdef inline np.uint16_t kernel_modal(Py_ssize_t * histo, Py_ssize_t pop, return (0) -cdef inline np.uint16_t kernel_morph_contr_enh(Py_ssize_t * histo, Py_ssize_t pop, - np.uint16_t g, Py_ssize_t bitdepth, - Py_ssize_t maxbin, Py_ssize_t midbin, +cdef inline np.uint16_t kernel_morph_contr_enh(Py_ssize_t * histo, + Py_ssize_t pop, + np.uint16_t g, + Py_ssize_t bitdepth, + Py_ssize_t maxbin, + Py_ssize_t midbin, float p0, float p1, Py_ssize_t s0, Py_ssize_t s1): cdef Py_ssize_t i, imin, imax diff --git a/skimage/filter/rank/_crank16_percentiles.pyx b/skimage/filter/rank/_crank16_percentiles.pyx index 8f8585e7..e5dc2ab7 100644 --- a/skimage/filter/rank/_crank16_percentiles.pyx +++ b/skimage/filter/rank/_crank16_percentiles.pyx @@ -100,9 +100,12 @@ cdef inline np.uint16_t kernel_mean(Py_ssize_t * histo, Py_ssize_t pop, return (0) -cdef inline np.uint16_t kernel_mean_substraction(Py_ssize_t * histo, Py_ssize_t pop, - np.uint16_t g, Py_ssize_t bitdepth, - Py_ssize_t maxbin, Py_ssize_t midbin, +cdef inline np.uint16_t kernel_mean_substraction(Py_ssize_t * histo, + Py_ssize_t pop, + np.uint16_t g, + Py_ssize_t bitdepth, + Py_ssize_t maxbin, + Py_ssize_t midbin, float p0, float p1, Py_ssize_t s0, Py_ssize_t s1): @@ -125,9 +128,12 @@ cdef inline np.uint16_t kernel_mean_substraction(Py_ssize_t * histo, Py_ssize_t return (0) -cdef inline np.uint16_t kernel_morph_contr_enh(Py_ssize_t * histo, Py_ssize_t pop, - np.uint16_t g, Py_ssize_t bitdepth, - Py_ssize_t maxbin, Py_ssize_t midbin, +cdef inline np.uint16_t kernel_morph_contr_enh(Py_ssize_t * histo, + Py_ssize_t pop, + np.uint16_t g, + Py_ssize_t bitdepth, + Py_ssize_t maxbin, + Py_ssize_t midbin, float p0, float p1, Py_ssize_t s0, Py_ssize_t s1): diff --git a/skimage/filter/rank/_crank8_percentiles.pyx b/skimage/filter/rank/_crank8_percentiles.pyx index 0bc81aac..4a11bdc4 100644 --- a/skimage/filter/rank/_crank8_percentiles.pyx +++ b/skimage/filter/rank/_crank8_percentiles.pyx @@ -92,8 +92,10 @@ cdef inline np.uint8_t kernel_mean(Py_ssize_t * histo, Py_ssize_t pop, return (0) -cdef inline np.uint8_t kernel_mean_substraction(Py_ssize_t * histo, Py_ssize_t pop, - np.uint8_t g, float p0, float p1, +cdef inline np.uint8_t kernel_mean_substraction(Py_ssize_t * histo, + Py_ssize_t pop, + np.uint8_t g, + float p0, float p1, Py_ssize_t s0, Py_ssize_t s1): cdef int i, sum, mean, n @@ -114,7 +116,8 @@ cdef inline np.uint8_t kernel_mean_substraction(Py_ssize_t * histo, Py_ssize_t p return (0) -cdef inline np.uint8_t kernel_morph_contr_enh(Py_ssize_t * histo, Py_ssize_t pop, +cdef inline np.uint8_t kernel_morph_contr_enh(Py_ssize_t * histo, + Py_ssize_t pop, np.uint8_t g, float p0, float p1, Py_ssize_t s0, Py_ssize_t s1): cdef int i, imin, imax, sum, delta