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

Merge pull request #417 from stefanv/msvc_build_fix

Browse Source 
PKG: MSVC build fixes by Christoph Gohlke.
This commit is contained in:
Johannes Schönberger
2013-02-25 13:22:46 -08:00
parent b0a01698b3 00c023d814
commit 590784d9a3
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
skimage/filter/rank/_crank16.pyx
+2 -2
View File
@@ -4,7 +4,7 @@
#cython: wraparound=False
cimport numpy as cnp
from libc.math cimport log2
from libc.math cimport log
from skimage.filter.rank._core16 cimport _core16
@@ -276,7 +276,7 @@ cdef inline dtype_t kernel_entropy(Py_ssize_t * histo, float pop,
for i in range(maxbin):
p = histo[i] / pop
if p > 0:
e -= p * log2(p)
e -= p * log(p) / 0.6931471805599453
return <dtype_t>e * 1000
else:
skimage/filter/rank/_crank8.pyx
+2 -2
View File
@@ -4,7 +4,7 @@
#cython: wraparound=False
cimport numpy as cnp
from libc.math cimport log2
from libc.math cimport log
from skimage.filter.rank._core8 cimport _core8
@@ -281,7 +281,7 @@ cdef inline dtype_t kernel_entropy(Py_ssize_t * histo, float pop,
for i in range(256):
p = histo[i] / pop
if p > 0:
e -= p * log2(p)
e -= p * log(p) / 0.6931471805599453
return <dtype_t>e * 10
else:
skimage/filter/setup.py
+10 -10
View File
@@ -29,31 +29,31 @@ def configuration(parent_package='', top_path=None):
include_dirs=[get_numpy_include_dirs()])
config.add_extension('_denoise_cy', sources=['_denoise_cy.c'],
include_dirs=[get_numpy_include_dirs(), '../_shared'])
config.add_extension('rank/_core8', sources=['rank/_core8.c'],
config.add_extension('rank._core8', sources=['rank/_core8.c'],
include_dirs=[get_numpy_include_dirs()])
config.add_extension('rank/_core16', sources=['rank/_core16.c'],
config.add_extension('rank._core16', sources=['rank/_core16.c'],
include_dirs=[get_numpy_include_dirs()])
config.add_extension('rank/_crank8', sources=['rank/_crank8.c'],
config.add_extension('rank._crank8', sources=['rank/_crank8.c'],
include_dirs=[get_numpy_include_dirs()])
config.add_extension(
'rank/_crank8_percentiles', sources=['rank/_crank8_percentiles.c'],
'rank._crank8_percentiles', sources=['rank/_crank8_percentiles.c'],
include_dirs=[get_numpy_include_dirs()])
config.add_extension('rank/_crank16', sources=['rank/_crank16.c'],
config.add_extension('rank._crank16', sources=['rank/_crank16.c'],
include_dirs=[get_numpy_include_dirs()])
config.add_extension(
'rank/_crank16_percentiles', sources=['rank/_crank16_percentiles.c'],
'rank._crank16_percentiles', sources=['rank/_crank16_percentiles.c'],
include_dirs=[get_numpy_include_dirs()])
config.add_extension(
'rank/_crank16_bilateral', sources=['rank/_crank16_bilateral.c'],
'rank._crank16_bilateral', sources=['rank/_crank16_bilateral.c'],
include_dirs=[get_numpy_include_dirs()])
config.add_extension(
'rank/rank', sources=['rank/rank.c'],
'rank.rank', sources=['rank/rank.c'],
include_dirs=[get_numpy_include_dirs()])
config.add_extension(
'rank/percentile_rank', sources=['rank/percentile_rank.c'],
'rank.percentile_rank', sources=['rank/percentile_rank.c'],
include_dirs=[get_numpy_include_dirs()])
config.add_extension(
'rank/bilateral_rank', sources=['rank/bilateral_rank.c'],
'rank.bilateral_rank', sources=['rank/bilateral_rank.c'],
include_dirs=[get_numpy_include_dirs()])
return config