Changeset 8839

Timestamp:

Sep 19, 2006, 1:54:43 PM (20 years ago)

Author:

drobbin

Message:

edited psHash comment, minor changes/debugging to psPixels, and slight revisions to psPixels.h. updated execute_tap in types dir.

Location:

trunk/psLib

Files:

• src/types/psHash.h (modified) (2 diffs)
• src/types/psPixels.c (modified) (6 diffs)
• src/types/psPixels.h (modified) (3 diffs)
• test/types/execute_tap (modified) (2 diffs)

trunk/psLib/src/types/psHash.h

@@ -11 +11 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-08-31 02:07:12 $
+ *  @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-09-19 23:54:43 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -57 +57 @@
 ;
 
-
 /// Allocate hash buckets in table.
 psHash* psHashAlloc(

trunk/psLib/src/types/psPixels.c

@@ -7 +7 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.25 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-08-08 23:32:23 $
+ *  @version $Revision: 1.26 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-09-19 23:54:43 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -26 +26 @@
 static void pixelsFree(psPixels* pixels)
 {
-    if (pixels != NULL) {
-        psFree(pixels->data);
-    }
+    psFree(pixels->data);
 }
 
@@ -296 +294 @@
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
                 _("Input psPixels can not be NULL."));
+        psFree(out);
         return NULL;
     }
@@ -333 +332 @@
 }
 
-bool p_psPixelsPrint (FILE *fd, psPixels* pixels, const char *name)
-{
-
-    fprintf (fd, "psPixels: %s\n", name);
+bool p_psPixelsPrint (FILE *fd,
+                      psPixels* pixels,
+                      const char *name)
+{
+    if (fd == NULL) {
+        fd = stdout;
+    } else {
+        if ( fprintf(fd, "\n") < 0 ) {
+            psError(PS_ERR_IO, true,
+                    "Invalid file pointer in p_psPixelsPrint.  Could not write to fd.\n");
+            return false;
+        }
+    }
+
+    if (name != NULL) {
+        fprintf (fd, "psPixels: %s\n", name);
+    }
 
     if (pixels == NULL) {
@@ -398 +410 @@
     if (pixels == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true, _("Input psPixels can not be NULL."));
-        out.x = 0; //XXX: should be NAN when changed to float
-        out.y = 0; //XXX: should be NAN when changed to float
+        out.x = NAN; //XXX: should be NAN when changed to float
+        out.y = NAN; //XXX: should be NAN when changed to float
         return out;
     }
     if (position >= pixels->n) {
         psError(PS_ERR_BAD_PARAMETER_SIZE, true, "Invalid position.  Number too large\n");
-        out.x = 0; //XXX: should be NAN when changed to float
-        out.y = 0; //XXX: should be NAN when changed to float
+        out.x = NAN; //XXX: should be NAN when changed to float
+        out.y = NAN; //XXX: should be NAN when changed to float
         return out;
     }
@@ -413 +425 @@
     if (position < 0) {
         psError(PS_ERR_BAD_PARAMETER_SIZE, true, "Invalid position.  Negative number too large\n");
-        out.x = 0; //XXX: should be NAN when changed to float
-        out.y = 0; //XXX: should be NAN when changed to float
+        out.x = NAN; //XXX: should be NAN when changed to float
+        out.y = NAN; //XXX: should be NAN when changed to float
         return out;
     }

trunk/psLib/src/types/psPixels.h

@@ -7 +7 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.20 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-04-17 22:00:03 $
+ *  @version $Revision: 1.21 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-09-19 23:54:43 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -51 +51 @@
 #define P_PSPIXELS_SET_NALLOC(pix,n) *(long*)&pix->nalloc = n
 
+
         /** Allocates a new psPixels structure
          *
@@ -77 +78 @@
 psPixels* psPixelsRealloc(
     psPixels* pixels,                  ///< psPixels to resize, or NULL to create new psPixels
-    long nalloc                       ///< the size of the coordinate vectors
+    long nalloc                        ///< the size of the coordinate vectors
 );
 
 /** Add a pixel location to a psPixels
  *
+ *  Grow the psPixels input by growth.  If growth is less that 1, 10 is used.  If a NULL
+ *  psPixels is given, a new one is created.
+ *
  *  @return psPixels*       psPixels with the value appended.
  */
 psPixels* p_psPixelsAppend(
-    psPixels* pixels,                  ///< psPixels to append new coordinate to.  NULL creates a new one.
-    long growth,
-    ///< number of elements to grow the psPixels list, if necessary.  if growth < 1, 10 is used.
-    float x,                             ///< x coordinate to append
-    float y                              ///< y coordinate to append
+    psPixels* pixels,                  ///< psPixels to append new coordinate to.
+    long growth,                       ///< Number of elements to grow the pixels list if necessary.
+    float x,                           ///< x coordinate to append
+    float y                            ///< y coordinate to append
 );
 

trunk/psLib/test/types/execute_tap

@@ -1 @@
-make tests
+make
 ./tap_psArray_all
 ./tap_psListIterator
-./tap_psMetadataConfigParse
+./tap_psMetadataConfigParse_time
+./tap_psMetadataConfigRead
 ./tap_psMetadata_copying
 ./tap_psMetadata_creating
@@ -12 +13 @@
 ./tap_psMetadata_polynomials
 ./tap_psArguments_all
+./tap_psPixels_all