Changeset 34735 for branches/eam_branches/ipp-20120905/psModules/src/objects

Timestamp:

Nov 29, 2012, 2:15:01 PM (14 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20120905

Files:

• . (modified) (1 prop)
• psModules (modified) (1 prop)
• psModules/src/objects (modified) (1 prop)
• psModules/src/objects/pmSourceIO.c (modified) (4 diffs)

branches/eam_branches/ipp-20120905/psModules/src/objects

@@ -7 +7 @@
 pmSourceIO_CMF_PS1_V1.c
 pmSourceIO_CMF_PS1_V2.c
+pmSourceIO_CMF_PS1_V2.v1.c
 pmSourceIO_CMF_PS1_V3.c
+pmSourceIO_CMF_PS1_V3.v1.c
+pmSourceIO_CMF_PS1_V1.v1.c
 pmSourceIO_CMF_PS1_V4.c
 pmSourceIO_CMF_PS1_SV1.c
@@ -14 +17 @@
 pmSourceIO_CMF_PS1_DV2.c
 pmSourceIO_CMF_PS1_DV3.c
+

@@ -7 +7 @@
 pmSourceIO_CMF_PS1_V1.c
 pmSourceIO_CMF_PS1_V2.c
+pmSourceIO_CMF_PS1_V2.v1.c
 pmSourceIO_CMF_PS1_V3.c
+pmSourceIO_CMF_PS1_V3.v1.c
+pmSourceIO_CMF_PS1_V1.v1.c
 pmSourceIO_CMF_PS1_V4.c
 pmSourceIO_CMF_PS1_SV1.c
@@ -14 +17 @@
 pmSourceIO_CMF_PS1_DV2.c
 pmSourceIO_CMF_PS1_DV3.c
+

branches/eam_branches/ipp-20120905/psModules/src/objects/pmSourceIO.c

@@ -1028 +1028 @@
         if (strcmp (xtension, "BINTABLE")) {
             psWarning ("no binary table in extension %s, skipping\n", dataname);
+            psFree(tableHeader);
             return false;
         }
@@ -1242 +1243 @@
     if (!xtension) psAbort("cannot read table type");
     if (strcmp (xtension, "BINTABLE")) {
+        psFree(tableHeader);
         psWarning ("no binary table in extension %s, skipping\n", xsrcname);
         return false;
@@ -1281 +1283 @@
     if (strcmp (xtension, "BINTABLE")) {
         psWarning ("no binary table in extension %s, skipping\n", extname);
+        psFree(tableHeader);
         return false;
     }
@@ -1318 +1321 @@
     if (strcmp (xtension, "BINTABLE")) {
         psWarning ("no binary table in extension %s, skipping\n", extname);
+        psFree(tableHeader);
         return false;
     }

@@ -7 +7 @@
 pmSourceIO_CMF_PS1_V1.c
 pmSourceIO_CMF_PS1_V2.c
+pmSourceIO_CMF_PS1_V2.v1.c
 pmSourceIO_CMF_PS1_V3.c
+pmSourceIO_CMF_PS1_V3.v1.c
+pmSourceIO_CMF_PS1_V1.v1.c
 pmSourceIO_CMF_PS1_V4.c
 pmSourceIO_CMF_PS1_SV1.c
@@ -14 +17 @@
 pmSourceIO_CMF_PS1_DV2.c
 pmSourceIO_CMF_PS1_DV3.c
+