Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enhance gdal capabilities for complex datasets #142

Closed
Closed
Changes from 1 commit
Commits
Show all changes
81 commits
Select commit Hold shift + click to select a range
cceed0b
Initial commit
avalentino Apr 13, 2014
2cfd449
Improved the README.txt file
avalentino Apr 13, 2014
29f6bd3
Remove unnecessary includes
avalentino Apr 13, 2014
01e325c
Silence compiler warnings
avalentino Apr 13, 2014
4038d40
Minor improvements
avalentino Apr 13, 2014
d7eaf5f
Add the MakeCompexPixelFunc that make a complex out of a real and ima…
alexamici Jun 23, 2015
6648310
Merge remote-tracking branch 'bopen/master'
avalentino Jun 23, 2015
4668088
Rename makecomplex into complex
avalentino Jun 23, 2015
ac7f70a
Fix floating point trunation in mod function (closes gh-3)
avalentino Feb 1, 2016
a984a78
ENH: Adding a complex derived dataset to allow for on-the-fly computa…
jmichel-otb Jul 4, 2016
e277ccf
ENH: Comments from review
jmichel-otb Jul 4, 2016
665d879
ENH: Expose derived subdatasets in SetBand()
jmichel-otb Jul 5, 2016
d384b9d
ENH: Report projectionRef, geoTransform and GCPs for derived subdatasets
jmichel-otb Jul 6, 2016
de11bcd
Prepare for integration in Gdal
jmichel-otb Jul 6, 2016
94d8ecc
ENH: Minor fixes in derived dataset
jmichel-otb Jul 6, 2016
a7b6a89
ENH: Implement virtual GetMetadata() and GetMetadataDomainList() in G…
jmichel-otb Jul 6, 2016
a5a8adb
ENH: Ensure that geotiff dataset calls base GetMetadata() and GetMeta…
jmichel-otb Jul 6, 2016
a75faf5
ENH: Remove useless trace
jmichel-otb Jul 6, 2016
67373d6
TEST: Removing those tests since they seem unrelated to the pixel fun…
jmichel-otb Jul 6, 2016
8ffbb53
Merge branch 'pixelfunctions-import' into pixelfunctions-integration
jmichel-otb Jul 6, 2016
9d18110
COMP: Adding pixelfunction file for compilation
jmichel-otb Jul 6, 2016
22c92a8
COMP: Add prototypes for all functions
jmichel-otb Jul 6, 2016
a53f540
ENH: Register default pixel functions
jmichel-otb Jul 6, 2016
dbd8187
Merge branch 'pixelfunctions-integration' into enhance-complex-datase…
jmichel-otb Jul 6, 2016
f0f79ef
ENH: Removing useless files (from PR review)
jmichel-otb Jul 6, 2016
bf13853
ENH: Remove code that only makes sense as part of a plugin (from PR r…
jmichel-otb Jul 6, 2016
6f95e7d
ENH: Avoid ignoring c files (from PR review)
jmichel-otb Jul 6, 2016
5e40669
ENH: Update makefile.vc as well (from PR review)
jmichel-otb Jul 6, 2016
d9fd29b
DOC: Adding a section about default pixel functions in vrt tutorial (…
jmichel-otb Jul 6, 2016
0e14ea1
COMP: Make pixelfunctions static, and solve link error
jmichel-otb Jul 6, 2016
c2e7853
Merge branch 'pixelfunctions-integration' into enhance-complex-datase…
jmichel-otb Jul 6, 2016
07eae9f
ENH: Add derived dataset to GDALmake.opt.in
jmichel-otb Jul 7, 2016
f264169
ENH: Remove hard-coded pixel function now that we have them within gdal
jmichel-otb Jul 7, 2016
ec88c34
ENH: Support several types of derived datasets, all declared in one p…
jmichel-otb Jul 7, 2016
97124fc
DOC: Add copyright notices
jmichel-otb Jul 7, 2016
f7fbcc2
BUG: Use the correct pixel function
jmichel-otb Jul 7, 2016
318ed3d
COMP: Adding make file for windows
jmichel-otb Jul 7, 2016
66e3388
COMP: Add gdal_vrt.h include to get declaration of prototype for GDAL…
jmichel-otb Jul 7, 2016
7ff31aa
Merge branch 'pixelfunctions-integration' into enhance-complex-datase…
jmichel-otb Jul 7, 2016
8783995
COMP: Fix include of gdal_vrt.h
jmichel-otb Jul 7, 2016
f1d0ab1
Merge branch 'pixelfunctions-integration' into enhance-complex-datase…
jmichel-otb Jul 7, 2016
2162049
TEST: Adding simple opening tests for cderived datasets
jmichel-otb Jul 7, 2016
de301c3
TEST: Make numpy dependency optional (from PR review)
jmichel-otb Jul 7, 2016
db55680
Merge branch 'pixelfunctions-integration' into enhance-complex-datase…
jmichel-otb Jul 7, 2016
0345b9e
COMP: Trying to fix travis-ci compilation error
jmichel-otb Jul 7, 2016
e8cb1ae
TEST: Fixing test failing due to bad indent
jmichel-otb Jul 7, 2016
afed253
Merge branch 'pixelfunctions-integration' into enhance-complex-datase…
jmichel-otb Jul 7, 2016
f014748
TEST: travis-ci failing due to python package imported but not used
jmichel-otb Jul 7, 2016
96ff920
ENH: CPLStringList * -> CPLStringList (from PR review)
jmichel-otb Jul 7, 2016
27ab9f5
ENH: Clear debug traces (from PR review)
jmichel-otb Jul 7, 2016
07a3c7e
STY: Fix if indentation (from PR review)
jmichel-otb Jul 7, 2016
5742267
ENH: Remove unused code (from PR review)
jmichel-otb Jul 7, 2016
842bff5
DOC: Fix copyright
jmichel-otb Jul 7, 2016
4713785
ENH: Replace magic number by appropriate definition (from PR review)
jmichel-otb Jul 7, 2016
44f6f4d
STY: papo -> o (from PR review)
jmichel-otb Jul 7, 2016
a42afc2
ENH: Hide static const DerivedDatasetDescription asDDSDesc [] in a co…
jmichel-otb Jul 7, 2016
c32128a
ENH: Renamed cderived -> derived (as it is not limited to complex dat…
jmichel-otb Jul 7, 2016
03ca1aa
COMP: Adding C wrapping stuff to make it compile
jmichel-otb Jul 7, 2016
a65e6ef
ENH: Avoid exposing complex relevant derived datasets if there is not…
jmichel-otb Jul 7, 2016
57e607d
ENH: Report correct block size (from PR review)
jmichel-otb Jul 7, 2016
e7965e4
MRG: Merge trunk into branch
jmichel-otb Jul 8, 2016
2490c3d
ENH: Better implementation of access to available subdatasets descrip…
jmichel-otb Jul 8, 2016
17516f6
TEST: Fix autotest for derived datasets
jmichel-otb Jul 8, 2016
153e215
TEST: Fix tests failing due to incorrect number of metadata domains
jmichel-otb Jul 8, 2016
b0abc50
BUG: Fix geotransform setting
jmichel-otb Jul 8, 2016
e1c072a
BUG: We must also now the return type of the pixel function (for inst…
jmichel-otb Jul 8, 2016
d96cf59
TEST: More complete tests, including geoTransform, Proj and Checksum …
jmichel-otb Jul 8, 2016
f6aaf6d
BUG: Ensure that DERIVED mdd is not reported twice
jmichel-otb Jul 8, 2016
8b7793e
BUG: Only report DERIVED metadata domain if there is at least one ras…
jmichel-otb Jul 8, 2016
a897355
Merge branch 'trunk' into enhance-complex-datasets-with-pf
jmichel-otb Jul 12, 2016
84afb22
TEST: Fixing tests failing because of new metadata domain DERIVED_SUB…
jmichel-otb Jul 12, 2016
5d922d9
Merge branch 'trunk' into enhance-complex-datasets-with-pf
jmichel-otb Jul 12, 2016
3fcc552
ENH: Add the DERIVED_SUBDATASETS domain to the filtered domain in gda…
jmichel-otb Jul 12, 2016
5b785c4
TEST: Fix remaining jp2openjpeg failing tests
jmichel-otb Jul 12, 2016
eba1603
COMP: Remove pixel function C file, as it has been renamed to .cpp
jmichel-otb Jul 12, 2016
72f37d6
TEST: Remove duplicate pixfun.py
jmichel-otb Jul 12, 2016
3a8ff49
TEST: Check expected checksum following modification of intensity fun…
jmichel-otb Jul 12, 2016
1a9a5fa
ENH: Remove last magic number
jmichel-otb Jul 12, 2016
bf03eed
DOC: Adding documentation derived datasets
jmichel-otb Jul 12, 2016
acd8343
DOC: Moving DERIVED dataset entry at the correct location in supporte…
jmichel-otb Jul 13, 2016
6371674
Merge branch 'trunk' into enhance-complex-datasets-with-pf
jmichel-otb Jul 13, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion gdal/gcore/gdaldataset.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3344,7 +3344,12 @@ char ** GDALDataset::GetMetadata(const char * pszDomain)
char ** GDALDataset::GetMetadataDomainList()
{
char ** currentDomainList = CSLDuplicate(oMDMD.GetDomainList());
currentDomainList = CSLAddString(currentDomainList,"DERIVED_SUBDATASETS");

// Ensure that we do not duplicate DERIVED domain
if(CSLFindString(currentDomainList,"DERIVED_SUBDATASETS")==-1)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In which situation would DERIVED_SUBDATASETs already be in oMDMD.GetDomainList() ?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In some of the tests from jp2openjpeg.py (the ones with vsimem). It seems that the dataset is a duplicate from another dataset (and that the whole metadata domain list is already ported during duplication).

{
currentDomainList = CSLAddString(currentDomainList,"DERIVED_SUBDATASETS");
}
return currentDomainList;
}

Expand Down