Changeset 746 for trunk/psLib/src/image/psImage.c

Timestamp:

May 19, 2004, 3:49:47 PM (22 years ago)

Author:

desonia

Message:

format tweaks.

File:

• trunk/psLib/src/image/psImage.c (modified) (11 diffs)

trunk/psLib/src/image/psImage.c

@@ -3 +3 @@
  *  @brief Contains basic image definitions and operations.
  *
- *  This file defines the basic type for an image struct and functions useful in manupulating images.
+ *  This file defines the basic type for an image struct and functions useful
+ *  in manupulating images.
  *
  *  @author Robert DeSonia, MHPCC
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-05-20 01:27:01 $
+ *  @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-05-20 01:49:47 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -27 +28 @@
 /*****************************************************************************/
 
-psImage *psImageAlloc(unsigned int numCols, unsigned int numRows, const psElemType type)
+psImage *psImageAlloc(unsigned int numCols, unsigned int numRows,
+                      const psElemType type)
 {
     int area = 0;
@@ -36 +38 @@
 
     if (area < 1) {
-        psError(__func__, "Invalid value for number of rows or columns (numRows=%d, numCols=%d).",
-                numRows, numCols);
+        psError(__func__, "Invalid value for number of rows or columns "
+                "(numRows=%d, numCols=%d).", numRows, numCols);
         return NULL;
     }
@@ -79 +81 @@
 }
 
-psImage* psImageRealloc(psImage* old,unsigned int numCols, unsigned int numRows, const psElemType type)
+psImage* psImageRealloc(psImage* old,unsigned int numCols, unsigned int numRows,
+                        const psElemType type)
 {
     int elementSize = PSELEMTYPE_SIZEOF(type); // element size in bytes
@@ -95 +98 @@
 
     /* image already the right size/type? */
-    if (numCols == old->numCols && numRows == old->numRows && type == old->type.type) {
+    if (numCols == old->numCols && numRows == old->numRows &&
+            type == old->type.type) {
         return old;
     }
@@ -116 +120 @@
 
 psImage *psImageSubset(psImage *out,psImage *image,unsigned int numCols,
-                       unsigned int numRows, unsigned int col0, unsigned int row0)
+                       unsigned int numRows, unsigned int col0,
+                       unsigned int row0)
 {
     unsigned int elementSize;           // size of image element in bytes
@@ -139 +144 @@
 
     if (col0 >= image->numCols || row0 >= image->numRows) {
-        psError(__func__,"Can not subset image because col0,row0 (%d,%d) is not a valid pixel "
-                "location.", col0,row0);
+        psError(__func__,"Can not subset image because col0,row0 (%d,%d) is not a valid pixel location.",
+                col0,row0);
         return NULL;
     }
@@ -164 +169 @@
     // add output image as a child of the input image.
     image->nChildren++;
-    image->children = (psImage **) psRealloc(image->children,image->nChildren*sizeof(psImage *));
+    image->children = (psImage **) psRealloc(image->children,
+                      image->nChildren * sizeof(psImage*) );
     image->children[image->nChildren-1] = out;
 
@@ -171 +177 @@
 
     for (int row = 0; row < numRows; row++) {
-        memcpy(out->data.v[row],image->data.U8[row0+row] + inputColOffset,outputRowSize);
+        memcpy(out->data.v[row],image->data.U8[row0+row] + inputColOffset,
+               outputRowSize);
     }
 
@@ -201 +208 @@
 }
 
-psImage *psImageCopy(psImage* restrict output, const psImage *input, psElemType type)
+psImage *psImageCopy(psImage* restrict output, const psImage *input,
+                     psElemType type)
 {
     psElemType inDatatype;
@@ -214 +222 @@
 
     if (input == output) {
-        psError(__func__,"Can not copy image because given input and output parameter reference the same "
-                "psImage struct.");
+        psError(__func__,"Can not copy image because given input and output "
+                "parameter reference the same psImage struct.");
         return NULL;
     }