wassname/scikit-image
1
0
Fork 0
mirror of https://github.com/wassname/scikit-image.git synced 2026-07-04 02:28:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix percentile autolevel

Browse Source
This commit is contained in:
Olivier Debeir
2012-10-10 15:40:05 +02:00
parent 935f424e9f
commit 5fdc11c4fd
2 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
skimage/rank/_crank16_percentiles.pyx
+6 -10
View File
@@ -15,10 +15,10 @@ import numpy as np
cimport numpy as np
# import main loop
from _core16p cimport _core16p
from _core16p cimport _core16p,int_min,int_max
# -----------------------------------------------------------------
# kernels uint8 (SOFT version using percentiles)
# kernels uint16 (SOFT version using percentiles)
# -----------------------------------------------------------------
cdef inline np.uint16_t kernel_autolevel(int* histo, float pop, np.uint16_t g,int bitdepth,int maxbin, int midbin, float p0, float p1):
@@ -29,25 +29,21 @@ cdef inline np.uint16_t kernel_autolevel(int* histo, float pop, np.uint16_t g,in
p1 = 1.0-p1
for i in range(maxbin):
sum += histo[i]
if sum>=p0*pop:
if sum>p0*pop:
imin = i
break
sum = 0
for i in range(maxbin-1,-1,-1):
sum += histo[i]
if sum>=p1*pop:
if sum>p1*pop:
imax = i
break
delta = imax-imin
if g>imax:
return <np.uint16_t>(maxbin-1)
if g<imin:
return <np.uint16_t>(0)
if delta>0:
return <np.uint16_t>((maxbin-1)*1.*(g-imin)/delta)
return <np.uint16_t>(255*(int_min(int_max(imin,g),imax)-imin)/delta)
else:
return <np.uint16_t>(0)
return <np.uint16_t>(imax-imin)
else:
return <np.uint16_t>(0)
skimage/rank/_crank8_percentiles.pyx
-2
View File
@@ -43,8 +43,6 @@ cdef inline np.uint8_t kernel_autolevel(int* histo, float pop, np.uint8_t g, flo
break
delta = imax-imin
if delta>0:
# return <np.uint8_t>(255.)
# return <np.uint8_t>(delta)
return <np.uint8_t>(255*(uint8_min(uint8_max(imin,g),imax)-imin)/delta)
else:
return <np.uint8_t>(imax-imin)