Changeset 3973

Timestamp:

May 18, 2005, 4:49:40 PM (21 years ago)

Author:

desonia

Message:

moved functions around.

Location:

trunk/psLib

Files:

• pslib.kdevses (modified) (1 diff)
• test/image/Makefile.am (modified) (2 diffs)
• test/image/tst_psImage.c (modified) (2 diffs)
• test/image/tst_psImageExtraction.c (deleted)
• test/image/tst_psImageGeomManip.c (added)
• test/image/tst_psImageManip.c (deleted)
• test/image/tst_psImagePixelExtract.c (added)
• test/image/tst_psImagePixelManip.c (added)
• test/image/tst_psImageStats.c (modified) (3 diffs)
• test/image/tst_psImageStructManip.c (added)

trunk/psLib/pslib.kdevses

@@ -4 +4 @@
  <DocsAndViews NumberOfDocuments="10" >
   <Doc0 NumberOfViews="1" URL="file:///home/desonia/panstarrs/psLib/test/collections/tst_psPixels.c" >
-   <View0 line="469" Type="Source" />
+   <View0 Type="Source" />
   </Doc0>
   <Doc1 NumberOfViews="1" URL="file:///home/desonia/panstarrs/psLib/src/collections/psPixels.c" >

trunk/psLib/test/image/Makefile.am

@@ -18 +18 @@
         tst_psImage \
         tst_psImageFFT \
-        tst_psImageManip \
+        tst_psImageGeomManip \
+        tst_psImagePixelManip \
         tst_psImageStats \
-        tst_psImageExtraction \
+        tst_psImagePixelExtract \
+        tst_psImageStructManip \
         tst_psImageConvolve \
         tst_psImageIO \
@@ -41 +43 @@
 tst_psImage_SOURCES =  tst_psImage.c
 tst_psImageFFT_SOURCES =  tst_psImageFFT.c
-tst_psImageManip_SOURCES =  tst_psImageManip.c
+tst_psImagePixelManip_SOURCES =  tst_psImagePixelManip.c
+tst_psImageGeomManip_SOURCES =  tst_psImageGeomManip.c
 tst_psImageStats_SOURCES =  tst_psImageStats.c
-tst_psImageExtraction_SOURCES =  tst_psImageExtraction.c
+tst_psImagePixelExtract_SOURCES =  tst_psImagePixelExtract.c
+tst_psImageStructManip_SOURCES =  tst_psImageStructManip.c
 tst_psImageConvolve_SOURCES =  tst_psImageConvolve.c
 tst_psImageIO_SOURCES =  tst_psImageIO.c

trunk/psLib/test/image/tst_psImage.c

@@ -6 +6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.32 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-04-07 20:27:42 $
+ *  @version $Revision: 1.33 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-05-19 02:49:40 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -223 +223 @@
     // children is freed.
     image = psImageAlloc(100,100,PS_TYPE_F32);
-    psImageSubset(image,50,0,70,20);
-    psImageSubset(image,70,20,90,40);
+    psImageSubset(image,(psRegion) {
+                      50,0,70,20
+                  }
+                 );
+    psImageSubset(image,(psRegion) {
+                      70,20,90,40
+                  }
+                 );
 
     psFree(image);

trunk/psLib/test/image/tst_psImageStats.c

@@ -2 +2 @@
 *  C Implementation: %{MODULE}
 *
-* Description: 
+* Description:
 *
 *
@@ -113 +113 @@
             tmpImage2 = psImageAlloc( IMAGE_X_SIZE*2, IMAGE_Y_SIZE*2, PS_TYPE_F32 );
             tmpMask2 = psImageAlloc( IMAGE_X_SIZE*2, IMAGE_Y_SIZE*2, PS_TYPE_U8 );
-            tmpImage = psImageSubset(tmpImage2,
-                                     IMAGE_X_SIZE/4, IMAGE_Y_SIZE/4,
-                                     IMAGE_X_SIZE/4+IMAGE_X_SIZE, IMAGE_Y_SIZE/4+IMAGE_Y_SIZE);
-            tmpMask= psImageSubset(tmpMask2,
-                                   IMAGE_X_SIZE/4, IMAGE_Y_SIZE/4,
-                                   IMAGE_X_SIZE/4+IMAGE_X_SIZE, IMAGE_Y_SIZE/4+IMAGE_Y_SIZE);
+            tmpImage = psImageSubset(tmpImage2, (psRegion) {
+                                         IMAGE_X_SIZE/4, IMAGE_Y_SIZE/4,
+                                         IMAGE_X_SIZE/4+IMAGE_X_SIZE, IMAGE_Y_SIZE/4+IMAGE_Y_SIZE
+                                     }
+                                    );
+            tmpMask= psImageSubset(tmpMask2,(psRegion) {
+                                       IMAGE_X_SIZE/4, IMAGE_Y_SIZE/4,
+                                       IMAGE_X_SIZE/4+IMAGE_X_SIZE, IMAGE_Y_SIZE/4+IMAGE_Y_SIZE
+                                   }
+                                  );
         }
 
@@ -287 +291 @@
             tmpImage2 = psImageAlloc( IMAGE_X_SIZE*2, IMAGE_Y_SIZE*2, PS_TYPE_F32 );
             tmpMask2 = psImageAlloc( IMAGE_X_SIZE*2, IMAGE_Y_SIZE*2, PS_TYPE_U8 );
-            tmpImage = psImageSubset(tmpImage2,
-                                     IMAGE_X_SIZE/4, IMAGE_Y_SIZE/4,
-                                     IMAGE_X_SIZE/4+IMAGE_X_SIZE, IMAGE_Y_SIZE/4+IMAGE_Y_SIZE);
-            tmpMask = psImageSubset(tmpMask2,
-                                    IMAGE_X_SIZE/4, IMAGE_Y_SIZE/4,
-                                    IMAGE_X_SIZE/4+IMAGE_X_SIZE, IMAGE_Y_SIZE/4+IMAGE_Y_SIZE);
+            tmpImage = psImageSubset(tmpImage2,(psRegion) {
+                                         IMAGE_X_SIZE/4, IMAGE_Y_SIZE/4,
+                                         IMAGE_X_SIZE/4+IMAGE_X_SIZE, IMAGE_Y_SIZE/4+IMAGE_Y_SIZE
+                                     }
+                                    );
+            tmpMask = psImageSubset(tmpMask2,(psRegion) {
+                                        IMAGE_X_SIZE/4, IMAGE_Y_SIZE/4,
+                                        IMAGE_X_SIZE/4+IMAGE_X_SIZE, IMAGE_Y_SIZE/4+IMAGE_Y_SIZE
+                                    }
+                                   );
         }