Skip to content

Commit

Permalink
STY: papo -> o (from PR review)
Browse files Browse the repository at this point in the history
  • Loading branch information
jmichel-otb committed Jul 7, 2016
1 parent 4713785 commit 44f6f4d
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion gdal/gcore/gdal_priv.h
Original file line number Diff line number Diff line change
Expand Up @@ -499,7 +499,7 @@ class CPL_DLL GDALDataset : public GDALMajorObject
OGRGeometry *poSpatialFilter,
const char *pszDialect,
swq_select_parse_options* poSelectParseOptions);
CPLStringList papoDerivedMetadataList;
CPLStringList oDerivedMetadataList;
public:

virtual int GetLayerCount();
Expand Down
8 changes: 4 additions & 4 deletions gdal/gcore/gdaldataset.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3300,20 +3300,20 @@ char ** GDALDataset::GetMetadata(const char * pszDomain)
{
if( pszDomain != NULL && EQUAL(pszDomain, "DERIVED_SUBDATASETS") )
{
papoDerivedMetadataList.Clear();
oDerivedMetadataList.Clear();

// First condition: at least one raster band
if(GetRasterCount()>0)
{
for(unsigned int derivedId = 0; derivedId<NB_DERIVED_DATASETS;++derivedId)
{
papoDerivedMetadataList.SetNameValue(CPLSPrintf("DERIVED_SUBDATASET_%i_NAME",derivedId),CPLSPrintf("DERIVED_SUBDATASET:%s:%s",asDDSDesc[derivedId].pszDatasetName,GetDescription()));
oDerivedMetadataList.SetNameValue(CPLSPrintf("DERIVED_SUBDATASET_%i_NAME",derivedId),CPLSPrintf("DERIVED_SUBDATASET:%s:%s",asDDSDesc[derivedId].pszDatasetName,GetDescription()));

CPLString osDesc(CPLSPrintf("%s from %s",asDDSDesc[derivedId].pszDatasetDescritpion,GetDescription()));
papoDerivedMetadataList.SetNameValue(CPLSPrintf("DERIVED_SUBDATASET_%i_DESC",derivedId),osDesc.c_str());
oDerivedMetadataList.SetNameValue(CPLSPrintf("DERIVED_SUBDATASET_%i_DESC",derivedId),osDesc.c_str());
}
}
return papoDerivedMetadataList.List();
return oDerivedMetadataList.List();
}
else
return GDALMajorObject::GetMetadata(pszDomain);
Expand Down

0 comments on commit 44f6f4d

Please sign in to comment.