|
From: <sv...@va...> - 2005-07-24 06:44:30
|
Author: sewardj
Date: 2005-07-24 07:44:27 +0100 (Sun, 24 Jul 2005)
New Revision: 4236
Log:
A couple of gsl-1.6 patches which make it compile/run more cleanly.
Added:
trunk/auxprogs/gsl16-badfree.patch
trunk/auxprogs/gsl16-wavelet.patch
Modified:
trunk/auxprogs/Makefile.am
Modified: trunk/auxprogs/Makefile.am
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/auxprogs/Makefile.am 2005-07-24 06:30:37 UTC (rev 4235)
+++ trunk/auxprogs/Makefile.am 2005-07-24 06:44:27 UTC (rev 4236)
@@ -3,7 +3,8 @@
=20
bin_PROGRAMS =3D valgrind-listener
=20
-noinst_SCRIPTS =3D gen-mdg DotToScc.hs gsl16test
+noinst_SCRIPTS =3D gen-mdg DotToScc.hs \
+ gsl16test gsl16-badfree.patch gsl16-wavelet.patch
=20
EXTRA_DIST =3D $(noinst_SCRIPTS)
=20
Added: trunk/auxprogs/gsl16-badfree.patch
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/auxprogs/gsl16-badfree.patch 2005-07-24 06:30:37 UTC (rev 4235)
+++ trunk/auxprogs/gsl16-badfree.patch 2005-07-24 06:44:27 UTC (rev 4236)
@@ -0,0 +1,32 @@
+Index: test_complex_source.c
+=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
+RCS file: /home/gsl-cvs/gsl/vector/test_complex_source.c,v
+retrieving revision 1.23
+diff -u -r1.23 test_complex_source.c
+--- test_complex_source.c 24 Jun 2005 11:33:25 -0000 1.23
++++ test_complex_source.c 6 Jul 2005 11:18:33 -0000
+@@ -75,7 +75,7 @@
+ if (stride =3D=3D 1)
+ {
+ v0 =3D FUNCTION (gsl_vector, alloc) (N);
+- view =3D FUNCTION (gsl_vector, subvector) (v, 0, N);
++ view =3D FUNCTION (gsl_vector, subvector) (v0, 0, N);
+ v =3D &view.vector;
+ }
+ else
+Index: test_source.c
+=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
+RCS file: /home/gsl-cvs/gsl/vector/test_source.c,v
+retrieving revision 1.26
+diff -u -r1.26 test_source.c
+--- test_source.c 24 Jun 2005 11:33:26 -0000 1.26
++++ test_source.c 6 Jul 2005 11:14:18 -0000
+@@ -75,7 +75,7 @@
+ if (stride =3D=3D 1)
+ {
+ v0 =3D FUNCTION (gsl_vector, alloc) (N);
+- view =3D FUNCTION (gsl_vector, subvector) (v, 0, N);
++ view =3D FUNCTION (gsl_vector, subvector) (v0, 0, N);
+ v =3D &view.vector;
+ }
+ else
Added: trunk/auxprogs/gsl16-wavelet.patch
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/auxprogs/gsl16-wavelet.patch 2005-07-24 06:30:37 UTC (rev 4235)
+++ trunk/auxprogs/gsl16-wavelet.patch 2005-07-24 06:44:27 UTC (rev 4236)
@@ -0,0 +1,11 @@
+--- wavelet/dwt.c~ 2004-12-24 14:57:34.000000000 +0100
++++ wavelet/dwt.c 2005-07-08 23:31:32.000000000 +0200
+@@ -30,7 +30,7 @@
+
+ static int binary_logn (const size_t n);
+ static void dwt_step (const gsl_wavelet * w, double *a, size_t stride,
+- size_t n, int isign, gsl_wavelet_workspace * work=
);
++ size_t n, gsl_wavelet_direction dir, gsl_wavelet_=
workspace * work);
+
+ static int
+ binary_logn (const size_t n)
|