From 42b2ba35a5391ddacde71be3bef6c7ebcf824b3e Mon Sep 17 00:00:00 2001 From: Jeff Moe Date: Wed, 1 Jun 2022 19:35:18 -0600 Subject: [PATCH] qfits-6.2.0 --- qfits/AUTHORS | 4 +- qfits/configure | 20 +++++----- qfits/configure.ac | 2 +- qfits/html/annotated.html | 2 +- qfits/html/classes.html | 2 +- qfits/html/dir_000000.html | 2 +- qfits/html/dirs.html | 2 +- qfits/html/files.html | 2 +- qfits/html/functions.html | 2 +- qfits/html/functions_vars.html | 2 +- qfits/html/globals.html | 2 +- qfits/html/globals_enum.html | 2 +- qfits/html/globals_eval.html | 2 +- qfits/html/globals_func.html | 2 +- qfits/html/globals_type.html | 2 +- qfits/html/globals_vars.html | 2 +- qfits/html/group__qfits__cache.html | 2 +- qfits/html/group__qfits__filename.html | 2 +- qfits/html/group__qfits__header.html | 2 +- qfits/html/group__qfits__image.html | 2 +- qfits/html/group__qfits__md5.html | 6 +-- qfits/html/group__qfits__memory.html | 2 +- qfits/html/group__qfits__rw.html | 2 +- qfits/html/group__qfits__table.html | 2 +- qfits/html/group__qfits__time.html | 2 +- qfits/html/group__qfits__tools.html | 2 +- qfits/html/index.html | 4 +- qfits/html/modules.html | 2 +- qfits/html/qfits_8head.html | 2 +- qfits/html/qfits__cache_8c.html | 2 +- qfits/html/qfits__filename_8c.html | 2 +- qfits/html/qfits__header_8c.html | 2 +- qfits/html/qfits__image_8c.html | 2 +- qfits/html/qfits__md5_8c.html | 4 +- qfits/html/qfits__memory_8c.html | 2 +- qfits/html/qfits__rw_8c.html | 2 +- qfits/html/qfits__table_8c.html | 2 +- qfits/html/qfits__time_8c.html | 2 +- qfits/html/qfits__tools_8c.html | 2 +- qfits/html/struct__keytuple__.html | 2 +- qfits/html/struct__qfits__cache__cell__.html | 2 +- qfits/src/qfits_cache.c | 15 ++++--- qfits/src/qfits_header.c | 41 ++++++++++++++------ qfits/src/qfits_header.h | 17 ++++---- qfits/src/qfits_md5.c | 10 ++--- qfits/src/qfits_md5.h | 10 ++--- qfits/src/qfits_table.c | 14 +++---- qfits/test/test_pixio.c | 10 ++--- qfits/test/test_qfits.c | 10 ++--- 49 files changed, 131 insertions(+), 106 deletions(-) diff --git a/qfits/AUTHORS b/qfits/AUTHORS index b516ce7..23cc739 100644 --- a/qfits/AUTHORS +++ b/qfits/AUTHORS @@ -1,2 +1,2 @@ -Yves Jung yjung@eso.org - +Nicolas Devillard ndevilla@gmail.com Initial author +Yves Jung yjung@eso.org Maintainer since 2002 diff --git a/qfits/configure b/qfits/configure index 03929f1..14cde70 100755 --- a/qfits/configure +++ b/qfits/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for qfits 6.1.0. +# Generated by GNU Autoconf 2.59 for qfits 6.2.0. # # Report bugs to . # @@ -423,8 +423,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='qfits' PACKAGE_TARNAME='qfits' -PACKAGE_VERSION='6.1.0' -PACKAGE_STRING='qfits 6.1.0' +PACKAGE_VERSION='6.2.0' +PACKAGE_STRING='qfits 6.2.0' PACKAGE_BUGREPORT='yjung@eso.org' ac_unique_file="Makefile.am" @@ -962,7 +962,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures qfits 6.1.0 to adapt to many kinds of systems. +\`configure' configures qfits 6.2.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1028,7 +1028,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of qfits 6.1.0:";; + short | recursive ) echo "Configuration of qfits 6.2.0:";; esac cat <<\_ACEOF @@ -1177,7 +1177,7 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -qfits configure 6.1.0 +qfits configure 6.2.0 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1191,7 +1191,7 @@ cat >&5 <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by qfits $as_me 6.1.0, which was +It was created by qfits $as_me 6.2.0, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1830,7 +1830,7 @@ fi # Define the identity of the package. PACKAGE='qfits' - VERSION='6.1.0' + VERSION='6.2.0' cat >>confdefs.h <<_ACEOF @@ -21962,7 +21962,7 @@ _ASBOX } >&5 cat >&5 <<_CSEOF -This file was extended by qfits $as_me 6.1.0, which was +This file was extended by qfits $as_me 6.2.0, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -22025,7 +22025,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -qfits config.status 6.1.0 +qfits config.status 6.2.0 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff --git a/qfits/configure.ac b/qfits/configure.ac index 35068c4..6248085 100644 --- a/qfits/configure.ac +++ b/qfits/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT(qfits, 6.1.0, yjung@eso.org) +AC_INIT(qfits, 6.2.0, yjung@eso.org) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADER([config.h]) diff --git a/qfits/html/annotated.html b/qfits/html/annotated.html index 9ec88a7..08971ab 100644 --- a/qfits/html/annotated.html +++ b/qfits/html/annotated.html @@ -2,7 +2,7 @@ -QFITS Reference Manual 6.1.0 +QFITS Reference Manual 6.2.0 diff --git a/qfits/html/classes.html b/qfits/html/classes.html index e8df00b..a47c64d 100644 --- a/qfits/html/classes.html +++ b/qfits/html/classes.html @@ -2,7 +2,7 @@ -QFITS Reference Manual 6.1.0 +QFITS Reference Manual 6.2.0 diff --git a/qfits/html/dir_000000.html b/qfits/html/dir_000000.html index f3ef753..b0df7b9 100644 --- a/qfits/html/dir_000000.html +++ b/qfits/html/dir_000000.html @@ -2,7 +2,7 @@ -QFITS Reference Manual 6.1.0 +QFITS Reference Manual 6.2.0 diff --git a/qfits/html/dirs.html b/qfits/html/dirs.html index d0f3643..e6d50a0 100644 --- a/qfits/html/dirs.html +++ b/qfits/html/dirs.html @@ -2,7 +2,7 @@ -QFITS Reference Manual 6.1.0 +QFITS Reference Manual 6.2.0 diff --git a/qfits/html/files.html b/qfits/html/files.html index 6094359..b1a95bf 100644 --- a/qfits/html/files.html +++ b/qfits/html/files.html @@ -2,7 +2,7 @@ -QFITS Reference Manual 6.1.0 +QFITS Reference Manual 6.2.0 diff --git a/qfits/html/functions.html b/qfits/html/functions.html index 7292b5d..ca8cee5 100644 --- a/qfits/html/functions.html +++ b/qfits/html/functions.html @@ -2,7 +2,7 @@ -QFITS Reference Manual 6.1.0 +QFITS Reference Manual 6.2.0 diff --git a/qfits/html/functions_vars.html b/qfits/html/functions_vars.html index 89d0e83..7079599 100644 --- a/qfits/html/functions_vars.html +++ b/qfits/html/functions_vars.html @@ -2,7 +2,7 @@ -QFITS Reference Manual 6.1.0 +QFITS Reference Manual 6.2.0 diff --git a/qfits/html/globals.html b/qfits/html/globals.html index 1ba2f9f..7b351fc 100644 --- a/qfits/html/globals.html +++ b/qfits/html/globals.html @@ -2,7 +2,7 @@ -QFITS Reference Manual 6.1.0 +QFITS Reference Manual 6.2.0 diff --git a/qfits/html/globals_enum.html b/qfits/html/globals_enum.html index 0035bc0..5c1bf0d 100644 --- a/qfits/html/globals_enum.html +++ b/qfits/html/globals_enum.html @@ -2,7 +2,7 @@ -QFITS Reference Manual 6.1.0 +QFITS Reference Manual 6.2.0 diff --git a/qfits/html/globals_eval.html b/qfits/html/globals_eval.html index b8200ab..3319ee6 100644 --- a/qfits/html/globals_eval.html +++ b/qfits/html/globals_eval.html @@ -2,7 +2,7 @@ -QFITS Reference Manual 6.1.0 +QFITS Reference Manual 6.2.0 diff --git a/qfits/html/globals_func.html b/qfits/html/globals_func.html index 3b79738..e5d91b0 100644 --- a/qfits/html/globals_func.html +++ b/qfits/html/globals_func.html @@ -2,7 +2,7 @@ -QFITS Reference Manual 6.1.0 +QFITS Reference Manual 6.2.0 diff --git a/qfits/html/globals_type.html b/qfits/html/globals_type.html index 004ab97..a132f47 100644 --- a/qfits/html/globals_type.html +++ b/qfits/html/globals_type.html @@ -2,7 +2,7 @@ -QFITS Reference Manual 6.1.0 +QFITS Reference Manual 6.2.0 diff --git a/qfits/html/globals_vars.html b/qfits/html/globals_vars.html index 8042e87..87933cc 100644 --- a/qfits/html/globals_vars.html +++ b/qfits/html/globals_vars.html @@ -2,7 +2,7 @@ -QFITS Reference Manual 6.1.0 +QFITS Reference Manual 6.2.0 diff --git a/qfits/html/group__qfits__cache.html b/qfits/html/group__qfits__cache.html index 72aa0f0..5518ba2 100644 --- a/qfits/html/group__qfits__cache.html +++ b/qfits/html/group__qfits__cache.html @@ -2,7 +2,7 @@ -QFITS Reference Manual 6.1.0 +QFITS Reference Manual 6.2.0 diff --git a/qfits/html/group__qfits__filename.html b/qfits/html/group__qfits__filename.html index 16fd2de..20457f6 100644 --- a/qfits/html/group__qfits__filename.html +++ b/qfits/html/group__qfits__filename.html @@ -2,7 +2,7 @@ -QFITS Reference Manual 6.1.0 +QFITS Reference Manual 6.2.0 diff --git a/qfits/html/group__qfits__header.html b/qfits/html/group__qfits__header.html index f80acbf..4f94a7a 100644 --- a/qfits/html/group__qfits__header.html +++ b/qfits/html/group__qfits__header.html @@ -2,7 +2,7 @@ -QFITS Reference Manual 6.1.0 +QFITS Reference Manual 6.2.0 diff --git a/qfits/html/group__qfits__image.html b/qfits/html/group__qfits__image.html index 687c903..4f830e2 100644 --- a/qfits/html/group__qfits__image.html +++ b/qfits/html/group__qfits__image.html @@ -2,7 +2,7 @@ -QFITS Reference Manual 6.1.0 +QFITS Reference Manual 6.2.0 diff --git a/qfits/html/group__qfits__md5.html b/qfits/html/group__qfits__md5.html index 8ef3703..3670972 100644 --- a/qfits/html/group__qfits__md5.html +++ b/qfits/html/group__qfits__md5.html @@ -2,7 +2,7 @@ -QFITS Reference Manual 6.1.0 +QFITS Reference Manual 6.2.0 @@ -13,7 +13,7 @@

