Changeset 13841

Timestamp:

02/22/08 17:36:13 (5 months ago)

Author:

warmerdam

Message:

cleanup memory leaks

Files:

• spike/grib/degrib18/g2clib-1.0.4/g2_addfield.c (modified) (3 diffs)
• spike/grib/degrib18/g2clib-1.0.4/g2_getfld.c (modified) (1 diff)
• spike/grib/gribdataset.cpp (modified) (4 diffs)

spike/grib/degrib18/g2clib-1.0.4/g2_addfield.c

@@ -9 +9 @@
-void specpack(g2float *,g2int,g2int,g2int,g2int,g2int *,unsigned char *,
-              g2int *);
+void jpcpack(g2float *,g2int,g2int,g2int *,unsigned char *,g2int *);
-#ifdef USE_PNG
-  void pngpack(g2float *,g2int,g2int,g2int *,unsigned char *,g2int *);
-#endif  /* USE_PNG */
-
-
-
+
-
-
@@ -340 +339 @@
-        }
-      }
-#ifdef USE_JPEG2000
-      else if (idrsnum == 40 || idrsnum == 40000) {    /*  JPEG2000 encoding  */
-        if (ibmap == 255) {
@@ -365 +363 @@
-        jpcpack(pfld,width,height,idrstmpl,cpack,&lcpack);
-      }
-#endif  /* USE_JPEG2000 */
-#ifdef USE_PNG
-      else if (idrsnum == 41 || idrsnum == 40010) {      /*  PNG encoding   */

spike/grib/degrib18/g2clib-1.0.4/g2_getfld.c

@@ -396 +396 @@
-            lgfld->interp_opt=igds[3];
-            lgfld->igdtnum=igds[4];
+            free( igds );
-          }
-          else {

spike/grib/gribdataset.cpp

@@ -118 +118 @@
-    nBlockXSize = poDS->nRasterXSize;
-    nBlockYSize = 1;
-
-    // printf("Band %d: %s\n", nBand, GetDescription());
-    //printf("size x=%d,y=%d pixels\n", poDS->nRasterXSize, poDS->nRasterYSize);
-    //if (m_meta->gridAttrib.f_maxmin)
-    //  printf("Min = %f\nMax = %f\n", m_meta->gridAttrib.min, m_meta->gridAttrib.max);
-    //if (m_meta->gridAttrib.f_miss)
-    //{
-    //  printf("Missing data value = %f\n", m_meta->gridAttrib.missPri);
-    //  if (m_meta->gridAttrib.f_miss > 1)
-    //          printf("Secondary missing data value = %f\n", m_meta->gridAttrib.missSec);
-    //}
-    //printf("Content: %s\n", m_meta->longFstLevel);
-
-    //if (m_meta->gds.numPts != poDS->nRasterYSize * poDS->nRasterXSize)
-    //  printf("ERROR: numPts != Nx * Ny? (%ld != %ld * %ld)\n", m_meta->gds.numPts, poDS->nRasterXSize, poDS->nRasterYSize);
-    //else if ((m_meta->gds.Dx <= 0) || (m_meta->gds.Dy <= 0))
-    //  printf("Projection code requires Dx (%f) > 0 and Dy (%f) > 0\n", m_meta->gds.Dx, m_meta->gds.Dy);
-}
-
@@ -224 +207 @@
-        free (m_Grib_Data);
-    if (m_Grib_MetaData)
-
+
+
+
+
-}
-
@@ -468 +454 @@
-
-    OGRSpatialReference oLL; // construct the "geographic" part of oSRS
-
-
-
-
+
-
-    double rMinX;
@@ -506 +489 @@
-    adfGeoTransform[5] = -rPixelSizeY;
-
+    CPLFree( pszProjection );
+    pszProjection = NULL;
-    oSRS.exportToWkt( &(pszProjection) );
-}