Changeset 6938

Timestamp:

Apr 21, 2006, 10:47:39 AM (20 years ago)

Author:

magnier

Message:

replaced psRegion support

File:

• trunk/psLib/src/types/psMetadata.c (modified) (4 diffs)

trunk/psLib/src/types/psMetadata.c

@@ -12 +12 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.103 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-04-20 01:46:00 $
+ *  @version $Revision: 1.104 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-04-21 20:47:39 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -293 +293 @@
     case     PS_DATA_POLYNOMIAL4D:              // psPolynomial4D
     case     PS_DATA_PROJECTION:                // psProjection
+    case     PS_DATA_REGION:                  // psRegion
     case     PS_DATA_SCALAR:                    // psScalar
     case     PS_DATA_SPHERE:                    // psSphere
@@ -396 +397 @@
             break;
         }
-        /*    case PS_DATA_REGION: {
-                    psRegion *region = in->data.V; // The region
-                    psRegion *new = psRegionAlloc(region->x0, region->x1, region->y0, region->y1); // Copy of the region
-                    newItem = psMetadataItemAlloc(in->name, PS_DATA_REGION, in->comment, new);
-                    psFree(new);                  // Drop reference
-                    break;
-                }
-        */
+    case PS_DATA_REGION: {
+            psRegion *region = in->data.V; // The region
+            psRegion *new = psRegionAlloc(region->x0, region->x1, region->y0, region->y1); // Copy of the region
+            newItem = psMetadataItemAlloc(in->name, PS_DATA_REGION, in->comment, new);
+            psFree(new);                  // Drop reference
+            break;
+        }
     default:
         // Other kinds of pointers
@@ -1134 +1134 @@
             psMetadataPrint(item->data.V, level + 1);
             break;
-            /*        case PS_DATA_REGION: {
-                            psString region = psRegionToString(*(psRegion*)item->data.V);
-                            printf("%s", region);
-                            psFree(region);
-                            break;
-                        }
-            */
+        case PS_DATA_REGION: {
+                psString region = psRegionToString(*(psRegion*)item->data.V);
+                printf("%s", region);
+                psFree(region);
+                break;
+            }
         case PS_DATA_LIST:
             printf("<a list of unknown contents>");