Change to use signed 64 bit ints for HDS dimensions

This needs to be done since the main point of the move to HDS-V5 is to
allow starlink apps to process arrays with more than 2^32 pixels. Since
the ARY library standardly vectorises each N-D arrray and then accesses
it as a 1D array, individual axis dimensions can also be greater than
2^32. They need to be signed since hdsdim will also be used for ARY/NDF
bounds, which can be negative.

Author: David Berry

Makefile.am

@@ -145,6 +145,7 @@ dat1CreateStructureCell.c \
 dat1CvtChar.c \
 dat1CvtLogical.c \
 dat1DumpLoc.c \
+dat1emsSetHdsdim.c \
 dat1EncodeSubscript.c \
 dat1EraseHandle.c \
 dat1ExportDims.c \

dat1ImportFloc.c

@@ -20,7 +20,7 @@
 *    len = int (Given)
 *       Size of Fortran character buffer. Sanity check.
 *    status = int * (Given and Returned)
-*       Inherited status. Attempts to execute even if status is not DAT__OK
+*       Inherited status. Attempts to execute even if status is not SAI__OK
 *       on entry.
 
 *  Returned Value:

hds1.h

@@ -13,4 +13,12 @@
 #define MEM_REALLOC starRealloc
 #define MEM_CALLOC  starCalloc
 
+/* EMS wrapper routines:*/
+/* =====================*/
+#include "hds_types.h"
+void dat1emsSetHdsdim( const char * token, hdsdim value );
+
+
+
+
 #endif

hds1_types.h

@@ -44,11 +44,11 @@ typedef uint64_t hdsu64_t;
 
 /* Private types and sizes relating to dimensions */
 typedef int FORTRAN_INDEX_TYPE;
-#define SIZEOF_HDSDIM 4
+#define SIZEOF_HDSDIM 8
 #define HDSDIM_IS_UNSIGNED 0
 
 /* Decide whether Fortran dims should be copied element by element */
-#define HDS_COPY_FORTRAN_DIMS 0
+#define HDS_COPY_FORTRAN_DIMS 1
 
 #endif /* _INCLUDED */
 

hds_fortran.h

@@ -85,7 +85,7 @@ hdsDimF2C( int ndim, const F77_INTEGER_TYPE fdims[],
 #define HDSDIM2INT( subname, cint, fint, status )			\
   if ( cint > (hdsdim)INT_MAX ) {					\
     fint = 0;								\
-    if (*status == DAT__OK) {						\
+    if (*status == SAI__OK) {						\
       *status = DAT__DTRNC;						\
       dat1emsSetHdsdim( "DIM", cint );					\
       emsRep( " ",							\

make-hds-types.c

@@ -44,6 +44,10 @@
  *        Use inttypes.h in preference to stdint.h.
  *     2006-Jul-25 (PWD):
  *        More fixes for MINGW handling of "long long" printfs.
+ *     2017-Sep-12 (DSB):
+ *        Switch HDS dimensiosn to signed 64 bit integers. They need to be 
+ *        signed since they will also be used for ARY/NDF array bounds, which 
+ *        can be nagative.
 
  *  Copyright:
  *     Copyright (C) 2005 Particle Physics and Astronomy Research Council.
@@ -138,12 +142,12 @@ error unable to find an 8 byte integer type
 /* We also state whether this is unsigned so that we can compare with
    the fortran type and also define the size. The last bit is a bit of
    a kluge to prevent sizeof("uint64_t") coming up with  9 */
-#define BIGDIM 0   /* set to 1 if testing 64 bit dims */
+#define BIGDIM 1   /* set to 1 if testing 64 bit dims */
 #if BIGDIM
-#define DIM_TYPE UINT_BIG
+#define DIM_TYPE INT_BIG
 #define SIZEOF_DIM 8
-#define DIM_FORMAT INT_BIG_U
-#define DIM_IS_UNSIGNED 1
+#define DIM_FORMAT INT_BIG_S
+#define DIM_IS_UNSIGNED 0
 #else
 #define DIM_TYPE STD_INT
 #define SIZEOF_DIM 4