FITS data block MD5 computation routine

- +

Functions

char * qfits_datamd5 (const char *filename)
const char * qfits_datamd5 (const char *filename)
 Compute the MD5 hash of data zones in a FITS file.
@@ -25,7 +25,7 @@ This module offers MD5 computation over all data areas of a FITS file.

F - + diff --git a/qfits/html/group__qfits__memory.html b/qfits/html/group__qfits__memory.html index 95f2d01..f9ec47b 100644 --- a/qfits/html/group__qfits__memory.html +++ b/qfits/html/group__qfits__memory.html @@ -2,7 +2,7 @@ -QFITS Reference Manual 6.1.0 +QFITS Reference Manual 6.2.0 diff --git a/qfits/html/group__qfits__rw.html b/qfits/html/group__qfits__rw.html index af6a5e8..30fad9c 100644 --- a/qfits/html/group__qfits__rw.html +++ b/qfits/html/group__qfits__rw.html @@ -2,7 +2,7 @@ -QFITS Reference Manual 6.1.0 +QFITS Reference Manual 6.2.0 diff --git a/qfits/html/group__qfits__table.html b/qfits/html/group__qfits__table.html index 2af6b5d..a17fe5b 100644 --- a/qfits/html/group__qfits__table.html +++ b/qfits/html/group__qfits__table.html @@ -2,7 +2,7 @@ -QFITS Reference Manual 6.1.0 +QFITS Reference Manual 6.2.0 diff --git a/qfits/html/group__qfits__time.html b/qfits/html/group__qfits__time.html index 90024ba..d767524 100644 --- a/qfits/html/group__qfits__time.html +++ b/qfits/html/group__qfits__time.html @@ -2,7 +2,7 @@ -QFITS Reference Manual 6.1.0 +QFITS Reference Manual 6.2.0 diff --git a/qfits/html/group__qfits__tools.html b/qfits/html/group__qfits__tools.html index d830465..47ecdd7 100644 --- a/qfits/html/group__qfits__tools.html +++ b/qfits/html/group__qfits__tools.html @@ -2,7 +2,7 @@ -QFITS Reference Manual 6.1.0 +QFITS Reference Manual 6.2.0 diff --git a/qfits/html/index.html b/qfits/html/index.html index 660356e..0243f55 100644 --- a/qfits/html/index.html +++ b/qfits/html/index.html @@ -2,7 +2,7 @@ -QFITS Reference Manual 6.1.0 +QFITS Reference Manual 6.2.0 @@ -12,7 +12,7 @@

