projects / packages / gdal.git / blame
| Commit | Line | Data |
|---|---|---|
| f7c9634c JB |
1 | --- gdal-1.5.1/frmts/hdf5/hdf5dataset.cpp.orig 2007-08-17 23:26:29.000000000 +0200 |
| 2 | +++ gdal-1.5.1/frmts/hdf5/hdf5dataset.cpp 2008-06-06 07:01:12.366555065 +0200 | |
| 3 | @@ -29,6 +29,8 @@ | |
| 4 | * DEALINGS IN THE SOFTWARE. | |
| 5 | ****************************************************************************/ | |
| 6 | ||
| 7 | +#define H5_USE_16_API | |
| 8 | + | |
| 9 | #include "hdf5.h" | |
| 10 | ||
| 11 | #include "gdal_priv.h" | |
| 12 | --- gdal-1.5.1/frmts/hdf5/hdf5imagedataset.cpp.orig 2008-01-22 15:45:12.000000000 +0100 | |
| 13 | +++ gdal-1.5.1/frmts/hdf5/hdf5imagedataset.cpp 2008-06-06 07:01:41.984244557 +0200 | |
| 14 | @@ -26,6 +26,8 @@ | |
| 15 | * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | |
| 16 | * DEALINGS IN THE SOFTWARE. | |
| 17 | ****************************************************************************/ | |
| 18 | +#define H5_USE_16_API | |
| 19 | + | |
| 20 | #include "hdf5.h" | |
| 21 | ||
| 22 | #include "gdal_pam.h" | |
| 23 | --- gdal-1.5.1/frmts/hdf4/hdf4dataset.h.orig 2007-10-13 18:37:17.000000000 +0200 | |
| 24 | +++ gdal-1.5.1/frmts/hdf4/hdf4dataset.h 2008-06-06 17:58:27.989863164 +0200 | |
| 25 | @@ -51,7 +51,7 @@ typedef enum // Types of data products | |
| 26 | SEAWIFS_L2, // SeaWiFS Level-2 Data | |
| 27 | SEAWIFS_L3, // SeaWiFS Level-3 Standard Mapped Image | |
| 28 | HYPERION_L1, // Hyperion L1 Data Product | |
| 29 | - UNKNOWN | |
| 30 | + SUB_UNKNOWN | |
| 31 | } HDF4SubdatasetType; | |
| 32 | ||
| 33 | /************************************************************************/ | |
| 34 | --- gdal-1.5.1/frmts/hdf4/hdf4dataset.cpp.orig 2007-10-13 18:37:17.000000000 +0200 | |
| 35 | +++ gdal-1.5.1/frmts/hdf4/hdf4dataset.cpp 2008-06-06 17:58:39.670528807 +0200 | |
| 36 | @@ -740,7 +740,7 @@ GDALDataset *HDF4Dataset::Open( GDALOpen | |
| 37 | ||
| 38 | else | |
| 39 | { | |
| 40 | - poDS->iSubdatasetType = UNKNOWN; | |
| 41 | + poDS->iSubdatasetType = SUB_UNKNOWN; | |
| 42 | poDS->pszSubdatasetType = "UNKNOWN"; | |
| 43 | } | |
| 44 | ||
| 45 | --- gdal-1.5.1/frmts/hdf4/hdf4imagedataset.cpp.orig 2008-02-14 16:25:46.000000000 +0100 | |
| 46 | +++ gdal-1.5.1/frmts/hdf4/hdf4imagedataset.cpp 2008-06-06 17:58:59.479660179 +0200 | |
| 47 | @@ -2290,7 +2290,7 @@ GDALDataset *HDF4ImageDataset::Open( GDA | |
| 48 | else if( EQUAL( papszSubdatasetName[1], "HYPERION_L1" ) ) | |
| 49 | poDS->iSubdatasetType= HYPERION_L1; | |
| 50 | else | |
| 51 | - poDS->iSubdatasetType = UNKNOWN; | |
| 52 | + poDS->iSubdatasetType = SUB_UNKNOWN; | |
| 53 | ||
| 54 | // Is our file still here? | |
| 55 | if ( !Hishdf( poDS->pszFilename ) ) | |
| 56 | @@ -2919,7 +2919,7 @@ GDALDataset *HDF4ImageDataset::Open( GDA | |
| 57 | /* -------------------------------------------------------------------- */ | |
| 58 | /* Generic SDS */ | |
| 59 | /* -------------------------------------------------------------------- */ | |
| 60 | - case UNKNOWN: | |
| 61 | + case SUB_UNKNOWN: | |
| 62 | { | |
| 63 | ||
| 64 | // This is a coastwatch convention. |