Changeset 9538 for trunk/psLib/src/imageops

Timestamp:

Oct 13, 2006, 11:13:48 AM (20 years ago)

Author:

Paul Price

Message:

Synchronising with SDRS, and cleaning up:

• Replaced is_psType() with PS_ASSERT_PTR() throughout psLib.
• Changed "char *" to "psString" where appropriate in psDB and a few other places (to indicate pointers on the PS memory system).
• Removed psLogArguments and psTraceArguments (functionality in psArgumentVerbosity).
• Renamed psMetadataLookupMD to psMetadataLookupMetadata (it was about time...). Similarly with the psPolynomial?D{From,To}MD functions.
• Removed psMetadataRemove() since it is ambiguous about what's removed --- use psMetadataRemove{Key,Index}.
• psArrayRemoveByPos --> psArrayRemoveIndex
• psArrayRemove --> psArrayRemoveData

Location:

trunk/psLib/src/imageops

Files:

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

trunk/psLib/src/imageops/psImageConvolve.c

@@ -5 +5 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.38 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-08-08 23:32:23 $
+ *  @version $Revision: 1.39 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-10-13 21:13:48 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -20 +20 @@
 #include "psLogMsg.h"
 #include "psError.h"
+#include "psAssert.h"
 
 
@@ -90 +91 @@
 bool psMemCheckKernel(psPtr ptr)
 {
-    if (!is_psType(ptr)) {
-        return false;
-    }
+    PS_ASSERT_PTR(ptr, false);
     return ( psMemGetDeallocator(ptr) == (psFreeFunc)freeKernel );
 }

trunk/psLib/src/imageops/psImageStructManip.c

@@ -8 +8 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-08-08 23:32:23 $
+ *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-10-13 21:13:48 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -97 +97 @@
         // if a child, need to orphan (disassociate from parent) first
         if (out->parent != NULL) {
-            psArrayRemove(out->parent->children,psMemIncrRefCounter(out));
+            psArrayRemoveData(out->parent->children,psMemIncrRefCounter(out));
             // remove from parent's knowledge without triggering a free
             out->parent = NULL; // break link to parent