ENH: Renamed cderived -> derived (as it is not limited to complex dat…

…asets)
jmichel-otb · Jul 7, 2016 · c32128a · c32128a
1 parent a42afc2
commit c32128a
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 22 deletions.
diff --git a/autotest/gdrivers/cderived.py → autotest/gdrivers/derived.py b/autotest/gdrivers/cderived.py → autotest/gdrivers/derived.py
@@ -39,7 +39,7 @@
 # Test opening a L1C product
 
 
-def cderived_test():
+def derived_test():
     filename = "data/cfloat64.tif"
     gdal.ErrorReset()
     ds = gdal.Open(filename)
@@ -86,7 +86,7 @@ def cderived_test():
 
 if __name__ == '__main__':
 
-    gdaltest.setup_run( 'cderived' )
+    gdaltest.setup_run( 'derived' )
 
     gdaltest.run_tests( gdaltest_list )
 

diff --git a/gdal/GDALmake.opt.in b/gdal/GDALmake.opt.in
@@ -562,7 +562,7 @@ GDAL_FORMATS += nitf bmp airsar rs2 ilwis rmf leveller sgi srtmhgt
 GDAL_FORMATS += idrisi gsg ingr ers jaxapalsar dimap gff cosar pds adrg
 GDAL_FORMATS += coasp tsx terragen blx msgn til r northwood saga xyz hf2
 GDAL_FORMATS += kmlsuperoverlay ctg e00grid zmap ngsgeoid iris map cals
-GDAL_FORMATS += safe sentinel2 cderived
+GDAL_FORMATS += safe sentinel2 derived
 GDAL_FORMATS += @OPT_GDAL_FORMATS@
 
 ifneq ($(PCIDSK_SETTING),no)

diff --git a/gdal/frmts/cderived/GNUmakefile → gdal/frmts/derived/GNUmakefile b/gdal/frmts/cderived/GNUmakefile → gdal/frmts/derived/GNUmakefile
@@ -1,7 +1,7 @@
 
 include ../../GDALmake.opt
 
-OBJ	=	cderiveddataset.o derivedlist.o
+OBJ	=	deriveddataset.o derivedlist.o
 
 default:	$(OBJ:.o=.$(OBJ_EXT))
 

diff --git a/gdal/frmts/cderived/cderiveddataset.cpp → gdal/frmts/derived/deriveddataset.cpp b/gdal/frmts/cderived/cderiveddataset.cpp → gdal/frmts/derived/deriveddataset.cpp
@@ -30,27 +30,27 @@
 #include "gdal_proxy.h"
 #include "derivedlist.h"
 
-class ComplexDerivedDataset : public VRTDataset
+class DerivedDataset : public VRTDataset
 {
   public:
-  ComplexDerivedDataset(int nXSize, int nYSize);
-  ~ComplexDerivedDataset();
+  DerivedDataset(int nXSize, int nYSize);
+  ~DerivedDataset();
 
     static GDALDataset *Open( GDALOpenInfo * );
 };
 
 
-ComplexDerivedDataset::ComplexDerivedDataset(int nXSize, int nYSize) : VRTDataset(nXSize,nYSize)
+DerivedDataset::DerivedDataset(int nXSize, int nYSize) : VRTDataset(nXSize,nYSize)
 {
   poDriver = NULL;
   SetWritable(FALSE);
 }
 
-ComplexDerivedDataset::~ComplexDerivedDataset()
+DerivedDataset::~DerivedDataset()
 {
 }
 
-GDALDataset * ComplexDerivedDataset::Open(GDALOpenInfo * poOpenInfo)
+GDALDataset * DerivedDataset::Open(GDALOpenInfo * poOpenInfo)
 {
   /* Try to open original dataset */
   CPLString filename(poOpenInfo->pszFilename);
@@ -75,7 +75,7 @@ GDALDataset * ComplexDerivedDataset::Open(GDALOpenInfo * poOpenInfo)
 
   CPLString odDerivedName = filename.substr(dsds_pos+nPrefixLen,alg_pos-dsds_pos-nPrefixLen);
 
-  CPLDebug("ComplexDerivedDataset::Open","Derived dataset requested: %s",odDerivedName.c_str());
+  CPLDebug("DerivedDataset::Open","Derived dataset requested: %s",odDerivedName.c_str());
 
   CPLString pixelFunctionName = "";
   bool datasetFound = false;
@@ -116,7 +116,7 @@ GDALDataset * ComplexDerivedDataset::Open(GDALOpenInfo * poOpenInfo)
    int nRows = poTmpDS->GetRasterYSize();
    int nCols = poTmpDS->GetRasterXSize();
 
-   ComplexDerivedDataset * poDS = new ComplexDerivedDataset(nCols,nRows);
+   DerivedDataset * poDS = new DerivedDataset(nCols,nRows);
 
    // Transfer metadata
    poDS->SetMetadata(poTmpDS->GetMetadata());
@@ -169,24 +169,24 @@ GDALDataset * ComplexDerivedDataset::Open(GDALOpenInfo * poOpenInfo)
    return poDS;
 }
 
