[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnuastro-commits] (no subject)
|
From: |
Mohammad Akhlaghi |
|
Subject: |
[gnuastro-commits] (no subject) |
|
Date: |
Fri, 3 Jun 2016 11:24:40 +0000 (UTC) |
branch: master
commit 95c8548d93e47fa4ec5efe1c5c67886effbffd76
Author: Mohammad Akhlaghi <address@hidden>
Date: Fri Jun 3 20:14:38 2016 +0900
The txtarrayvv library renamed to txtarray
Following commit f7f8d0c (Rename exported functions according to new naming
conventions) The `vv' in `txtarrayvv' and `fitsarrayvv' libraries were
dropped (correctly). However, the `vv's still remained in the library file
names. This could cause confusion so with this commit we have remove the
`vv's from the latter. The issue with `fitsarrayvv' was addressed in the
previous commit (f89bfd8: Renamed fitsarrayvv library to fits).
---
lib/Makefile.am | 10 +++++-----
lib/gnuastro/{txtarrayvv.h => txtarray.h} | 2 +-
lib/{txtarrayvv.c => txtarray.c} | 8 ++++----
src/convertt/Makefile.am | 4 ++--
src/convertt/convertt.c | 2 +-
src/convertt/ui.c | 2 +-
src/cosmiccal/ui.c | 2 +-
src/header/ui.c | 2 +-
src/imgcrop/Makefile.am | 4 ++--
src/imgcrop/ui.c | 2 +-
src/imgstat/ui.c | 2 +-
src/imgwarp/Makefile.am | 2 +-
src/imgwarp/ui.c | 2 +-
src/mkcatalog/Makefile.am | 2 +-
src/mkcatalog/mkcatalog.c | 2 +-
src/mkcatalog/ui.c | 2 +-
src/mknoise/ui.c | 2 +-
src/mkprof/Makefile.am | 6 +++---
src/mkprof/mkprof.c | 2 +-
src/mkprof/ui.c | 2 +-
src/noisechisel/ui.c | 2 +-
src/subtractsky/ui.c | 2 +-
22 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/lib/Makefile.am b/lib/Makefile.am
index c6fc1c9..29172b8 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -25,9 +25,9 @@
## Make libraries of the files that are shared between all the
## programs:
headersdir=$(top_srcdir)/lib/gnuastro
-noinst_LTLIBRARIES = libgalconfigfiles.la libgalfits.la
\
-libgaltxtarrayvv.la libgalcheckset.la libgallinkedlist.la libgaltiming.la \
-libgalthreads.la libgalbox.la libgalarraymanip.la libgalstatistics.la \
+noinst_LTLIBRARIES = libgalconfigfiles.la libgalfits.la libgaltxtarray.la \
+libgalcheckset.la libgallinkedlist.la libgaltiming.la libgalthreads.la \
+libgalbox.la libgalarraymanip.la libgalstatistics.la \
libgalspatialconvolve.la libgalmesh.la libgalmode.la libgalqsort.la \
libgalpolygon.la libgalwcs.la
@@ -51,14 +51,14 @@ libgalthreads_la_SOURCES = threads.c $(headersdir)/threads.h
libgalcheckset_la_SOURCES = checkset.c $(headersdir)/checkset.h
+libgaltxtarray_la_SOURCES = txtarray.c $(headersdir)/txtarray.h
+
libgallinkedlist_la_SOURCES = linkedlist.c $(headersdir)/linkedlist.h
libgalstatistics_la_SOURCES = statistics.c $(headersdir)/statistics.h
libgalarraymanip_la_SOURCES = arraymanip.c $(headersdir)/arraymanip.h
-libgaltxtarrayvv_la_SOURCES = txtarrayvv.c $(headersdir)/txtarrayvv.h
-
libgalconfigfiles_la_SOURCES = configfiles.c $(headersdir)/configfiles.h
diff --git a/lib/gnuastro/txtarrayvv.h b/lib/gnuastro/txtarray.h
similarity index 97%
rename from lib/gnuastro/txtarrayvv.h
rename to lib/gnuastro/txtarray.h
index edf7c2a..277adb3 100644
--- a/lib/gnuastro/txtarrayvv.h
+++ b/lib/gnuastro/txtarray.h
@@ -1,5 +1,5 @@
/*********************************************************************
-txtarrayvv -- Convert a text file table to a C array.
+txtarray -- Convert a text file table to a C array.
This is part of GNU Astronomy Utilities (Gnuastro) package.
Original author:
diff --git a/lib/txtarrayvv.c b/lib/txtarray.c
similarity index 98%
rename from lib/txtarrayvv.c
rename to lib/txtarray.c
index 26ad22d..47012ee 100644
--- a/lib/txtarrayvv.c
+++ b/lib/txtarray.c
@@ -1,5 +1,5 @@
/*********************************************************************
-txtarrayvv -- Convert a text file table to a C array.
+txtarray -- Convert a text file table to a C array.
This is part of GNU Astronomy Utilities (Gnuastro) package.
Original author:
@@ -30,7 +30,7 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <assert.h>
#include <string.h>
-#include <gnuastro/txtarrayvv.h>
+#include <gnuastro/txtarray.h>
@@ -290,7 +290,7 @@ doformatting(int numcols, char **fmt, int *int_cols, int
*accu_cols,
errno=0;
fmt[i]=malloc(GAL_TXTARRAY_FMT_LENGTH * sizeof(char));
if(fmt[i]==NULL)
- error(EXIT_FAILURE, errno, "txtarrayvv, space for format "
+ error(EXIT_FAILURE, errno, "txtarray, space for format "
"string %d, with %d elements", i, GAL_TXTARRAY_FMT_LENGTH);
/* See if this is an int column. */
@@ -382,7 +382,7 @@ gal_txtarray_array_to_txt(double *array, size_t s0, size_t
s1, char *comments,
errno=0;
fmt=malloc(s1 * sizeof(char *));
if(fmt==NULL)
- error(EXIT_FAILURE, errno, "txtarrayvv, formatting of each "
+ error(EXIT_FAILURE, errno, "txtarray, formatting of each "
"column with %lu elements", s1);
/* Prepare the formatting for each column */
diff --git a/src/convertt/Makefile.am b/src/convertt/Makefile.am
index 331dac5..fd443a6 100644
--- a/src/convertt/Makefile.am
+++ b/src/convertt/Makefile.am
@@ -29,8 +29,8 @@ astconvertt_SOURCES = main.c main.h args.h cite.h ui.c ui.h
eps.c \
eps.h jpeg.c jpeg.h convertt.c convertt.h
astconvertt_LDADD = $(top_builddir)/bootstrapped/lib/libgnu.la \
--lgalconfigfiles -lgalfits -lgaltxtarrayvv -lgalcheckset \
--lgaltiming -lgallinkedlist -lgalstatistics -lgalarraymanip -lgalqsort
+-lgalconfigfiles -lgalfits -lgaltxtarray -lgalcheckset -lgaltiming \
+-lgallinkedlist -lgalstatistics -lgalarraymanip -lgalqsort
diff --git a/src/convertt/convertt.c b/src/convertt/convertt.c
index dadc9f0..df5f606 100644
--- a/src/convertt/convertt.c
+++ b/src/convertt/convertt.c
@@ -31,8 +31,8 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <gnuastro/fits.h>
#include <gnuastro/timing.h>
+#include <gnuastro/txtarray.h>
#include <gnuastro/statistics.h>
-#include <gnuastro/txtarrayvv.h>
#include "main.h"
diff --git a/src/convertt/ui.c b/src/convertt/ui.c
index 51dae98..5f679a3 100644
--- a/src/convertt/ui.c
+++ b/src/convertt/ui.c
@@ -34,7 +34,7 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <gnuastro/fits.h>
#include <gnuastro/timing.h> /* Includes time.h and sys/time.h */
-#include <gnuastro/txtarrayvv.h>
+#include <gnuastro/txtarray.h>
#include <gnuastro/linkedlist.h>
#include <gnuastro/configfiles.h>
diff --git a/src/cosmiccal/ui.c b/src/cosmiccal/ui.c
index 030883a..94dd0f4 100644
--- a/src/cosmiccal/ui.c
+++ b/src/cosmiccal/ui.c
@@ -36,7 +36,7 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <gnuastro/fits.h>
#include <gnuastro/timing.h> /* Includes time.h and sys/time.h */
#include <gnuastro/checkset.h>
-#include <gnuastro/txtarrayvv.h>
+#include <gnuastro/txtarray.h>
#include <gnuastro/commonargs.h>
#include <gnuastro/configfiles.h>
diff --git a/src/header/ui.c b/src/header/ui.c
index 70aa2cc..7be6042 100644
--- a/src/header/ui.c
+++ b/src/header/ui.c
@@ -35,7 +35,7 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <gnuastro/fits.h>
#include <gnuastro/timing.h> /* Includes time.h and sys/time.h */
#include <gnuastro/checkset.h>
-#include <gnuastro/txtarrayvv.h>
+#include <gnuastro/txtarray.h>
#include <gnuastro/commonargs.h>
#include <gnuastro/configfiles.h>
diff --git a/src/imgcrop/Makefile.am b/src/imgcrop/Makefile.am
index efb3a5e..ff34ff4 100644
--- a/src/imgcrop/Makefile.am
+++ b/src/imgcrop/Makefile.am
@@ -28,8 +28,8 @@ bin_PROGRAMS = astimgcrop
astimgcrop_SOURCES = main.c main.h cite.h ui.c ui.h args.h imgcrop.c \
imgcrop.h wcsmode.c wcsmode.h crop.c crop.h
-astimgcrop_LDADD = $(top_builddir)/bootstrapped/lib/libgnu.la \
--lgalconfigfiles -lgalwcs -lgalfits -lgaltxtarrayvv -lgalcheckset \
+astimgcrop_LDADD = $(top_builddir)/bootstrapped/lib/libgnu.la \
+-lgalconfigfiles -lgalwcs -lgalfits -lgaltxtarray -lgalcheckset \
-lgallinkedlist -lgaltiming -lgalthreads -lgalbox -lgalpolygon
diff --git a/src/imgcrop/ui.c b/src/imgcrop/ui.c
index 1bebce6..bb30d03 100644
--- a/src/imgcrop/ui.c
+++ b/src/imgcrop/ui.c
@@ -34,7 +34,7 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <gnuastro/fits.h>
#include <gnuastro/timing.h> /* Includes time.h and sys/time.h */
#include <gnuastro/checkset.h>
-#include <gnuastro/txtarrayvv.h>
+#include <gnuastro/txtarray.h>
#include <gnuastro/commonargs.h>
#include <gnuastro/configfiles.h>
diff --git a/src/imgstat/ui.c b/src/imgstat/ui.c
index fb367be..36466ee 100644
--- a/src/imgstat/ui.c
+++ b/src/imgstat/ui.c
@@ -36,9 +36,9 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <gnuastro/qsort.h>
#include <gnuastro/timing.h> /* Includes time.h and sys/time.h */
#include <gnuastro/checkset.h>
+#include <gnuastro/txtarray.h>
#include <gnuastro/arraymanip.h>
#include <gnuastro/statistics.h>
-#include <gnuastro/txtarrayvv.h>
#include <gnuastro/commonargs.h>
#include <gnuastro/configfiles.h>
#include <gnuastro/fixedstringmacros.h>
diff --git a/src/imgwarp/Makefile.am b/src/imgwarp/Makefile.am
index f0ffa5c..80f7ac3 100644
--- a/src/imgwarp/Makefile.am
+++ b/src/imgwarp/Makefile.am
@@ -29,7 +29,7 @@ astimgwarp_SOURCES = main.c main.h cite.h ui.c ui.h args.h
\
imgwarp.c imgwarp.h
astimgwarp_LDADD = $(top_builddir)/bootstrapped/lib/libgnu.la \
--lgalconfigfiles -lgalfits -lgaltxtarrayvv -lgalcheckset -lgaltiming \
+-lgalconfigfiles -lgalfits -lgaltxtarray -lgalcheckset -lgaltiming \
-lgalthreads -lgalpolygon
diff --git a/src/imgwarp/ui.c b/src/imgwarp/ui.c
index 555cc9e..0a48af9 100644
--- a/src/imgwarp/ui.c
+++ b/src/imgwarp/ui.c
@@ -34,7 +34,7 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <gnuastro/fits.h>
#include <gnuastro/timing.h> /* Includes time.h and sys/time.h */
#include <gnuastro/checkset.h>
-#include <gnuastro/txtarrayvv.h>
+#include <gnuastro/txtarray.h>
#include <gnuastro/commonargs.h>
#include <gnuastro/configfiles.h>
diff --git a/src/mkcatalog/Makefile.am b/src/mkcatalog/Makefile.am
index c0a2825..c2fd8ed 100644
--- a/src/mkcatalog/Makefile.am
+++ b/src/mkcatalog/Makefile.am
@@ -30,7 +30,7 @@ mkcatalog.c mkcatalog.h columns.c columns.h
astmkcatalog_LDADD = $(top_builddir)/bootstrapped/lib/libgnu.la \
-lgalconfigfiles -lgalfits -lgalwcs -lgalcheckset -lgaltiming \
--lgallinkedlist -lgaltxtarrayvv
+-lgallinkedlist -lgaltxtarray
diff --git a/src/mkcatalog/mkcatalog.c b/src/mkcatalog/mkcatalog.c
index dacc664..af178c3 100644
--- a/src/mkcatalog/mkcatalog.c
+++ b/src/mkcatalog/mkcatalog.c
@@ -33,8 +33,8 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <gnuastro/wcs.h>
#include <gnuastro/fits.h>
#include <gnuastro/timing.h>
+#include <gnuastro/txtarray.h>
#include <gnuastro/neighbors.h>
-#include <gnuastro/txtarrayvv.h>
#include "main.h"
diff --git a/src/mkcatalog/ui.c b/src/mkcatalog/ui.c
index f1e7411..3af473e 100644
--- a/src/mkcatalog/ui.c
+++ b/src/mkcatalog/ui.c
@@ -35,7 +35,7 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <gnuastro/fits.h>
#include <gnuastro/timing.h> /* Includes time.h and sys/time.h */
#include <gnuastro/checkset.h>
-#include <gnuastro/txtarrayvv.h>
+#include <gnuastro/txtarray.h>
#include <gnuastro/commonargs.h>
#include <gnuastro/configfiles.h>
diff --git a/src/mknoise/ui.c b/src/mknoise/ui.c
index c410fa9..e1e6c87 100644
--- a/src/mknoise/ui.c
+++ b/src/mknoise/ui.c
@@ -35,7 +35,7 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <gnuastro/fits.h>
#include <gnuastro/timing.h> /* Includes time.h and sys/time.h */
#include <gnuastro/checkset.h>
-#include <gnuastro/txtarrayvv.h>
+#include <gnuastro/txtarray.h>
#include <gnuastro/commonargs.h>
#include <gnuastro/configfiles.h>
diff --git a/src/mkprof/Makefile.am b/src/mkprof/Makefile.am
index 475cdb9..c7839e9 100644
--- a/src/mkprof/Makefile.am
+++ b/src/mkprof/Makefile.am
@@ -28,9 +28,9 @@ bin_PROGRAMS = astmkprof
astmkprof_SOURCES = main.c main.h ui.c ui.h mkprof.c mkprof.h args.h \
oneprofile.c oneprofile.h profiles.c profiles.h cite.h
-astmkprof_LDADD = $(top_builddir)/bootstrapped/lib/libgnu.la \
--lgalconfigfiles -lgalfits -lgaltxtarrayvv -lgalcheckset -lgallinkedlist \
--lgaltiming -lgalthreads -lgalbox -lgalstatistics -lgalarraymanip \
+astmkprof_LDADD = $(top_builddir)/bootstrapped/lib/libgnu.la \
+-lgalconfigfiles -lgalfits -lgaltxtarray -lgalcheckset -lgallinkedlist \
+-lgaltiming -lgalthreads -lgalbox -lgalstatistics -lgalarraymanip \
-lgalqsort
diff --git a/src/mkprof/mkprof.c b/src/mkprof/mkprof.c
index 7b71fb2..77dfc67 100644
--- a/src/mkprof/mkprof.c
+++ b/src/mkprof/mkprof.c
@@ -34,9 +34,9 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <gnuastro/timing.h>
#include <gnuastro/threads.h>
#include <gnuastro/checkset.h>
+#include <gnuastro/txtarray.h>
#include <gnuastro/statistics.h>
#include <gnuastro/arraymanip.h>
-#include <gnuastro/txtarrayvv.h>
#include "main.h"
diff --git a/src/mkprof/ui.c b/src/mkprof/ui.c
index 919c83e..cf73f91 100644
--- a/src/mkprof/ui.c
+++ b/src/mkprof/ui.c
@@ -35,8 +35,8 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <gnuastro/fits.h>
#include <gnuastro/timing.h> /* Includes time.h and sys/time.h */
#include <gnuastro/checkset.h>
+#include <gnuastro/txtarray.h>
#include <gnuastro/statistics.h>
-#include <gnuastro/txtarrayvv.h>
#include <gnuastro/commonargs.h>
#include <gnuastro/configfiles.h>
diff --git a/src/noisechisel/ui.c b/src/noisechisel/ui.c
index 583bc34..7043f6e 100644
--- a/src/noisechisel/ui.c
+++ b/src/noisechisel/ui.c
@@ -35,7 +35,7 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <gnuastro/fits.h>
#include <gnuastro/timing.h> /* includes time.h and sys/time.h */
#include <gnuastro/checkset.h>
-#include <gnuastro/txtarrayvv.h>
+#include <gnuastro/txtarray.h>
#include <gnuastro/commonargs.h>
#include <gnuastro/arraymanip.h>
#include <gnuastro/statistics.h>
diff --git a/src/subtractsky/ui.c b/src/subtractsky/ui.c
index 7fe97a8..6fda917 100644
--- a/src/subtractsky/ui.c
+++ b/src/subtractsky/ui.c
@@ -35,7 +35,7 @@ along with Gnuastro. If not, see
<http://www.gnu.org/licenses/>.
#include <gnuastro/fits.h>
#include <gnuastro/timing.h> /* Includes time.h and sys/time.h */
#include <gnuastro/checkset.h>
-#include <gnuastro/txtarrayvv.h>
+#include <gnuastro/txtarray.h>
#include <gnuastro/statistics.h>
#include <gnuastro/arraymanip.h>
#include <gnuastro/commonargs.h>