Changeset 5057 for trunk/psLib/src/imageops

Timestamp:

Sep 15, 2005, 11:22:22 AM (21 years ago)

Author:

drobbin

Message:

Minor changes from new SDRS, prototype code for psArguments

Location:

trunk/psLib/src/imageops

Files:

• psImageConvolve.c (modified) (2 diffs)
• psImageStructManip.c (modified) (6 diffs)

trunk/psLib/src/imageops/psImageConvolve.c

@@ -5 +5 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.25 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-08-31 02:07:11 $
+ *  @version $Revision: 1.26 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-09-15 21:22:22 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -64 +64 @@
     result->yMax = yMax;
     result->image = psImageAlloc(numCols,numRows,PS_TYPE_KERNEL);
-    memset(result->image->rawDataBuffer,0,numCols*numRows*PSELEMTYPE_SIZEOF(PS_TYPE_KERNEL));
+    memset((result->image->p_rawDataBuffer),0,numCols*numRows*PSELEMTYPE_SIZEOF(PS_TYPE_KERNEL));
     result->p_kernelRows = psAlloc(sizeof(float*)*numRows);
 

trunk/psLib/src/imageops/psImageStructManip.c

@@ -8 +8 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-07-12 19:33:49 $
+ *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-09-15 21:22:22 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -91 +91 @@
 
     // increment the raw data buffer before freeing anything in the 'out'
-    psPtr rawData = psMemIncrRefCounter(image->rawDataBuffer);
+    psPtr rawData = psMemIncrRefCounter(image->p_rawDataBuffer);
 
     if (out != NULL) {
@@ -100 +100 @@
         }
 
-        psFree(out->rawDataBuffer); // free the previous data reference
+        psFree(out->p_rawDataBuffer); // free the previous data reference
     } else {
         out = psAlloc(sizeof(psImage));
@@ -116 +116 @@
     out->parent = image;
     out->children = NULL;
-    out->rawDataBuffer = rawData;
+    out->p_rawDataBuffer = rawData;
 
     // set the new psImage's deallocator to the same as the input image
@@ -357 +357 @@
     psU32 rowSize = elementSize*numCols;
     psU32 colOffset = elementSize * col0;
-    psU8* imageData = image->rawDataBuffer;
+    psU8* imageData = image->p_rawDataBuffer;
     for (psS32 row = row0; row < row1; row++) {
         memmove(imageData,image->data.U8[row] + colOffset,rowSize);
@@ -368 +368 @@
     // XXX: should I really resize the buffers?
     image->data.V = psRealloc(image->data.V,sizeof(psPtr)*numRows);
-    image->rawDataBuffer = psRealloc(image->rawDataBuffer,rowSize*numRows);
-
-    image->data.V[0] = image->rawDataBuffer;
+    image->p_rawDataBuffer = psRealloc(image->p_rawDataBuffer,rowSize*numRows);
+
+    image->data.V[0] = image->p_rawDataBuffer;
     for (psS32 r = 1; r < numRows; r++) {
         image->data.U8[r] = image->data.U8[r-1] + rowSize;