-void GDALRegister_ComplexDerived()
+void GDALRegister_Derived()
 {
-    if( GDALGetDriverByName( "COMPLEXDERIVED" ) != NULL )
+    if( GDALGetDriverByName( "DERIVED" ) != NULL )
         return;
 
     GDALDriver *poDriver = new GDALDriver();
 
-    poDriver->SetDescription( "COMPLEXDERIVED" );
+    poDriver->SetDescription( "DERIVED" );
 #ifdef GDAL_DCAP_RASTER
     poDriver->SetMetadataItem( GDAL_DCAP_RASTER, "YES" );
 #endif
     poDriver->SetMetadataItem( GDAL_DCAP_VIRTUALIO, "YES" );
-    poDriver->SetMetadataItem( GDAL_DMD_LONGNAME, "Complex derived bands" );
+    poDriver->SetMetadataItem( GDAL_DMD_LONGNAME, "Derived datasets using VRT pixel functions" );
     poDriver->SetMetadataItem( GDAL_DMD_HELPTOPIC, "TODO" );
     poDriver->SetMetadataItem( GDAL_DMD_SUBDATASETS, "NO" );
 
-    poDriver->pfnOpen = ComplexDerivedDataset::Open;
-    poDriver->pfnIdentify = ComplexDerivedDataset::Identify;
+    poDriver->pfnOpen = DerivedDataset::Open;
+    poDriver->pfnIdentify = DerivedDataset::Identify;
 
     GetGDALDriverManager()->RegisterDriver( poDriver );
 }
diff --git a/gdal/frmts/cderived/derivedlist.c → gdal/frmts/derived/derivedlist.c b/gdal/frmts/cderived/derivedlist.c → gdal/frmts/derived/derivedlist.c
diff --git a/gdal/frmts/cderived/derivedlist.h → gdal/frmts/derived/derivedlist.h b/gdal/frmts/cderived/derivedlist.h → gdal/frmts/derived/derivedlist.h
diff --git a/gdal/frmts/cderived/makefile.vc → gdal/frmts/derived/makefile.vc b/gdal/frmts/cderived/makefile.vc → gdal/frmts/derived/makefile.vc
@@ -1,5 +1,5 @@
 
-OBJ = cderiveddataset.obj derivedlist.obj
+OBJ = deriveddataset.obj derivedlist.obj
 
 GDAL_ROOT	=	..\..
 

diff --git a/gdal/frmts/gdalallregister.cpp b/gdal/frmts/gdalallregister.cpp
@@ -68,7 +68,7 @@ void CPL_STDCALL GDALAllRegister()
 
 #ifdef FRMT_vrt
     GDALRegister_VRT();
-    GDALRegister_ComplexDerived();
+    GDALRegister_Derived();
 #endif
 
 #ifdef FRMT_gtiff

diff --git a/gdal/gcore/gdal_frmts.h b/gdal/gcore/gdal_frmts.h
@@ -187,7 +187,7 @@ void CPL_DLL GDALRegister_SAFE(void);
 void CPL_DLL GDALRegister_SENTINEL2(void);
 void CPL_DLL GDALRegister_mrf(void);
 void CPL_DLL GDALRegister_RRASTER(void);
-void CPL_DLL GDALRegister_ComplexDerived(void);
+void CPL_DLL GDALRegister_Derived(void);
 CPL_C_END
 
 #endif /* ndef GDAL_FRMTS_H_INCLUDED */
diff --git a/gdal/gcore/gdaldataset.cpp b/gdal/gcore/gdaldataset.cpp
@@ -40,7 +40,7 @@
 #include "ograpispy.h"
 #include "ogrunionlayer.h"
 #include "swq.h"
-#include "../frmts/cderived/derivedlist.h"
+#include "../frmts/derived/derivedlist.h"
 
 #ifdef SQLITE_ENABLED
 #include "../sqlite/ogrsqliteexecutesql.h"