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

Timestamp:

Jun 1, 2004, 12:42:57 PM (22 years ago)

Author:

desonia

Message:

renamed data.v to data.V in psImage struct to be same as psVector.

File:

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

trunk/psLib/src/image/psImage.c

@@ -9 +9 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.22 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-06-01 21:30:47 $
+ *  @version $Revision: 1.23 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-06-01 22:42:57 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -48 +48 @@
     psImage *image = (psImage *)psAlloc(sizeof(psImage));
 
-    image->data.v = psAlloc(sizeof(void*)*numRows);
-
-    image->data.v[0] = psAlloc(area*elementSize);
+    image->data.V = psAlloc(sizeof(void*)*numRows);
+
+    image->data.V[0] = psAlloc(area*elementSize);
 
     for(int i = 1; i < numRows; i++) {
-        image->data.v[i] = (void*)((int8_t*)image->data.v[i-1]+rowSize);
+        image->data.V[i] = (void*)((int8_t*)image->data.V[i-1]+rowSize);
     }
 
@@ -91 +91 @@
     psImageFreeChildren(image);
 
-    psFree(image->data.v[0]);
-    psFree(image->data.v);
-    image->data.v = NULL;
+    psFree(image->data.V[0]);
+    psFree(image->data.V);
+    image->data.V = NULL;
 
     psFree(image);
@@ -138 +138 @@
 
     // Resize the image buffer
-    old->data.v[0] = psRealloc(old->data.v[0],numCols * numRows * elementSize);
-    old->data.v = (void**) psRealloc(old->data.v,numRows * sizeof(void*));
+    old->data.V[0] = psRealloc(old->data.V[0],numCols * numRows * elementSize);
+    old->data.V = (void**) psRealloc(old->data.V,numRows * sizeof(void*));
 
     // recreate the row pointers
     for(int i = 1; i < numRows; i++) {
-        old->data.v[i] = (void*)((int8_t*)old->data.v[i-1]+rowSize);
+        old->data.V[i] = (void*)((int8_t*)old->data.V[i-1]+rowSize);
     }
 
@@ -161 +161 @@
     unsigned int inputColOffset;        // offset in bytes to first subset pixel in input row
 
-    if (image == NULL || image->data.v == NULL) {
+    if (image == NULL || image->data.V == NULL) {
         psError(__func__,"Can not subset image because input image or its pixel buffer is NULL.");
         return NULL;
@@ -211 +211 @@
 
     for (int row = 0; row < numRows; row++) {
-        memcpy(out->data.v[row],image->data.U8[row0+row] + inputColOffset,
+        memcpy(out->data.V[row],image->data.U8[row0+row] + inputColOffset,
                outputRowSize);
     }
@@ -250 +250 @@
     int numCols;
 
-    if (input == NULL || input->data.v == NULL) {
+    if (input == NULL || input->data.V == NULL) {
         psError(__func__,"Can not copy image because input image or its pixel buffer is NULL.");
         return NULL;
@@ -280 +280 @@
     // cover the trival case of copy of the same datatype.
     if (type == inDatatype) {
-        memcpy(output->data.v[0],input->data.v[0],elementSize*numRows*numCols);
+        memcpy(output->data.V[0],input->data.V[0],elementSize*numRows*numCols);
         return output;
     }