Changeset 1605

Timestamp:

Aug 19, 2004, 4:55:58 PM (22 years ago)

Author:

desonia

Message:

added mask/maskVal parameters to psImageRebin.

Location:

trunk/psLib

Files:

• src/image/psImageManip.c (modified) (2 diffs)
• src/image/psImageManip.h (modified) (2 diffs)
• test/image/tst_psImageManip.c (modified) (9 diffs)

trunk/psLib/src/image/psImageManip.c

@@ -11 +11 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-08-20 02:48:38 $
+ *  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-08-20 02:55:58 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -356 +356 @@
                       const psImage* in,
                       const psImage* restrict mask,
-                      unsigned int maskVal,
+                      psMaskType maskVal,
                       unsigned int scale,
                       const psStats* stats)

trunk/psLib/src/image/psImageManip.h

@@ -11 +11 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-08-10 01:05:53 $
+ *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-08-20 02:55:58 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -101 +101 @@
     psImage* out,                      ///< an psImage to recycle.  If NULL, a new image is created
     const psImage* in,                 ///< input image
+    const psImage* restrict mask,      ///< mask for input image.  If NULL, no masking is done.
+    psMaskType maskVal,                ///< the bits to check in mask.
     unsigned int scale,                ///< the scale to rebin for each dimension
     const psStats* stats

trunk/psLib/test/image/tst_psImageManip.c

@@ -6 +6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-08-12 03:11:08 $
+ *  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-08-20 02:55:42 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -788 +788 @@
 
     stats.options = PS_STAT_SAMPLE_MEAN;
-    out = psImageRebin(NULL,in,4,&stats);
+    out = psImageRebin(NULL,in,NULL,0,4,&stats);
 
     if (out == NULL) {
@@ -816 +816 @@
 
     stats.options = PS_STAT_MAX;
-    out2 = psImageRebin(out,in,3,&stats);
+    out2 = psImageRebin(out,in,NULL,0,3,&stats);
 
     // Verify the returned psImage structure is equal to the input parameter
@@ -853 +853 @@
     // doesn't stop, if the input parameter input is null.
 
-    out2 = psImageRebin(NULL,NULL,1,&stats);
+    out2 = psImageRebin(NULL,NULL,NULL,0,1,&stats);
 
     if (out2 != NULL) {
@@ -864 +864 @@
     // doesn't stop, if the input parameter scale is less than or equal to zero.
     psLogMsg(__func__,PS_LOG_INFO,"Following should be an error.");
-    out2 = psImageRebin(NULL,in,0,&stats);
+    out2 = psImageRebin(NULL,in,NULL,0,0,&stats);
 
     if (out2 != NULL) {
@@ -875 +875 @@
     // doesn't stop, if the input parameter stats is null.
     psLogMsg(__func__,PS_LOG_INFO,"Following should be an error.");
-    out2 = psImageRebin(NULL,in,1,NULL);
+    out2 = psImageRebin(NULL,in,NULL,0,1,NULL);
 
     if (out2 != NULL) {
@@ -889 +889 @@
     psLogMsg(__func__,PS_LOG_INFO,"Following should be an error.");
     stats.options = 0;
-    out2 = psImageRebin(NULL,in,1,&stats);
+    out2 = psImageRebin(NULL,in,NULL,0,1,&stats);
 
     if (out2 != NULL) {
@@ -899 +899 @@
     psLogMsg(__func__,PS_LOG_INFO,"Following should be an error.");
     stats.options = PS_STAT_USE_RANGE;
-    out2 = psImageRebin(NULL,in,1,&stats);
+    out2 = psImageRebin(NULL,in,NULL,0,1,&stats);
 
     if (out2 != NULL) {
@@ -912 +912 @@
     psLogMsg(__func__,PS_LOG_INFO,"Following should be an error.");
     stats.options = PS_STAT_SAMPLE_MEAN + PS_STAT_MAX;
-    out2 = psImageRebin(NULL,in,1,&stats);
+    out2 = psImageRebin(NULL,in,NULL,0,1,&stats);
 
     if (out2 != NULL) {