Context Navigation

Changeset 29537

Timestamp:

Oct 25, 2010, 12:36:40 PM (16 years ago)

Author:

eugene

Message:

merge changes from eam_branches/ipp-20100823

Location:

trunk/Ohana/src

Files:

-              r27579
+              r29537
 $(ASRC)/cmf-ps1-v1.$(ARCH).o \
 $(ASRC)/cmf-ps1-v2.$(ARCH).o \
+$(ASRC)/cmf-ps1-v3.$(ARCH).o \
 $(ASRC)/cmf-smpdata.$(ARCH).o \
 $(ASRC)/getstar-ps1-dev-0.$(ARCH).o \
 …
 $(AINC)/cmf-ps1-v1.h \
 $(AINC)/cmf-ps1-v2.h \
+$(AINC)/cmf-ps1-v3.h \
 $(AINC)/cmf-smpdata.h \
 $(AINC)/getstar-ps1-dev-0.h \

-              r29001
+              r29537
+}
-$STRUCT *gfits_downsize_and_convert_$STRUCT ($STRUCT *data, off_t size, off_t nitems) {
-  off_t i;
-  unsigned char *byte, tmp;
-  $STRUCT *output;
-  if ($SIZE > size) {
-    fprintf (stderr, "ERROR: uncorrectable mismatch in data types $STRUCT: "OFF_T_FMT" vs %d\n",  size,  $SIZE);
-    exit (1);
+  }
-  // allocate a new array
-  ALLOCATE (output, $STRUCT, nitems);
-  for (i = 0; i < nitems; i++) {
-    memcpy (&output[i], &data[i], $SIZE);
+  }
-  /* provide initial values to avoid compiler warnings for non-BYTE_SWAP arch */
-  i = tmp = 0;
-  byte = NULL;
-# ifdef BYTE_SWAP
-  byte = (unsigned char *) output;
-  for (i = 0; i < nitems; i++, byte += size) {
-    /** BYTE SWAP **/
+  }
-# endif
-  return (output);
+}
 /*** add test of EXTNAME and header-defined columns? ***/
 /* return internal structure representation */
 …
   int Ncols;
   $STRUCT *data, *output;
+  $STRUCT *data;
   Ncols = ftable[0].header[0].Naxis[0];
 …
   if ((swapped == NULL) || (*swapped == FALSE)) {
     if (!gfits_convert_$STRUCT (data, sizeof ($STRUCT), *Ndata)) {
+      output = gfits_downsize_and_convert_$STRUCT (data, sizeof ($STRUCT), *Ndata);
+      free (ftable[0].buffer);
+      ftable[0].buffer = (char *) output;
+      // XXX do I need to change NX?
+      return NULL;
+    }
     gfits_table_scale_data (ftable);

-              r29001
+              r29537
 # include "dvo.h"
+/* if we are not correctly including the ohana headers, this will fail */
+# ifndef BYTE_SWAP
+# ifndef NOT_BYTE_SWAP
+# error "neither BYTE_SWAP not NOT_BYTE_SWAP is set"
+# endif
+# endif
 CMF_PS1_V2 *gfits_table_get_CMF_PS1_V1_Alt (FTable *ftable, off_t *Ndata, char *swapped) {

-              r27435
+              r29537
   if (header[0].buffer == NULL) return NULL;
+  // regular keywords cannot be larger than 8 chars (use HIERARCH instead)
+  if (strlen(field) > 8) return NULL;
   /* create a blank-padded keyword with exactly 8 characters */

r28241	r29537
13	13	# endif
14	14
	15	/* if we are not correctly including the ohana headers, this will fail */
15	16	# ifndef NEWLINE
16	17	# define NEWLINE 10 /* UNIX RETURN character */

-              r27790
+              r29537
 # include <png.h>
 # include <dvo.h>
+/* if we are not correctly including the ohana headers, this will fail */
+# ifndef BYTE_SWAP
+# ifndef NOT_BYTE_SWAP
+# error "neither BYTE_SWAP not NOT_BYTE_SWAP is set"
+# endif
+# endif
 typedef struct sockaddr_in KapaSockAddress;

-              r5854
+              r29537
 static RotFont *currentfont;
+static int RotFontInited = FALSE;
 void InitRotFonts () {
   int i, Nhardwired;
+  if (RotFontInited) return;
+  RotFontInited = TRUE;
   Nhardwired = sizeof (HardwiredFonts) / sizeof (FontSet);
 …
   int i, nsize, msize, bsize, bigger, dsize, match, good;
+  InitRotFonts();
   bigger = good = match = -1;
 …
 char *GetRotFont (int *size) {
+  InitRotFonts();
   *size = currentsize;
   return (currentname);
 …
 RotFont *GetRotFontData (double *scale) {
+  InitRotFonts();
   *scale = currentscale;
   return (currentfont);
 …
   double scale;
+  InitRotFonts();
   scale = currentscale;

-              r5999
+              r29537
 # include <kapa_internal.h>
+// XXX we can get rid of these static vars by making them elements of the bDrawBuffer
+//
 static int bWeight;

-              r28645
+              r29537
 };
+/* note: in the Ohana tree, the byte order is determined by the ARCH variable
+   if you have a small endian machine that is not listed here, the test
+   program 'typestest' should fail */
+/* Some notes on the Ohana BYTE_SWAP macros:
+) BYTE_SWAP is set in this file based on the environment variable 'ARCH', which is in turn
+   set by the psconfig system (or is set manually by the builder).
+) BYTE_SWAP is only used when building the Ohana tree: code which links against Ohana
+   (eg, libkapa or others) does not need to have this value correctly set.
+) the libohana build tests for the validity of the BYTE_SWAP choice by running the test
+   program 'typestest' and raising an error if the tests fail.
+) if your build fails due to the typestest program, check your value of 'ARCH' and if
+   necessary add it to the list below.
+*/
 # ifndef BYTE_SWAP
 # ifdef linux
 …
 # define BYTE_SWAP
 # endif
+# else
+# endif /* BYTE_SWAP */
+/* other Ohana components use these two values to check that ohana.h was correctly included */
+# ifndef BYTE_SWAP
 # define NOT_BYTE_SWAP
 # endif /* BYTE_SWAP */
+# endif
 # ifndef NAN

-              r27435
+              r29537
   tmp = byte[X+2]; byte[X+2] = byte[X+5]; byte[X+5] = tmp; \
   tmp = byte[X+3]; byte[X+3] = byte[X+4]; byte[X+4] = tmp;
-/** this is also used in libautocode/def/common.h -- consolidate **/
-# ifdef linux
-# define BYTE_SWAP
-# endif
-# ifdef sid
-# define BYTE_SWAP
-# endif
-# ifdef dec
-# define BYTE_SWAP
-# endif
 /* add other architectures here, ie dec, alpha, etc */

Note: See TracChangeset for help on using the changeset viewer.