qfits Reference manual

-

6.1.0

+

6.2.0

Introduction

qfits is a stand-alone library written in C to interact with files complying with the FITS format. It is fast and portable over any kind of POSIX-compliant platform.

diff --git a/qfits/html/modules.html b/qfits/html/modules.html index b183f93..683032b 100644 --- a/qfits/html/modules.html +++ b/qfits/html/modules.html @@ -2,7 +2,7 @@ -QFITS Reference Manual 6.1.0 +QFITS Reference Manual 6.2.0 diff --git a/qfits/html/qfits_8head.html b/qfits/html/qfits_8head.html index fc197bd..f09db60 100644 --- a/qfits/html/qfits_8head.html +++ b/qfits/html/qfits_8head.html @@ -2,7 +2,7 @@ -QFITS Reference Manual 6.1.0 +QFITS Reference Manual 6.2.0 diff --git a/qfits/html/qfits__cache_8c.html b/qfits/html/qfits__cache_8c.html index 395c1e3..1fa85d2 100644 --- a/qfits/html/qfits__cache_8c.html +++ b/qfits/html/qfits__cache_8c.html @@ -2,7 +2,7 @@ -QFITS Reference Manual 6.1.0 +QFITS Reference Manual 6.2.0 diff --git a/qfits/html/qfits__filename_8c.html b/qfits/html/qfits__filename_8c.html index cd92532..28c86c2 100644 --- a/qfits/html/qfits__filename_8c.html +++ b/qfits/html/qfits__filename_8c.html @@ -2,7 +2,7 @@ -QFITS Reference Manual 6.1.0 +QFITS Reference Manual 6.2.0 diff --git a/qfits/html/qfits__header_8c.html b/qfits/html/qfits__header_8c.html index a031404..b56879e 100644 --- a/qfits/html/qfits__header_8c.html +++ b/qfits/html/qfits__header_8c.html @@ -2,7 +2,7 @@ -QFITS Reference Manual 6.1.0 +QFITS Reference Manual 6.2.0 diff --git a/qfits/html/qfits__image_8c.html b/qfits/html/qfits__image_8c.html index e8fed5d..d285eec 100644 --- a/qfits/html/qfits__image_8c.html +++ b/qfits/html/qfits__image_8c.html @@ -2,7 +2,7 @@ -QFITS Reference Manual 6.1.0 +QFITS Reference Manual 6.2.0 diff --git a/qfits/html/qfits__md5_8c.html b/qfits/html/qfits__md5_8c.html index d973fb8..c8ccc51 100644 --- a/qfits/html/qfits__md5_8c.html +++ b/qfits/html/qfits__md5_8c.html @@ -2,7 +2,7 @@ -QFITS Reference Manual 6.1.0 +QFITS Reference Manual 6.2.0 @@ -15,7 +15,7 @@

