From f87fadf0f070469af5d6c6d737ca1c41102600a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jostein=20B=C3=B8=20Fl=C3=B8ystad?= Date: Mon, 15 Jul 2013 18:47:58 +0200 Subject: [PATCH] unwrap: Rename C files. --- bento.info | 4 ++-- skimage/exposure/setup.py | 6 ++---- ..._with_mask_and_wrap_around_option.c => unwrap_2d_ljmu.c} | 1 + ..._with_mask_and_wrap_around_option.c => unwrap_3d_ljmu.c} | 1 + 4 files changed, 6 insertions(+), 6 deletions(-) rename skimage/exposure/{Miguel_2D_unwrapper_with_mask_and_wrap_around_option.c => unwrap_2d_ljmu.c} (96%) rename skimage/exposure/{Hussein_3D_unwrapper_with_mask_and_wrap_around_option.c => unwrap_3d_ljmu.c} (99%) diff --git a/bento.info b/bento.info index 7be7bbd3..e8ae3b07 100644 --- a/bento.info +++ b/bento.info @@ -146,10 +146,10 @@ Library: skimage/filter/rank/bilateral_cy.pyx Extension: skimage.exposure._unwrap_3d Sources: - skimage/exposure/_unwrap_3d.pyx, skimage/exposure/Hussein_3D_unwrapper_with_mask_and_wrap_around_option.c + skimage/exposure/_unwrap_3d.pyx, skimage/exposure/unwrap_3d_ljmu.c Extension: skimage.exposure._unwrap_2d Sources: - skimage/exposure/_unwrap_2d.pyx, skimage/exposure/Miguel_2D_unwrapper_with_mask_and_wrap_around_option.c + skimage/exposure/_unwrap_2d.pyx, skimage/exposure/unwrap_2d_ljmu.c Executable: skivi Module: skimage.scripts.skivi diff --git a/skimage/exposure/setup.py b/skimage/exposure/setup.py index ed1515fe..d21f41f0 100644 --- a/skimage/exposure/setup.py +++ b/skimage/exposure/setup.py @@ -16,13 +16,11 @@ def configuration(parent_package='', top_path=None): cython(['_unwrap_2d.pyx'], working_path=base_path) cython(['_unwrap_3d.pyx'], working_path=base_path) - unwrap_sources_2d = ['_unwrap_2d.c', - 'Miguel_2D_unwrapper_with_mask_and_wrap_around_option.c'] + unwrap_sources_2d = ['_unwrap_2d.c', 'unwrap_2d_ljmu.c'] config.add_extension('_unwrap_2d', sources=unwrap_sources_2d, extra_compile_args=['-g'], include_dirs=[get_numpy_include_dirs()]) - unwrap_sources_3d = ['_unwrap_3d.c', - 'Hussein_3D_unwrapper_with_mask_and_wrap_around_option.c'] + unwrap_sources_3d = ['_unwrap_3d.c', 'unwrap_3d_ljmu.c'] config.add_extension('_unwrap_3d', sources=unwrap_sources_3d, extra_compile_args=['-g'], include_dirs=[get_numpy_include_dirs()]) diff --git a/skimage/exposure/Miguel_2D_unwrapper_with_mask_and_wrap_around_option.c b/skimage/exposure/unwrap_2d_ljmu.c similarity index 96% rename from skimage/exposure/Miguel_2D_unwrapper_with_mask_and_wrap_around_option.c rename to skimage/exposure/unwrap_2d_ljmu.c index e6249062..7ffcbeef 100644 --- a/skimage/exposure/Miguel_2D_unwrapper_with_mask_and_wrap_around_option.c +++ b/skimage/exposure/unwrap_2d_ljmu.c @@ -1,4 +1,5 @@ // 2D phase unwrapping, modified for inclusion in scipy by Gregor Thalhammer +// Original file name: Miguel_2D_unwrapper_with_mask_and_wrap_around_option.c //This program was written by Munther Gdeisat and Miguel Arevallilo Herraez to program the two-dimensional unwrapper //entitled "Fast two-dimensional phase-unwrapping algorithm based on sorting by diff --git a/skimage/exposure/Hussein_3D_unwrapper_with_mask_and_wrap_around_option.c b/skimage/exposure/unwrap_3d_ljmu.c similarity index 99% rename from skimage/exposure/Hussein_3D_unwrapper_with_mask_and_wrap_around_option.c rename to skimage/exposure/unwrap_3d_ljmu.c index 7c203465..b8a44a73 100644 --- a/skimage/exposure/Hussein_3D_unwrapper_with_mask_and_wrap_around_option.c +++ b/skimage/exposure/unwrap_3d_ljmu.c @@ -1,4 +1,5 @@ // 3D phase unwrapping, modified for inclusion in scipy by Gregor Thalhammer +// Original file name: Hussein_3D_unwrapper_with_mask_and_wrap_around_option.c //This program was written by Hussein Abdul-Rahman and Munther Gdeisat to program the three-dimensional phase unwrapper //entitled "Fast three-dimensional phase-unwrapping algorithm based on sorting by