Changeset 1396

Timestamp:

Aug 5, 2004, 11:06:22 AM (22 years ago)

Author:

harman

Message:

Merge problems

Location:

trunk/psLib/src

Files:

• astronomy/psMetadata.c (modified) (2 diffs)
• collections/psMetadata.c (modified) (2 diffs)
• types/psMetadata.c (modified) (2 diffs)

trunk/psLib/src/astronomy/psMetadata.c

@@ -11 +11 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-08-05 20:55:16 $
+*  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-08-05 21:06:22 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -48 +48 @@
 }                                                                                                        \
 return output;
+
+/** Maximum size of a FITS line */
+#define FITS_LINE_SIZE 80
+
+/** Maximum size of a string */
+#define MAX_STRING_LENGTH 1024
 
 /******************************************************************************/

trunk/psLib/src/collections/psMetadata.c

@@ -11 +11 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-08-05 20:55:16 $
+*  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-08-05 21:06:22 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -48 +48 @@
 }                                                                                                        \
 return output;
+
+/** Maximum size of a FITS line */
+#define FITS_LINE_SIZE 80
+
+/** Maximum size of a string */
+#define MAX_STRING_LENGTH 1024
 
 /******************************************************************************/

trunk/psLib/src/types/psMetadata.c

@@ -11 +11 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-08-05 20:55:16 $
+*  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-08-05 21:06:22 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -48 +48 @@
 }                                                                                                        \
 return output;
+
+/** Maximum size of a FITS line */
+#define FITS_LINE_SIZE 80
+
+/** Maximum size of a string */
+#define MAX_STRING_LENGTH 1024
 
 /******************************************************************************/