Merge branch 'trunk' into enhance-complex-datasets-with-pf

jmichel-otb · Jul 13, 2016 · 6371674 · 6371674
2 parents acd8343 + 20b0f9d
commit 6371674
Show file tree

Hide file tree

Showing 33 changed files with 412 additions and 296 deletions.
diff --git a/gdal/frmts/raw/ace2dataset.cpp b/gdal/frmts/raw/ace2dataset.cpp
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  ACE2 Driver
  * Purpose:  Implementation of ACE2 elevation format read support.

diff --git a/gdal/frmts/raw/atlsci_spheroid.cpp b/gdal/frmts/raw/atlsci_spheroid.cpp
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  Spheroid classes
  * Purpose:  Provide spheroid lookup table base classes.

diff --git a/gdal/frmts/raw/btdataset.cpp b/gdal/frmts/raw/btdataset.cpp
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  VTP .bt Driver
  * Purpose:  Implementation of VTP .bt elevation format read/write support.

diff --git a/gdal/frmts/raw/cpgdataset.cpp b/gdal/frmts/raw/cpgdataset.cpp
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  Polarimetric Workstation
  * Purpose:  Convair PolGASP data (.img/.hdr format).

diff --git a/gdal/frmts/raw/ctable2dataset.cpp b/gdal/frmts/raw/ctable2dataset.cpp
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  Horizontal Datum Formats
  * Purpose:  Implementation of the CTable2 format, a PROJ.4 specific format

diff --git a/gdal/frmts/raw/dipxdataset.cpp b/gdal/frmts/raw/dipxdataset.cpp
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GDAL
  * Purpose:  Implementation for ELAS DIPEx format variant.

diff --git a/gdal/frmts/raw/doq1dataset.cpp b/gdal/frmts/raw/doq1dataset.cpp
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  USGS DOQ Driver (First Generation Format)
  * Purpose:  Implementation of DOQ1Dataset

diff --git a/gdal/frmts/raw/doq2dataset.cpp b/gdal/frmts/raw/doq2dataset.cpp
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  USGS DOQ Driver (Second Generation Format)
  * Purpose:  Implementation of DOQ2Dataset

diff --git a/gdal/frmts/raw/ehdrdataset.cpp b/gdal/frmts/raw/ehdrdataset.cpp
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  ESRI .hdr Driver
  * Purpose:  Implementation of EHdrDataset

diff --git a/gdal/frmts/raw/eirdataset.cpp b/gdal/frmts/raw/eirdataset.cpp
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  Erdas EIR Raw Driver
  * Purpose:  Implementation of EIRDataset

diff --git a/gdal/frmts/raw/envidataset.cpp b/gdal/frmts/raw/envidataset.cpp
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  ENVI .hdr Driver
  * Purpose:  Implementation of ENVI .hdr labelled raw raster support.

diff --git a/gdal/frmts/raw/fastdataset.cpp b/gdal/frmts/raw/fastdataset.cpp
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  EOSAT FAST Format reader
  * Purpose:  Reads Landsat FAST-L7A, IRS 1C/1D

diff --git a/gdal/frmts/raw/fujibasdataset.cpp b/gdal/frmts/raw/fujibasdataset.cpp
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  eCognition
  * Purpose:  Implementation of FUJI BAS Format
@@ -34,10 +33,6 @@
 
 CPL_CVSID("$Id$");
 
-CPL_C_START
-void GDALRegister_FujiBAS();
-CPL_C_END
-
 /************************************************************************/
 /* ==================================================================== */
 /*                              FujiBASDataset                          */
@@ -193,11 +188,11 @@ GDALDataset *FujiBASDataset::Open( GDALOpenInfo * poOpenInfo )
 /* -------------------------------------------------------------------- */
 /*      Create band information object.                                 */
 /* -------------------------------------------------------------------- */
-    const int bNativeOrder =
+    const bool bNativeOrder =
 #ifdef CPL_MSB
-    TRUE
+    true
 #else
