Fixed gdal build errors against gdal 2.x.

ossimlabs · May 29, 2016 · 6eca964 · 6eca964 · epifanio · Jan 9, 2022
1 parent c899adf
commit 6eca964
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 11 deletions.
diff --git a/gdal/src/ossimGdalDataset.cpp b/gdal/src/ossimGdalDataset.cpp
@@ -7,10 +7,7 @@
 // Description: A gdal data set from an ossim image handler.
 //
 //----------------------------------------------------------------------------
-// $Id: ossimGdalDataset.cpp 23003 2014-11-24 17:13:40Z dburken $
-
-
-#include <fstream>
+// $Id$
 
 #include <ossimGdalDataset.h>
 #include <ossimGdalType.h>
@@ -19,6 +16,7 @@
 #include <ossim/base/ossimTrace.h>
 #include <ossim/imaging/ossimImageHandler.h>
 #include <ossim/imaging/ossimImageHandlerRegistry.h>
+#include <fstream>
 
 static GDALDriver *poOssimGdalDriver = 0;
 
@@ -226,12 +224,6 @@ ossimGdalDatasetRasterBand::ossimGdalDatasetRasterBand(ossimGdalDataset* ds,
    if (nRasterXSize % nBlockXSize) ++nBlocksPerRow;
    if (nRasterYSize % nBlockYSize) ++nBlocksPerColumn;
 
-   nSubBlocksPerRow = 0;
-   nSubBlocksPerColumn = 0;
-
-   bSubBlockingActive = FALSE;
-   papoBlocks = 0;
-
    nBlockReads = 0;
    bForceCachedIO = false;
 }

diff --git a/png/src/ossimPngWriter.h b/png/src/ossimPngWriter.h
@@ -36,7 +36,7 @@ class ossimPngWriter : public ossimImageFileWriter
    /** @return "ossim png writer" */
    virtual ossimString getLongName()  const;
 
-   /** @return "ossimPngReader" */
+   /** @return "ossimPngWriter" */
    virtual ossimString getClassName()    const;
 
    /**