Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

MAINT: signal: Fix a few build warnings and modernize some C function declarations. #10054

Merged
merged 2 commits into from Apr 12, 2019
Merged

MAINT: signal: Fix a few build warnings and modernize some C function declarations. #10054

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4155f0e
MAINT: signal: Fix two build warnings in lfilter.c.src.
WarrenWeckesser Apr 12, 2019
5ec11a8
MAINT: signal: Modernize the function declarations the bspline util C…
WarrenWeckesser Apr 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
70 changes: 23 additions & 47 deletions scipy/signal/C_bspline_util.c
View file
Open in desktop
Expand Up @@ -29,12 +29,9 @@ void C_FIR_mirror_symmetric(__complex__ float*,__complex__ float*,int,__complex_
int C_separable_2Dconvolve_mirror(__complex__ float*,__complex__ float*,int,int,__complex__ float*,__complex__ float*,int,int,npy_intp*,npy_intp*);

void
C_IIR_order1 (a1, a2, x, y, N, stridex, stridey)
__complex__ float a1;
__complex__ float a2;
__complex__ float *x;
__complex__ float *y;
int N, stridex, stridey;
C_IIR_order1(__complex__ float a1, __complex__ float a2,
__complex__ float *x, __complex__ float *y,
int N, int stridex, int stridey)
{
__complex__ float *yvec = y+stridey;
__complex__ float *xvec = x+stridex;
Expand All @@ -52,13 +49,9 @@ C_IIR_order1 (a1, a2, x, y, N, stridex, stridey)
/* y[n] = a1 * x[n] + a2 * y[n-1] + a3 * y[n-2] */
/* with two starting values loaded into the array */
void
C_IIR_order2 (a1, a2, a3, x, y, N, stridex, stridey)
__complex__ float a1;
__complex__ float a2;
__complex__ float a3;
__complex__ float *x;
__complex__ float *y;
int N, stridex, stridey;
C_IIR_order2(__complex__ float a1, __complex__ float a2, __complex__ float a3,
__complex__ float *x, __complex__ float *y,
int N, int stridex, int stridey)
{
__complex__ float *yvec = y+2*stridey;
__complex__ float *xvec = x+2*stridex;
Expand Down Expand Up @@ -87,14 +80,11 @@ C_IIR_order2 (a1, a2, a3, x, y, N, stridex, stridey)
*/

void
C_IIR_order2_cascade (cs, z1, z2, y1_0, x, yp, N, stridex, stridey)
__complex__ float cs;
__complex__ float z1;
__complex__ float z2;
__complex__ float y1_0;
__complex__ float *x;
__complex__ float *yp;
int N, stridex, stridey;
C_IIR_order2_cascade(__complex__ float cs,
__complex__ float z1, __complex__ float z2,
__complex__ float y1_0,
__complex__ float *x, __complex__ float *yp,
int N, int stridex, int stridey)
{
__complex__ float *yvec = yp+stridey;
__complex__ float *xvec = x+stridex;
Expand Down Expand Up @@ -138,14 +128,10 @@ C_IIR_order2_cascade (cs, z1, z2, y1_0, x, yp, N, stridex, stridey)
*/

int
C_IIR_forback1 (c0, z1, x, y, N, stridex, stridey, precision)
__complex__ float c0;
__complex__ float z1;
__complex__ float *x;
__complex__ float *y;
int N, stridex, stridey;
float precision;
{
C_IIR_forback1(__complex__ float c0, __complex__ float z1,
__complex__ float *x, __complex__ float *y,
int N, int stridex, int stridey, float precision)
{
__complex__ float *yp = NULL;
__complex__ float *xptr = x;
__complex__ float yp0;
Expand Down Expand Up @@ -190,12 +176,9 @@ C_IIR_forback1 (c0, z1, x, y, N, stridex, stridey, precision)
/* h must be odd length */
/* strides in units of sizeof(__complex__ float) bytes */
void
C_FIR_mirror_symmetric (in, out, N, h, Nh, instride, outstride)
__complex__ float *in;
__complex__ float *out;
int N, Nh;
__complex__ float *h;
int instride, outstride;
C_FIR_mirror_symmetric(__complex__ float *in, __complex__ float *out,
int N, __complex__ float *h, int Nh,
int instride, int outstride)
{
int n, k;
int Nhdiv2 = Nh >> 1;
Expand Down Expand Up @@ -255,14 +238,11 @@ C_FIR_mirror_symmetric (in, out, N, h, Nh, instride, outstride)
}

int
C_separable_2Dconvolve_mirror(in, out, M, N, hr, hc, Nhr,
Nhc, instrides, outstrides)
__complex__ float *in;
__complex__ float *out;
int M, N;
__complex__ float *hr, *hc;
int Nhr, Nhc;
npy_intp *instrides, *outstrides;
C_separable_2Dconvolve_mirror(__complex__ float *in, __complex__ float *out,
int M, int N,
__complex__ float *hr, __complex__ float *hc,
int Nhr, int Nhc,
npy_intp *instrides, npy_intp *outstrides)
{
int m, n;
__complex__ float *tmpmem;
Expand Down Expand Up @@ -301,7 +281,3 @@ C_separable_2Dconvolve_mirror(in, out, M, N, hr, hc, Nhr,
return 0;
}
#endif




103 changes: 25 additions & 78 deletions scipy/signal/D_bspline_util.c
View file
Open in desktop
Expand Up @@ -31,12 +31,8 @@ int D_quadratic_spline2D(double*,double*,int,int,double,npy_intp*,npy_intp*,doub
/* with a given starting value loaded into the array */

void
D_IIR_order1 (a1, a2, x, y, N, stridex, stridey)
double a1;
double a2;
double *x;
double *y;
int N, stridex, stridey;
D_IIR_order1(double a1, double a2, double *x, double *y,
int N, int stridex, int stridey)
{
double *yvec = y+stridey;
double *xvec = x+stridex;
Expand All @@ -54,13 +50,8 @@ D_IIR_order1 (a1, a2, x, y, N, stridex, stridey)
/* y[n] = a1 * x[n] + a2 * y[n-1] + a3 * y[n-2] */
/* with two starting values loaded into the array */
void
D_IIR_order2 (a1, a2, a3, x, y, N, stridex, stridey)
double a1;
double a2;
double a3;
double *x;
double *y;
int N, stridex, stridey;
D_IIR_order2(double a1, double a2, double a3, double *x, double *y,
int N, int stridex, int stridey)
{
double *yvec = y+2*stridey;
double *xvec = x+2*stridex;
Expand Down Expand Up @@ -89,14 +80,9 @@ D_IIR_order2 (a1, a2, a3, x, y, N, stridex, stridey)
*/

void
D_IIR_order2_cascade (cs, z1, z2, y1_0, x, yp, N, stridex, stridey)
double cs;
double z1;
double z2;
double y1_0;
double *x;
double *yp;
int N, stridex, stridey;
D_IIR_order2_cascade(double cs, double z1, double z2, double y1_0,
double *x, double *yp,
int N, int stridex, int stridey)
{
double *yvec = yp+stridey;
double *xvec = x+stridex;
Expand Down Expand Up @@ -140,13 +126,8 @@ D_IIR_order2_cascade (cs, z1, z2, y1_0, x, yp, N, stridex, stridey)
*/

int
D_IIR_forback1 (c0, z1, x, y, N, stridex, stridey, precision)
double c0;
double z1;
double *x;
double *y;
int N, stridex, stridey;
double precision;
D_IIR_forback1(double c0, double z1, double *x, double *y,
int N, int stridex, int stridey, double precision)
{
double *yp = NULL;
double *xptr = x;
Expand Down Expand Up @@ -196,13 +177,9 @@ D_IIR_forback1 (c0, z1, x, y, N, stridex, stridey, precision)
/* h must be odd length */
/* strides in units of sizeof(double) bytes */
void
D_FIR_mirror_symmetric (in, out, N, h, Nh, instride, outstride)
double *in;
double *out;
int N, Nh;
double *h;
int instride, outstride;
{
D_FIR_mirror_symmetric(double *in, double *out, int N, double *h, int Nh,
int instride, int outstride)
{
int n, k;
int Nhdiv2 = Nh >> 1;
double *outptr;
Expand Down Expand Up @@ -261,14 +238,9 @@ D_FIR_mirror_symmetric (in, out, N, h, Nh, instride, outstride)
}

int
D_separable_2Dconvolve_mirror(in, out, M, N, hr, hc, Nhr,
Nhc, instrides, outstrides)
double *in;
double *out;
int M, N;
double *hr, *hc;
int Nhr, Nhc;
npy_intp *instrides, *outstrides;
D_separable_2Dconvolve_mirror(double *in, double *out, int M, int N,
double *hr, double *hc, int Nhr, int Nhc,
npy_intp *instrides, npy_intp *outstrides)
{
int m, n;
double *tmpmem;
Expand Down Expand Up @@ -312,10 +284,7 @@ static double D_hc(int,double,double,double);
static double D_hs(int,double,double,double);

double
D_hc(k, cs, r, omega)
int k;
double cs;
double r, omega;
D_hc(int k, double cs, double r, double omega)
{
if (k < 0) return 0.0;
if (omega == 0.0)
Expand All @@ -326,10 +295,7 @@ D_hc(k, cs, r, omega)
}

double
D_hs(k, cs, rsq, omega)
int k;
double cs;
double rsq, omega;
D_hs(int k, double cs, double rsq, double omega)
{
double cssq;
double c0;
Expand Down Expand Up @@ -390,13 +356,9 @@ D_hs(k, cs, rsq, omega)
*/

int
D_IIR_forback2 (r, omega, x, y, N, stridex, stridey, precision)
double r,omega;
double *x;
double *y;
int N, stridex, stridey;
double precision;
{
D_IIR_forback2(double r, double omega, double *x, double *y,
int N, int stridex, int stridey, double precision)
{
double cs;
double *yp = NULL;
double *yptr;
Expand Down Expand Up @@ -504,14 +466,9 @@ D_IIR_forback2 (r, omega, x, y, N, stridex, stridey, precision)
*/

int
D_cubic_spline2D(image, coeffs, M, N, lambda, strides, cstrides, precision)
double *image;
double *coeffs;
int M, N;
double lambda;
npy_intp *strides, *cstrides;
double precision;
{
D_cubic_spline2D(double *image, double *coeffs, int M, int N, double lambda,
npy_intp *strides, npy_intp *cstrides, double precision)
{
double r, omega;
double *inptr;
double *coptr;
Expand Down Expand Up @@ -597,13 +554,8 @@ D_cubic_spline2D(image, coeffs, M, N, lambda, strides, cstrides, precision)
*/

int
D_quadratic_spline2D(image, coeffs, M, N, lambda, strides, cstrides, precision)
double *image;
double *coeffs;
int M, N;
double lambda;
npy_intp *strides, *cstrides;
double precision;
D_quadratic_spline2D(double *image, double *coeffs, int M, int N, double lambda,
npy_intp *strides, npy_intp *cstrides, double precision)
{
double r;
double *inptr;
Expand Down Expand Up @@ -644,8 +596,3 @@ D_quadratic_spline2D(image, coeffs, M, N, lambda, strides, cstrides, precision)
free(tmpmem);
return retval;
}