Changeset 1406 for trunk/psLib/src/image

Timestamp:

Aug 6, 2004, 12:34:06 PM (22 years ago)

Author:

desonia

Message:

astyle fixed?

Location:

trunk/psLib/src/image

Files:

• psImage.c (modified) (1 diff)
• psImage.h (modified) (1 diff)
• psImageExtraction.c (modified) (5 diffs)
• psImageIO.c (modified) (1 diff)
• psImageManip.c (modified) (1 diff)
• psImageStats.c (modified) (1 diff)

trunk/psLib/src/image/psImage.c

@@ -9 +9 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.36 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-08-04 23:37:39 $
+ *  @version $Revision: 1.37 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-08-06 22:34:05 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii

trunk/psLib/src/image/psImage.h

@@ -11 +11 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.26 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-08-04 23:37:39 $
+ *  @version $Revision: 1.27 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-08-06 22:34:05 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii

trunk/psLib/src/image/psImageExtraction.c

@@ -9 +9 @@
 *  @author Robert DeSonia, MHPCC
 *
-*  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-08-06 21:50:13 $
+*  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-08-06 22:34:05 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -334 +334 @@
         if ( delta < 0 ) {
             outData += numCols - 1;
+            if (outPosition != NULL) {
+                outPosition += numCols - 1;
+            }
         }
 
@@ -362 +365 @@
                 *outData = statVal; \
                 if (outPosition != NULL) { \
-                    *(outPosition++) = col+c; \
+                    *outPosition = col+c; \
+                    outPosition += delta; \
                 } \
                 outData += delta; \
@@ -416 +420 @@
             if ( delta < 0 ) {
                 outData += numRows - 1;
+                if (outPosition != NULL) {
+                    outPosition += numRows - 1;
+                }
             }
 
@@ -428 +435 @@
                 *outData = statVal;
                 if (outPosition != NULL) {
-                    *(outPosition++) = row+r;
+                    *outPosition = row+r;
+                    outPosition += delta;
+                    \
                 }
                 outData += delta;

trunk/psLib/src/image/psImageIO.c

@@ -7 +7 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-08-04 23:37:39 $
+ *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-08-06 22:34:05 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii

trunk/psLib/src/image/psImageManip.c

@@ -10 +10 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-08-04 23:37:39 $
+ *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-08-06 22:34:05 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii

trunk/psLib/src/image/psImageStats.c

@@ -9 +9 @@
 *  @author George Gusciora, MHPCC
 *
-*  @version $Revision: 1.28 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-08-05 19:38:52 $
+*  @version $Revision: 1.29 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-08-06 22:34:05 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii