changeset 433:4023ad64bae5

Removed check for DPR==1 when getting images (this applies only to data).
author neelin <neelin>
date Wed, 03 Nov 1993 17:16:19 +0000
parents 3347b1e80046
children 0971574073d6
files conversion/scxtominc/scx_file.c
diffstat 1 files changed, 7 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/conversion/scxtominc/scx_file.c
+++ b/conversion/scxtominc/scx_file.c
@@ -4,9 +4,12 @@
 @GLOBALS    : 
 @CREATED    : January 8, 1993 (Peter Neelin)
 @MODIFIED   : $Log: scx_file.c,v $
-@MODIFIED   : Revision 1.7  1993-10-06 10:15:46  neelin
-@MODIFIED   : Added include of memory.h for compilation on SUNs
+@MODIFIED   : Revision 1.8  1993-11-03 17:16:19  neelin
+@MODIFIED   : Removed check for DPR==1 when getting images (this applies only to data).
 @MODIFIED   :
+ * Revision 1.7  93/10/06  10:15:46  neelin
+ * Added include of memory.h for compilation on SUNs
+ * 
  * Revision 1.6  93/09/22  14:50:32  neelin
  * Added DTYP = 2 for short values in scx_get_image (this isn't documented,
  * but seems to occur for version 6 files sometimes).
@@ -30,7 +33,7 @@
 ---------------------------------------------------------------------------- */
 
 #ifndef lint
-static char rcsid[]="$Header: /private-cvsroot/minc/conversion/scxtominc/scx_file.c,v 1.7 1993-10-06 10:15:46 neelin Exp $";
+static char rcsid[]="$Header: /private-cvsroot/minc/conversion/scxtominc/scx_file.c,v 1.8 1993-11-03 17:16:19 neelin Exp $";
 #endif
 
 #include <stdlib.h>
@@ -377,7 +380,7 @@
 ---------------------------------------------------------------------------- */
 public int scx_get_image(scx_file *file, int image_num, short *image)
 {
-   long data_present, header_size, record_size, data_type;
+   long header_size, record_size, data_type;
    long image_width, image_pos, image_npix, image_size;
    long file_offset, array_offset, ipix;
    int pix_size;
@@ -386,12 +389,6 @@
    /* Check file pointer */
    if (file==NULL) return TRUE;
 
-   /* Check that data is in file */
-   if (scx_get_mnem(file, SCX_DPR, 0, &data_present, NULL, NULL) || 
-       (data_present!=1)) {
-      return TRUE;
-   }
-
    /* Parameters for calculating image position */
    if (scx_get_mnem(file, SCX_FHS, 0, &header_size, NULL, NULL) ||
        scx_get_mnem(file, SCX_REC, 0, &record_size, NULL, NULL) ||