From 10a3987382bf19d8c0ccaa770ae4265a6a9e8372 Mon Sep 17 00:00:00 2001 From: Debian Astronomy Maintainers Date: Mon, 19 Jan 2015 20:07:18 +0000 Subject: [PATCH] use_wcslib_4.24 Gbp-Pq: Name use_wcslib_4.24.patch --- astropy/wcs/include/wcslib/wcs.h | 4 ++-- astropy/wcs/src/wcslib_wrap.c | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/astropy/wcs/include/wcslib/wcs.h b/astropy/wcs/include/wcslib/wcs.h index 4dd84e2..1c148df 100644 --- a/astropy/wcs/include/wcslib/wcs.h +++ b/astropy/wcs/include/wcslib/wcs.h @@ -1,4 +1,4 @@ -/*============================================================================ +1/*============================================================================ WCSLIB 4.23 - an implementation of the FITS WCS standard. Copyright (C) 1995-2014, Mark Calabretta @@ -1568,7 +1568,7 @@ int wcsini(int alloc, int naxis, struct wcsprm *wcs); int wcssub(int alloc, const struct wcsprm *wcssrc, int *nsub, int axes[], struct wcsprm *wcsdst); -int wcscompare(int cmp, const struct wcsprm *wcs1, const struct wcsprm *wcs2, +int wcscompare(int cmp, double tol, const struct wcsprm *wcs1, const struct wcsprm *wcs2, int *equal); int wcsfree(struct wcsprm *wcs); diff --git a/astropy/wcs/src/wcslib_wrap.c b/astropy/wcs/src/wcslib_wrap.c index bb9ca39..5520fec 100644 --- a/astropy/wcs/src/wcslib_wrap.c +++ b/astropy/wcs/src/wcslib_wrap.c @@ -751,7 +751,7 @@ PyWcsprm_compare( wcsprm_python2c(&self->x); wcsprm_python2c(&other->x); - status = wcscompare(cmp, &self->x, &other->x, &equal); + status = wcscompare(cmp, 0.0, &self->x, &other->x, &equal); wcsprm_c2python(&self->x); wcsprm_c2python(&other->x); @@ -1698,6 +1698,7 @@ PyObject *PyWcsprm_richcompare(PyObject *a, PyObject *b, int op) { wcsprm_python2c(bx); status = wcscompare( WCSCOMPARE_ANCILLARY, + 0.0, ax, bx, &equal); wcsprm_c2python(ax); wcsprm_c2python(bx); -- 2.30.2