Changeset 3684 for trunk/psLib/src/image

Timestamp:

Apr 8, 2005, 7:58:58 AM (21 years ago)

Author:

desonia

Message:

changed name of fileUtils to dataIO to better coorespond to the latest
SDRS.

Location:

trunk/psLib/src/image

Files:

• Makefile.am (modified) (1 diff)
• psImageExtraction.c (modified) (2 diffs)
• psImageStats.c (modified) (5 diffs)

trunk/psLib/src/image/Makefile.am

@@ -5 +5 @@
         -I$(top_srcdir)/src/collections \
         -I$(top_srcdir)/src/dataManip \
-        -I$(top_srcdir)/src/fileUtils \
+        -I$(top_srcdir)/src/dataIO \
         -I$(top_srcdir)/src/sysUtils \
         $(all_includes)

trunk/psLib/src/image/psImageExtraction.c

@@ -9 +9 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.34 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-04-07 20:27:41 $
+ *  @version $Revision: 1.35 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-04-08 17:58:57 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -428 +428 @@
         imgVec = psAlloc(sizeof(psVector));
         imgVec->type = in->type;
-        imgVec->n = imgVec->nalloc = numCols;
+        imgVec->n = *(int*)&imgVec->nalloc = numCols;
         if (mask != NULL) {
             maskVec = psAlloc(sizeof(psVector));
             maskVec->type = mask->type;
-            maskVec->n = maskVec->nalloc = numCols;
+            maskVec->n = *(int*)&maskVec->nalloc = numCols;
         }
         // recycle output to make a proper sized/type output structure

trunk/psLib/src/image/psImageStats.c

@@ -9 +9 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.70 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-03-24 19:39:53 $
+ *  @version $Revision: 1.71 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-04-08 17:58:57 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -61 +61 @@
         junkData = (psVector *) psAlloc(sizeof(psVector));
         junkData->type = in->type;
-        junkData->nalloc = in->numRows * in->numCols;
+        *(int*)&junkData->nalloc = in->numRows * in->numCols;
         junkData->n = junkData->nalloc;
         junkData->data.U8 = in->data.V[0];      // since psImage data is contiguous...
@@ -85 +85 @@
             junkMask = psAlloc(sizeof(psVector));
             junkMask->type = mask->type;
-            junkMask->nalloc = mask->numRows * mask->numCols;
+            *(int*)&junkMask->nalloc = mask->numRows * mask->numCols;
             junkMask->n = junkMask->nalloc;
             junkMask->data.U8 = mask->data.V[0];
@@ -134 +134 @@
         junkData = (psVector *) psAlloc(sizeof(psVector));
         junkData->type = in->type;
-        junkData->nalloc = in->numRows * in->numCols;
+        *(int*)&junkData->nalloc = in->numRows * in->numCols;
         junkData->n = junkData->nalloc;
         junkData->data.U8 = in->data.V[0];      // since psImage data is contiguous...
@@ -158 +158 @@
             junkMask = psAlloc(sizeof(psVector));
             junkMask->type = mask->type;
-            junkMask->nalloc = mask->numRows * mask->numCols;
+            *(int*)&junkMask->nalloc = mask->numRows * mask->numCols;
             junkMask->n = junkMask->nalloc;
             junkMask->data.U8 = mask->data.V[0];