-    FALSE
+    false
 #endif
         ;
     poDS->SetBand(

diff --git a/gdal/frmts/raw/genbindataset.cpp b/gdal/frmts/raw/genbindataset.cpp
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GDAL
  * Purpose:  Generic Binary format driver (.hdr but not ESRI .hdr!)

diff --git a/gdal/frmts/raw/gscdataset.cpp b/gdal/frmts/raw/gscdataset.cpp
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GSC Geogrid format driver.
  * Purpose:  Implements support for reading and writing GSC Geogrid format.

diff --git a/gdal/frmts/raw/gtxdataset.cpp b/gdal/frmts/raw/gtxdataset.cpp
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  Vertical Datum Transformation
  * Purpose:  Implementation of NOAA .gtx vertical datum shift file format.

diff --git a/gdal/frmts/raw/hkvdataset.cpp b/gdal/frmts/raw/hkvdataset.cpp
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GView
  * Purpose:  Implementation of Atlantis HKV labelled blob support

diff --git a/gdal/frmts/raw/idadataset.cpp b/gdal/frmts/raw/idadataset.cpp
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  IDA Raster Driver
  * Purpose:  Implemenents IDA driver/dataset/rasterband.

diff --git a/gdal/frmts/raw/iscedataset.cpp b/gdal/frmts/raw/iscedataset.cpp
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  ISCE Raster Reader
  * Purpose:  Implementation of the ISCE raster reader

diff --git a/gdal/frmts/raw/krodataset.cpp b/gdal/frmts/raw/krodataset.cpp
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  KRO format reader/writer
  * Purpose:  Implementation of KOLOR Raw Format

diff --git a/gdal/frmts/raw/landataset.cpp b/gdal/frmts/raw/landataset.cpp
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  eCognition
  * Purpose:  Implementation of Erdas .LAN / .GIS format.

diff --git a/gdal/frmts/raw/lcpdataset.cpp b/gdal/frmts/raw/lcpdataset.cpp
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  LCP Driver
  * Purpose:  FARSITE v.4 Landscape file (.lcp) reader for GDAL

diff --git a/gdal/frmts/raw/loslasdataset.cpp b/gdal/frmts/raw/loslasdataset.cpp
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  Horizontal Datum Formats
  * Purpose:  Implementation of NOAA/NADCON los/las datum shift format.

diff --git a/gdal/frmts/raw/mffdataset.cpp b/gdal/frmts/raw/mffdataset.cpp
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GView
  * Purpose:  Implementation of Atlantis MFF Support

diff --git a/gdal/frmts/raw/ndfdataset.cpp b/gdal/frmts/raw/ndfdataset.cpp
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  NDF Driver
  * Purpose:  Implementation of NLAPS Data Format read support.

diff --git a/gdal/frmts/raw/ntv2dataset.cpp b/gdal/frmts/raw/ntv2dataset.cpp
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  Horizontal Datum Formats
  * Purpose:  Implementation of NTv2 datum shift format used in Canada, France,

diff --git a/gdal/frmts/raw/pauxdataset.cpp b/gdal/frmts/raw/pauxdataset.cpp
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  PCI .aux Driver
  * Purpose:  Implementation of PAuxDataset

diff --git a/gdal/frmts/raw/pnmdataset.cpp b/gdal/frmts/raw/pnmdataset.cpp
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  PNM Driver
  * Purpose:  Portable anymap file format imlementation

diff --git a/gdal/frmts/raw/rawdataset.cpp b/gdal/frmts/raw/rawdataset.cpp
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  Generic Raw Binary Driver
  * Purpose:  Implementation of RawDataset and RawRasterBand classes.

diff --git a/gdal/frmts/raw/roipacdataset.cpp b/gdal/frmts/raw/roipacdataset.cpp
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  ROI_PAC Raster Reader
  * Purpose:  Implementation of the ROI_PAC raster reader
@@ -359,17 +358,20 @@ GDALDataset *ROIPACDataset::Open( GDALOpenInfo *poOpenInfo )
 
         if( nBands > 1 )
         {
-            // GDAL 2.0.[0-3] and 2.1.0  had a value of nLineOffset that was 
-            // equal to the theoretical nLineOffset multiplied by nBands...
+            // GDAL 2.0.[0-3] and 2.1.0  had a value of nLineOffset that was
+            // equal to the theoretical nLineOffset multiplied by nBands.
             VSIFSeekL( poDS->fpImage, 0, SEEK_END );
-            const GUIntBig nWrongFileSize = GDALGetDataTypeSizeBytes(eDataType) *
-                                            nWidth * (static_cast<GUIntBig>(nFileLength - 1) * nBands * nBands + nBands);
+            const GUIntBig nWrongFileSize =
+                GDALGetDataTypeSizeBytes(eDataType) *
+                nWidth * (static_cast<GUIntBig>(nFileLength - 1) *
+                          nBands * nBands + nBands);
             if( VSIFTellL( poDS->fpImage ) == nWrongFileSize )
             {
                 CPLError(CE_Warning, CPLE_AppDefined,
                          "This file has been incorrectly generated by an older "
-                         "GDAL version whose line offset computation was erroneous. "
-                         "Taking that into account, but the file should be re-encoded ideally");
+                         "GDAL version whose line offset computation was "
+                         "erroneous.  Taking that into account, "
+                         "but the file should be re-encoded ideally.");
                 nLineOffset = nLineOffset * nBands;
             }
         }

diff --git a/gdal/frmts/raw/rrasterdataset.cpp b/gdal/frmts/raw/rrasterdataset.cpp
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GDAL
  * Purpose:  Implements R Raster Format.

diff --git a/gdal/frmts/raw/snodasdataset.cpp b/gdal/frmts/raw/snodasdataset.cpp
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  SNODAS driver
  * Purpose:  Implementation of SNODASDataset