From 6662c4284837cec9eaa46a11824c9635c89cb409 Mon Sep 17 00:00:00 2001 From: Thiago Franco de Moraes Date: Wed, 17 Aug 2016 14:51:17 -0300 Subject: [PATCH] Updated the setup.py --- invesalius/data/floodfill.pyx | 5 ++--- setup.py | 29 ++++++++++++++++++++--------- 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/invesalius/data/floodfill.pyx b/invesalius/data/floodfill.pyx index 5a05986..954adc2 100644 --- a/invesalius/data/floodfill.pyx +++ b/invesalius/data/floodfill.pyx @@ -139,13 +139,12 @@ def floodfill_threshold(np.ndarray[image_t, ndim=3] data, list seeds, int t0, in out[z, y, x] = fill for k in xrange(odz): + zo = z + k - offset_z for j in xrange(ody): + yo = y + j - offset_y for i in xrange(odx): if strct[k, j, i]: xo = x + i - offset_x - yo = y + j - offset_y - zo = z + k - offset_z - if 0 <= xo < dx and 0 <= yo < dy and 0 <= zo < dz and out[zo, yo, xo] != fill and t0 <= data[zo, yo, xo] <= t1: out[zo, yo, xo] = fill c.x = xo diff --git a/setup.py b/setup.py index 021206a..bf7ecd5 100644 --- a/setup.py +++ b/setup.py @@ -38,18 +38,23 @@ elif sys.platform == 'win32': setup( cmdclass = {'build_ext': build_ext}, ext_modules = cythonize([ Extension("invesalius.data.mips", ["invesalius/data/mips.pyx"], - include_dirs = [numpy.get_include()], - extra_compile_args=['/openmp'],), + include_dirs = [numpy.get_include()], + extra_compile_args=['/openmp'],), - Extension("invesalius.data.interpolation", ["invesalius/data/interpolation.pyx"], - include_dirs=[numpy.get_include()], - extra_compile_args=['/openmp'],), + Extension("invesalius.data.interpolation", ["invesalius/data/interpolation.pyx"], + include_dirs=[numpy.get_include()], + extra_compile_args=['/openmp'],), - Extension("invesalius.data.transforms", ["invesalius/data/transforms.pyx"], - include_dirs=[numpy.get_include()], - extra_compile_args=['/openmp'],), + Extension("invesalius.data.transforms", ["invesalius/data/transforms.pyx"], + include_dirs=[numpy.get_include()], + extra_compile_args=['/openmp'],), + + Extension("invesalius.data.floodfill", ["invesalius/data/floodfill.pyx"], + include_dirs=[numpy.get_include()], + extra_compile_args=['/openmp',], + language='c++',), ]) - ) + ) else: setup( @@ -69,5 +74,11 @@ else: include_dirs=[numpy.get_include()], extra_compile_args=['-fopenmp',], extra_link_args=['-fopenmp',]), + + Extension("invesalius.data.floodfill", ["invesalius/data/floodfill.pyx"], + include_dirs=[numpy.get_include()], + extra_compile_args=['-fopenmp',], + extra_link_args=['-fopenmp',], + language='c++',), ]) ) -- libgit2 0.21.2