From ba1d27b35761b168ef6eedfcc2c7092a498a6eb2 Mon Sep 17 00:00:00 2001 From: "Thouis (Ray) Jones" Date: Tue, 19 Feb 2013 21:44:06 -0500 Subject: [PATCH] move _histogram.h to _shared/vectorized_ops.h, and copyright info to CONTRIBUTORS.txt --- CONTRIBUTORS.txt | 3 +++ .../{filter/_histogram.h => _shared/vectorized_ops.h} | 10 ---------- skimage/filter/_ctmf.pyx | 2 +- 3 files changed, 4 insertions(+), 11 deletions(-) rename skimage/{filter/_histogram.h => _shared/vectorized_ops.h} (90%) diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index d582ab63..38e2ea32 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -132,3 +132,6 @@ - François Boulogne Andres Method for circle perimeter, ellipse perimeter drawing. + +- Thouis Jones + Vectorized operators for arrays of 16-bit ints. diff --git a/skimage/filter/_histogram.h b/skimage/_shared/vectorized_ops.h similarity index 90% rename from skimage/filter/_histogram.h rename to skimage/_shared/vectorized_ops.h index 3df3a70d..e426c86e 100644 --- a/skimage/filter/_histogram.h +++ b/skimage/_shared/vectorized_ops.h @@ -1,13 +1,3 @@ -/* - * Copyright (C) 2013 Thouis "Ray" Jones - * Modified from code - * Copyright (C) 2006 Simon Perreault - * - * Reference: S. Perreault and P. Hébert, "Median Filtering in Constant Time", - * IEEE Transactions on Image Processing, September 2007. - * - */ - /* Intrinsic declarations */ #if defined(__SSE2__) #include diff --git a/skimage/filter/_ctmf.pyx b/skimage/filter/_ctmf.pyx index 87e4a8b9..75c1b47a 100644 --- a/skimage/filter/_ctmf.pyx +++ b/skimage/filter/_ctmf.pyx @@ -17,7 +17,7 @@ cimport cython from libc.stdlib cimport malloc, free from libc.string cimport memset -cdef extern from "_histogram.h": +cdef extern from "../_shared/vectorized_ops.h": void add16(np.uint16_t *dest, np.uint16_t *src) void sub16(np.uint16_t *dest, np.uint16_t *src)