qfits_md5.c File Reference

char* qfits_datamd5 const char* qfits_datamd5 (  const char *  filename
- +

Functions

char * qfits_datamd5 (const char *filename)
const char * qfits_datamd5 (const char *filename)
 Compute the MD5 hash of data zones in a FITS file.
diff --git a/qfits/html/qfits__memory_8c.html b/qfits/html/qfits__memory_8c.html index 6ba967e..9616c81 100644 --- a/qfits/html/qfits__memory_8c.html +++ b/qfits/html/qfits__memory_8c.html @@ -2,7 +2,7 @@ -QFITS Reference Manual 6.1.0 +QFITS Reference Manual 6.2.0 diff --git a/qfits/html/qfits__rw_8c.html b/qfits/html/qfits__rw_8c.html index 3338b83..7db485b 100644 --- a/qfits/html/qfits__rw_8c.html +++ b/qfits/html/qfits__rw_8c.html @@ -2,7 +2,7 @@ -QFITS Reference Manual 6.1.0 +QFITS Reference Manual 6.2.0 diff --git a/qfits/html/qfits__table_8c.html b/qfits/html/qfits__table_8c.html index fcc3733..61b7a38 100644 --- a/qfits/html/qfits__table_8c.html +++ b/qfits/html/qfits__table_8c.html @@ -2,7 +2,7 @@ -QFITS Reference Manual 6.1.0 +QFITS Reference Manual 6.2.0 diff --git a/qfits/html/qfits__time_8c.html b/qfits/html/qfits__time_8c.html index 2645e97..ea22c63 100644 --- a/qfits/html/qfits__time_8c.html +++ b/qfits/html/qfits__time_8c.html @@ -2,7 +2,7 @@ -QFITS Reference Manual 6.1.0 +QFITS Reference Manual 6.2.0 diff --git a/qfits/html/qfits__tools_8c.html b/qfits/html/qfits__tools_8c.html index 113802c..c96e84f 100644 --- a/qfits/html/qfits__tools_8c.html +++ b/qfits/html/qfits__tools_8c.html @@ -2,7 +2,7 @@ -QFITS Reference Manual 6.1.0 +QFITS Reference Manual 6.2.0 diff --git a/qfits/html/struct__keytuple__.html b/qfits/html/struct__keytuple__.html index 2abfe45..92f79c1 100644 --- a/qfits/html/struct__keytuple__.html +++ b/qfits/html/struct__keytuple__.html @@ -2,7 +2,7 @@ -QFITS Reference Manual 6.1.0 +QFITS Reference Manual 6.2.0 diff --git a/qfits/html/struct__qfits__cache__cell__.html b/qfits/html/struct__qfits__cache__cell__.html index a79e61a..89dcf67 100644 --- a/qfits/html/struct__qfits__cache__cell__.html +++ b/qfits/html/struct__qfits__cache__cell__.html @@ -2,7 +2,7 @@ -QFITS Reference Manual 6.1.0 +QFITS Reference Manual 6.2.0 diff --git a/qfits/src/qfits_cache.c b/qfits/src/qfits_cache.c index 782f0d8..f0c7b46 100644 --- a/qfits/src/qfits_cache.c +++ b/qfits/src/qfits_cache.c @@ -1,4 +1,4 @@ -/* $Id: qfits_cache.c,v 1.10 2006/02/23 10:52:20 yjung Exp $ +/* $Id: qfits_cache.c,v 1.12 2006/12/04 15:34:48 yjung Exp $ * * This file is part of the ESO QFITS Library * Copyright (C) 2001-2004 European Southern Observatory @@ -20,9 +20,9 @@ /* * $Author: yjung $ - * $Date: 2006/02/23 10:52:20 $ - * $Revision: 1.10 $ - * $Name: qfits-6_1_0 $ + * $Date: 2006/12/04 15:34:48 $ + * $Revision: 1.12 $ + * $Name: qfits-6_2_0 $ */ /*----------------------------------------------------------------------------- @@ -69,7 +69,7 @@ * grow much larger than a predictable value, the best solution is to * implement a dynamic memory allocation in qfits_cache_add. */ -#define QFITS_MAX_EXTS 128 +#define QFITS_MAX_EXTS 10192 /*----------------------------------------------------------------------------- New types @@ -650,6 +650,11 @@ static int qfits_cache_add(const char * filename) /* Close file */ fclose(in); + /* Check last */ + if (last >= QFITS_MAX_EXTS) { + return -1 ; + } + /* Allocate buffers in cache */ qc->ohdr = qfits_malloc(last * sizeof(int)); qc->data = qfits_malloc(last * sizeof(int)); diff --git a/qfits/src/qfits_header.c b/qfits/src/qfits_header.c index a881db3..d67ea29 100644 --- a/qfits/src/qfits_header.c +++ b/qfits/src/qfits_header.c @@ -1,4 +1,4 @@ -/* $Id: qfits_header.c,v 1.9 2006/02/23 10:59:03 yjung Exp $ +/* $Id: qfits_header.c,v 1.10 2006/11/22 13:33:42 yjung Exp $ * * This file is part of the ESO QFITS Library * Copyright (C) 2001-2004 European Southern Observatory @@ -20,9 +20,9 @@ /* * $Author: yjung $ - * $Date: 2006/02/23 10:59:03 $ - * $Revision: 1.9 $ - * $Name: qfits-6_1_0 $ + * $Date: 2006/11/22 13:33:42 $ + * $Revision: 1.10 $ + * $Name: qfits-6_2_0 $ */ /*----------------------------------------------------------------------------- @@ -184,6 +184,10 @@ qfits_header * qfits_header_new(void) h->first = NULL ; h->last = NULL ; h->n = 0 ; + + h->current = NULL ; + h->current_idx = -1 ; + return h; } @@ -634,19 +638,32 @@ int qfits_header_getitem( char * com, char * lin) { - keytuple * k ; - int count ; + keytuple * k ; + int count ; if (hdr==NULL) return -1 ; if (key==NULL && val==NULL && com==NULL && lin==NULL) return 0 ; if (idx<0 || idx>hdr->n) return -1 ; - count=0 ; - k = (keytuple*)hdr->first ; - while (countnext ; - count++ ; - } + /* Get pointer to keytuple */ + if (idx == 0) { + ((qfits_header *)hdr)->current_idx = 0 ; + ((qfits_header *)hdr)->current = hdr->first ; + k = hdr->current ; + } else if (idx == hdr->current_idx + 1) { + ((qfits_header *)hdr)->current = ((keytuple*) (hdr->current))->next ; + ((qfits_header *)hdr)->current_idx++ ; + k = hdr->current ; + } else { + count=0 ; + k = (keytuple*)hdr->first ; + while (countnext ; + count++ ; + } + } + + /* Fill return values */ if (key!=NULL) strcpy(key, k->key); if (val!=NULL) { if (k->val!=NULL) strcpy(val, k->val); diff --git a/qfits/src/qfits_header.h b/qfits/src/qfits_header.h index 76d430b..c105f56 100644 --- a/qfits/src/qfits_header.h +++ b/qfits/src/qfits_header.h @@ -1,4 +1,4 @@ -/* $Id: qfits_header.h,v 1.7 2006/02/20 09:45:25 yjung Exp $ +/* $Id: qfits_header.h,v 1.8 2006/11/22 13:33:42 yjung Exp $ * * This file is part of the ESO QFITS Library * Copyright (C) 2001-2004 European Southern Observatory @@ -20,9 +20,9 @@ /* * $Author: yjung $ - * $Date: 2006/02/20 09:45:25 $ - * $Revision: 1.7 $ - * $Name: qfits-6_1_0 $ + * $Date: 2006/11/22 13:33:42 $ + * $Revision: 1.8 $ + * $Name: qfits-6_2_0 $ */ #ifndef QFITS_HEADER_H @@ -52,9 +52,12 @@ */ /*----------------------------------------------------------------------------*/ typedef struct qfits_header { - void * first ; /* Pointer to list start */ - void * last ; /* Pointer to list end */ - int n ; /* Number of cards in list */ + void * first ; /* Pointer to list start */ + void * last ; /* Pointer to list end */ + int n ; /* Number of cards in list */ + /* For efficient looping internally */ + void * current ; + int current_idx ; } qfits_header ; /*----------------------------------------------------------------------------- diff --git a/qfits/src/qfits_md5.c b/qfits/src/qfits_md5.c index 5887cc7..5bab342 100644 --- a/qfits/src/qfits_md5.c +++ b/qfits/src/qfits_md5.c @@ -1,4 +1,4 @@ -/* $Id: qfits_md5.c,v 1.8 2006/02/20 09:45:25 yjung Exp $ +/* $Id: qfits_md5.c,v 1.9 2007/01/10 08:53:45 yjung Exp $ * * This file is part of the ESO QFITS Library * Copyright (C) 2001-2004 European Southern Observatory @@ -20,9 +20,9 @@ /* * $Author: yjung $ - * $Date: 2006/02/20 09:45:25 $ - * $Revision: 1.8 $ - * $Name: qfits-6_1_0 $ + * $Date: 2007/01/10 08:53:45 $ + * $Revision: 1.9 $ + * $Name: qfits-6_2_0 $ */ /*----------------------------------------------------------------------------- @@ -78,7 +78,7 @@ of error. */ /*----------------------------------------------------------------------------*/ -char * qfits_datamd5(const char * filename) +const char * qfits_datamd5(const char * filename) { static char datamd5[MD5HASHSZ+1] ; struct MD5Context ctx ; diff --git a/qfits/src/qfits_md5.h b/qfits/src/qfits_md5.h index 3adaa31..b017b5d 100644 --- a/qfits/src/qfits_md5.h +++ b/qfits/src/qfits_md5.h @@ -1,4 +1,4 @@ -/* $Id: qfits_md5.h,v 1.5 2006/02/20 09:45:25 yjung Exp $ +/* $Id: qfits_md5.h,v 1.6 2007/01/10 08:53:45 yjung Exp $ * * This file is part of the ESO QFITS Library * Copyright (C) 2001-2004 European Southern Observatory @@ -20,9 +20,9 @@ /* * $Author: yjung $ - * $Date: 2006/02/20 09:45:25 $ - * $Revision: 1.5 $ - * $Name: qfits-6_1_0 $ + * $Date: 2007/01/10 08:53:45 $ + * $Revision: 1.6 $ + * $Name: qfits-6_2_0 $ */ #ifndef QFITS_MD5_H @@ -40,6 +40,6 @@ Function ANSI prototypes -----------------------------------------------------------------------------*/ -char * qfits_datamd5(const char *) ; +const char * qfits_datamd5(const char *) ; #endif diff --git a/qfits/src/qfits_table.c b/qfits/src/qfits_table.c index 56f2e29..db3c23a 100644 --- a/qfits/src/qfits_table.c +++ b/qfits/src/qfits_table.c @@ -1,4 +1,4 @@ -/* $Id: qfits_table.c,v 1.19 2006/03/15 15:13:15 yjung Exp $ +/* $Id: qfits_table.c,v 1.20 2007/01/10 12:24:45 yjung Exp $ * * This file is part of the ESO QFITS Library * Copyright (C) 2001-2004 European Southern Observatory @@ -20,9 +20,9 @@ /* * $Author: yjung $ - * $Date: 2006/03/15 15:13:15 $ - * $Revision: 1.19 $ - * $Name: qfits-6_1_0 $ + * $Date: 2007/01/10 12:24:45 $ + * $Revision: 1.20 $ + * $Name: qfits-6_2_0 $ */ /*----------------------------------------------------------------------------- @@ -1472,9 +1472,9 @@ int qfits_save_table_hdrdump( const qfits_table * table, const qfits_header * fh) { - FILE * outfile ; - char * md5hash ; - char md5card[81]; + FILE * outfile ; + const char * md5hash ; + char md5card[81]; /* Open the destination file */ if ((outfile = fopen(table->filename, "w")) == NULL) { diff --git a/qfits/test/test_pixio.c b/qfits/test/test_pixio.c index 8c1ce23..46e3a14 100644 --- a/qfits/test/test_pixio.c +++ b/qfits/test/test_pixio.c @@ -1,4 +1,4 @@ -/* $Id: test_pixio.c,v 1.8 2006/02/23 11:33:15 yjung Exp $ +/* $Id: test_pixio.c,v 1.9 2007/01/10 12:29:58 yjung Exp $ * * This file is part of the ESO QFITS Library * Copyright (C) 2001-2004 European Southern Observatory @@ -20,9 +20,9 @@ /* * $Author: yjung $ - * $Date: 2006/02/23 11:33:15 $ - * $Revision: 1.8 $ - * $Name: qfits-6_1_0 $ + * $Date: 2007/01/10 12:29:58 $ + * $Revision: 1.9 $ + * $Name: qfits-6_2_0 $ */ /*--------------------------------------------------------------------------- @@ -161,7 +161,7 @@ static int test_dumpdatasets(void) char * ptype_name ; qfitsdumper qd ; int i ; - char * datamd5 ; + const char * datamd5 ; err = 0 ; qd.npix = TEST_NPIX ; diff --git a/qfits/test/test_qfits.c b/qfits/test/test_qfits.c index 2c19ca7..ac22a7b 100644 --- a/qfits/test/test_qfits.c +++ b/qfits/test/test_qfits.c @@ -1,4 +1,4 @@ -/* $Id: test_qfits.c,v 1.14 2006/02/23 11:33:15 yjung Exp $ +/* $Id: test_qfits.c,v 1.15 2007/01/10 12:29:58 yjung Exp $ * * This file is part of the ESO QFITS Library * Copyright (C) 2001-2004 European Southern Observatory @@ -20,9 +20,9 @@ /* * $Author: yjung $ - * $Date: 2006/02/23 11:33:15 $ - * $Revision: 1.14 $ - * $Name: qfits-6_1_0 $ + * $Date: 2007/01/10 12:29:58 $ + * $Revision: 1.15 $ + * $Name: qfits-6_2_0 $ */ /*----------------------------------------------------------------------------- @@ -481,7 +481,7 @@ int test_qfits_filecreate_ext(char * filename) qfits_header* qh ; qfitsdumper qd ; FILE * out ; - char * sig ; + const char * sig ; say("-----> File with multiple extensions"); /* Create minimal FITS header for main */