| Arc/Info Binary Grid (.adf)
| AIG
| No
Index: frmts/frmt_various.html
===================================================================
--- frmts/frmt_various.html (révision 12327)
+++ frmts/frmt_various.html (copie de travail)
@@ -35,6 +35,18 @@
NOTE: Implemented as gdal/frmts/aaigrid/aaigriddataset.cpp.
+
+Supported by GDAL for read access. Creation is possible, but it must be
+considered as experimental and a means of testing read access (although files created
+by the driver can be read successfully on another GIS software)
+An ADRG dataset is made of several files. The file recognised by GDAL is the
+General Information File (.GEN). GDAL will also need the image file (.IMG),
+where the actual data is. The Transmission Header File (.THF) can also be used as an input to GDAL.
+Overviews, legends and insets are not used. Polar zones (ARC zone 9 and 18) are not supported (due to the lack of test data).
+This is an alternative to using the OGDI Bridge for ADRG datasets.
+
+See also : the ADRG specification (MIL-A-89007)
+
Supported by GDAL for read access.
Index: frmts/adrg/adrgdataset.cpp
===================================================================
--- frmts/adrg/adrgdataset.cpp (révision 0)
+++ frmts/adrg/adrgdataset.cpp (révision 0)
@@ -0,0 +1,1943 @@
+/******************************************************************************
+ * $Id: adrgdataset.cpp
+ *
+ * Purpose: ADRG reader
+ * Author: Even Rouault, even.rouault at mines-paris.org
+ *
+ ******************************************************************************
+ * Copyright (c) 2007, Even Rouault
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ ****************************************************************************/
+
+#include "gdal_pam.h"
+#include "ogr_spatialref.h"
+#include "cpl_string.h"
+#include "iso8211.h"
+
+#define N_ELEMENTS(x) (sizeof(x)/sizeof(x[0]))
+
+class ADRGDataset : public GDALPamDataset
+{
+ friend class ADRGRasterBand;
+
+ FILE* fdIMG;
+ int* TILEINDEX;
+ int offsetInIMG;
+ int NFC;
+ int NFL;
+ double LSO;
+ double PSO;
+ int ARV;
+ int BRV;
+
+ ADRGDataset* poOverviewDS;
+
+ /* For creation */
+ int bCreation;
+ FILE* fdGEN;
+ FILE* fdTHF;
+ int bGeoTransformValid;
+ double adfGeoTransform[6];
+ int nNextAvailableBlock;
+ CPLString baseFileName;
+
+ public:
+ ADRGDataset();
+ virtual ~ADRGDataset();
+
+ virtual const char *GetProjectionRef(void);
+ virtual CPLErr GetGeoTransform( double * padfGeoTransform );
+ virtual CPLErr SetGeoTransform( double * padfGeoTransform );
+
+ static CPLString GetGENFromTHF(const char* fileName);
+ static ADRGDataset* GetFromRecord(const char* fileName, DDFRecord * record, int isGIN);
+ static GDALDataset *Open( GDALOpenInfo * );
+ static GDALDataset *Create(const char* pszFilename, int nXSize, int nYSize,
+ int nBands, GDALDataType eType, char **papszOptions);
+
+ static double GetLongitudeFromString(const char* str);
+ static double GetLatitudeFromString(const char* str);
+
+ void WriteGENFile();
+ void WriteTHFFile();
+};
+
+/************************************************************************/
+/* ==================================================================== */
+/* ADRGRasterBand */
+/* ==================================================================== */
+/************************************************************************/
+
+class ADRGRasterBand : public GDALPamRasterBand
+{
+ friend class ADRGDataset;
+
+ public:
+ ADRGRasterBand( ADRGDataset *, int );
+
+ virtual GDALColorInterp GetColorInterpretation();
+ virtual CPLErr IReadBlock( int, int, void * );
+ virtual CPLErr IWriteBlock( int, int, void * );
+
+ virtual double GetNoDataValue( int *pbSuccess = NULL );
+
+// virtual int GetOverviewCount();
+// virtual GDALRasterBand* GetOverview(int i);
+};
+
+
+/************************************************************************/
+/* ADRGRasterBand() */
+/************************************************************************/
+
+ADRGRasterBand::ADRGRasterBand( ADRGDataset *poDS, int nBand )
+
+{
+ this->poDS = poDS;
+ this->nBand = nBand;
+
+ eDataType = GDT_Byte;
+
+ nBlockXSize = 128;
+ nBlockYSize = 128;
+}
+
+#if 0
+
+/* We have a problem with the overview. Its geo bounding box doesn't match */
+/* exactly the one of the main image. We should handle the shift between */
+/* the two top level corners... */
+
+/************************************************************************/
+/* GetOverviewCount() */
+/************************************************************************/
+
+int ADRGRasterBand::GetOverviewCount()
+
+{
+ ADRGDataset* poDS = (ADRGDataset*)this->poDS;
+ if( poDS->poOverviewDS )
+ return 1;
+ else
+ return GDALRasterBand::GetOverviewCount();
+}
+
+/************************************************************************/
+/* GetOverview() */
+/************************************************************************/
+
+GDALRasterBand *ADRGRasterBand::GetOverview( int i )
+
+{
+ ADRGDataset* poDS = (ADRGDataset*)this->poDS;
+ if( poDS->poOverviewDS )
+ {
+ if( i < 0 || i >= 1 )
+ return NULL;
+ else
+ return poDS->poOverviewDS->GetRasterBand(nBand);
+ }
+ else
+ return GDALRasterBand::GetOverview( i );
+}
+#endif
+
+/************************************************************************/
+/* GetNoDataValue() */
+/************************************************************************/
+
+double ADRGRasterBand::GetNoDataValue( int *pbSuccess )
+{
+ if (pbSuccess)
+ *pbSuccess = TRUE;
+
+ return 0;
+}
+
+/************************************************************************/
+/* GetColorInterpretation() */
+/************************************************************************/
+
+GDALColorInterp ADRGRasterBand::GetColorInterpretation()
+
+{
+ if( nBand == 1 )
+ return GCI_RedBand;
+
+ else if( nBand == 2 )
+ return GCI_GreenBand;
+
+ else
+ return GCI_BlueBand;
+}
+
+/************************************************************************/
+/* IReadBlock() */
+/************************************************************************/
+
+CPLErr ADRGRasterBand::IReadBlock( int nBlockXOff, int nBlockYOff,
+ void * pImage )
+
+{
+ ADRGDataset* poDS = (ADRGDataset*)this->poDS;
+ int offset;
+ int nBlock = nBlockYOff * poDS->NFC + nBlockXOff;
+ if (nBlockXOff >= poDS->NFC || nBlockYOff >= poDS->NFL)
+ {
+ CPLError(CE_Failure, CPLE_AppDefined, "nBlockXOff=%d, NFC=%d, nBlockYOff=%d, NFL=%d",
+ nBlockXOff, poDS->NFC, nBlockYOff, poDS->NFL);
+ return CE_Failure;
+ }
+ CPLDebug("ADRG", "(%d,%d) -> nBlock = %d", nBlockXOff, nBlockYOff, nBlock);
+
+ if (poDS->bCreation)
+ {
+ memset(pImage, 0, 128 * 128);
+ return CE_None;
+ }
+
+ if (poDS->TILEINDEX)
+ {
+ if (poDS->TILEINDEX[nBlock] == 0)
+ {
+ memset(pImage, 0, 128 * 128);
+ return CE_None;
+ }
+ offset = poDS->offsetInIMG + (poDS->TILEINDEX[nBlock] - 1) * 128 * 128 * 3 + (nBand - 1) * 128 * 128;
+ }
+ else
+ offset = poDS->offsetInIMG + nBlock * 128 * 128 * 3 + (nBand - 1) * 128 * 128;
+
+ if (VSIFSeekL(poDS->fdIMG, offset, SEEK_SET) != 0)
+ {
+ CPLError(CE_Failure, CPLE_AppDefined, "Cannot seek to offset %d", offset);
+ return CE_Failure;
+ }
+ if (VSIFReadL(pImage, 1, 128 * 128, poDS->fdIMG) != 128 * 128)
+ {
+ CPLError(CE_Failure, CPLE_AppDefined, "Cannot read data at offset %d", offset);
+ return CE_Failure;
+ }
+
+ return CE_None;
+}
+
+/************************************************************************/
+/* IWriteBlock() */
+/************************************************************************/
+
+CPLErr ADRGRasterBand::IWriteBlock( int nBlockXOff, int nBlockYOff,
+ void * pImage )
+
+{
+ ADRGDataset* poDS = (ADRGDataset*)this->poDS;
+ int offset;
+ int nBlock = nBlockYOff * poDS->NFC + nBlockXOff;
+ if (nBlockXOff >= poDS->NFC || nBlockYOff >= poDS->NFL)
+ {
+ CPLError(CE_Failure, CPLE_AppDefined, "nBlockXOff=%d, NFC=%d, nBlockYOff=%d, NFL=%d",
+ nBlockXOff, poDS->NFC, nBlockYOff, poDS->NFL);
+ return CE_Failure;
+ }
+ CPLDebug("ADRG", "(%d,%d) -> nBlock = %d", nBlockXOff, nBlockYOff, nBlock);
+
+ if (poDS->TILEINDEX[nBlock] == 0)
+ {
+ unsigned int i;
+ int* pi = (int*)pImage;
+ for(i=0;i<128*128 / sizeof(int);i++)
+ {
+ if (pi[i])
+ break;
+ }
+ if (i == 128*128 / sizeof(int))
+ {
+ return CE_None;
+ }
+
+ poDS->TILEINDEX[nBlock] = poDS->nNextAvailableBlock ++;
+ }
+
+ offset = poDS->offsetInIMG + (poDS->TILEINDEX[nBlock] - 1) * 128 * 128 * 3 + (nBand - 1) * 128 * 128;
+
+ if (VSIFSeekL(poDS->fdIMG, offset, SEEK_SET) != 0)
+ {
+ CPLError(CE_Failure, CPLE_AppDefined, "Cannot seek to offset %d", offset);
+ return CE_Failure;
+ }
+ if (VSIFWriteL(pImage, 1, 128 * 128, poDS->fdIMG) != 128 * 128)
+ {
+ CPLError(CE_Failure, CPLE_AppDefined, "Cannot read data at offset %d", offset);
+ return CE_Failure;
+ }
+
+ return CE_None;
+}
+
+static unsigned int WriteSubFieldStr(FILE* fd, const char* pszStr, unsigned int size)
+{
+ char str[size+1];
+ memset(str, ' ', size);
+ if (strlen(pszStr) > size)
+ {
+ CPLError(CE_Failure, CPLE_AppDefined, "strlen(pszStr) > size");
+ return size;
+ }
+ strcpy(str, pszStr);
+ str[strlen(pszStr)] = ' ';
+ VSIFWriteL(str, 1, size, fd);
+ return size;
+}
+
+static unsigned int WriteSubFieldInt(FILE* fd, int val, unsigned int size)
+{
+ char str[size+1];
+ char formatStr[32];
+ sprintf( formatStr, "%%0%dd", size);
+ sprintf( str, formatStr, val);
+ VSIFWriteL(str, 1, size, fd);
+ return size;
+}
+
+static unsigned int WriteFieldTerminator(FILE* fd)
+{
+ char fieldTerminator = 30;
+ VSIFWriteL(&fieldTerminator, 1, 1, fd);
+ return 1;
+}
+
+static unsigned int WriteUnitTerminator(FILE* fd)
+{
+ char fieldTerminator = 31;
+ VSIFWriteL(&fieldTerminator, 1, 1, fd);
+ return 1;
+}
+
+static unsigned int WriteLongitude(FILE* fd, double val)
+{
+ char str[11+1];
+ char sign = (val >= 0) ? '+' : '-';
+ if (val < 0) val = -val;
+ int ddd = (int)val;
+ int mm = (int)((val - ddd) * 60);
+ double ssdotss = ((val - ddd) * 60 - mm) * 60;
+ sprintf(str, "%c%03d%02d%02.2f", sign, ddd, mm, ssdotss);
+ VSIFWriteL(str, 1, 11, fd);
+ return 11;
+}
+
+static unsigned int WriteLatitude(FILE* fd, double val)
+{
+ char str[10+1];
+ char sign = (val >= 0) ? '+' : '-';
+ if (val < 0) val = -val;
+ int dd = (int)val;
+ int mm = (int)((val - dd) * 60);
+ double ssdotss = ((val - dd) * 60 - mm) * 60;
+ sprintf(str, "%c%02d%02d%02.2f", sign, dd, mm, ssdotss);
+ VSIFWriteL(str, 1, 10, fd);
+ return 10;
+}
+
+static int BeginLeader(FILE* fd, int sizeFieldLength, int sizeFieldPos, int sizeFieldTag,
+ int nFields)
+{
+ int pos = VSIFTellL(fd);
+ VSIFSeekL(fd, 24 + (sizeFieldLength + sizeFieldPos + sizeFieldTag) * nFields + 1, SEEK_CUR);
+ return pos;
+}
+
+static void FinishWriteLeader(FILE* fd, int beginPos, int sizeFieldLength, int sizeFieldPos, int sizeFieldTag,
+ int nFields, int* sizeOfFields, const char** nameOfFields)
+{
+ int endPos = VSIFTellL(fd);
+ VSIFSeekL(fd, beginPos, SEEK_SET);
+
+ int nLeaderSize = 24;
+ char szLeader[nLeaderSize+1];
+ memset(szLeader, ' ', nLeaderSize);
+
+ int i;
+ int nDataSize = 0;
+ int nFieldOffset = 0;
+ for(i=0;iGetField(2);
+ fieldDefn = field->GetFieldDefn();
+
+ if (isGIN)
+ {
+ if (!(strcmp(fieldDefn->GetName(), "GEN") == 0 &&
+ fieldDefn->GetSubfieldCount() == 21))
+ {
+ return NULL;
+ }
+
+ subfieldDefn = fieldDefn->GetSubfield(0);
+ if (!(strcmp(subfieldDefn->GetName(), "STR") == 0 &&
+ (subfieldDefn->GetFormat())[0] == 'I' &&
+ subfieldDefn->ExtractIntData(field->GetSubfieldData(subfieldDefn), 1, NULL) == 3))
+ {
+ return NULL;
+ }
+
+ subfieldDefn = fieldDefn->GetSubfield(12);
+ if (!(strcmp(subfieldDefn->GetName(), "SCA") == 0 &&
+ (subfieldDefn->GetFormat())[0] == 'I'))
+ {
+ return NULL;
+ }
+
+ SCA = subfieldDefn->ExtractIntData(field->GetSubfieldData(subfieldDefn), 9, NULL);
+ CPLDebug("ADRG", "SCA=%d", SCA);
+
+ subfieldDefn = fieldDefn->GetSubfield(13);
+ if (!(strcmp(subfieldDefn->GetName(), "ZNA") == 0 &&
+ (subfieldDefn->GetFormat())[0] == 'I'))
+ {
+ return NULL;
+ }
+
+ ZNA = subfieldDefn->ExtractIntData(field->GetSubfieldData(subfieldDefn), 2, NULL);
+ CPLDebug("ADRG", "ZNA=%d", ZNA);
+
+ subfieldDefn = fieldDefn->GetSubfield(14);
+ if (!(strcmp(subfieldDefn->GetName(), "PSP") == 0 &&
+ (subfieldDefn->GetFormat())[0] == 'R'))
+ {
+ return NULL;
+ }
+
+ PSP = subfieldDefn->ExtractFloatData(field->GetSubfieldData(subfieldDefn), 5, NULL);
+ CPLDebug("ADRG", "PSP=%f", PSP);
+ if (PSP != 100)
+ {
+ return NULL;
+ }
+
+ subfieldDefn = fieldDefn->GetSubfield(16);
+ if (!(strcmp(subfieldDefn->GetName(), "ARV") == 0 &&
+ (subfieldDefn->GetFormat())[0] == 'I'))
+ {
+ return NULL;
+ }
+
+ ARV = subfieldDefn->ExtractIntData(field->GetSubfieldData(subfieldDefn), 8, NULL);
+ CPLDebug("ADRG", "ARV=%d", ARV);
+
+ subfieldDefn = fieldDefn->GetSubfield(17);
+ if (!(strcmp(subfieldDefn->GetName(), "BRV") == 0 &&
+ (subfieldDefn->GetFormat())[0] == 'I'))
+ {
+ return NULL;
+ }
+
+ BRV = subfieldDefn->ExtractIntData(field->GetSubfieldData(subfieldDefn), 8, NULL);
+ CPLDebug("ADRG", "BRV=%d", BRV);
+
+
+ subfieldDefn = fieldDefn->GetSubfield(18);
+ if (!(strcmp(subfieldDefn->GetName(), "LSO") == 0 &&
+ (subfieldDefn->GetFormat())[0] == 'A'))
+ {
+ return NULL;
+ }
+
+ LSO = GetLongitudeFromString(subfieldDefn->ExtractStringData(field->GetSubfieldData(subfieldDefn), 11, NULL));
+ CPLDebug("ADRG", "LSO=%f", LSO);
+
+ subfieldDefn = fieldDefn->GetSubfield(19);
+ if (!(strcmp(subfieldDefn->GetName(), "PSO") == 0 &&
+ (subfieldDefn->GetFormat())[0] == 'A'))
+ {
+ return NULL;
+ }
+
+ PSO = GetLatitudeFromString(subfieldDefn->ExtractStringData(field->GetSubfieldData(subfieldDefn), 10, NULL));
+ CPLDebug("ADRG", "PSO=%f", PSO);
+ }
+ else
+ {
+ if (!(strcmp(fieldDefn->GetName(), "OVI") == 0 &&
+ fieldDefn->GetSubfieldCount() == 5))
+ {
+ return NULL;
+ }
+
+ subfieldDefn = fieldDefn->GetSubfield(0);
+ if (!(strcmp(subfieldDefn->GetName(), "STR") == 0 &&
+ (subfieldDefn->GetFormat())[0] == 'I' &&
+ subfieldDefn->ExtractIntData(field->GetSubfieldData(subfieldDefn), 1, NULL) == 3))
+ {
+ return NULL;
+ }
+
+ subfieldDefn = fieldDefn->GetSubfield(1);
+ if (!(strcmp(subfieldDefn->GetName(), "ARV") == 0 &&
+ (subfieldDefn->GetFormat())[0] == 'I'))
+ {
+ return NULL;
+ }
+
+ ARV = subfieldDefn->ExtractIntData(field->GetSubfieldData(subfieldDefn), 8, NULL);
+ CPLDebug("ADRG", "ARV=%d", ARV);
+
+ subfieldDefn = fieldDefn->GetSubfield(2);
+ if (!(strcmp(subfieldDefn->GetName(), "BRV") == 0 &&
+ (subfieldDefn->GetFormat())[0] == 'I'))
+ {
+ return NULL;
+ }
+
+ BRV = subfieldDefn->ExtractIntData(field->GetSubfieldData(subfieldDefn), 8, NULL);
+ CPLDebug("ADRG", "BRV=%d", BRV);
+
+
+ subfieldDefn = fieldDefn->GetSubfield(3);
+ if (!(strcmp(subfieldDefn->GetName(), "LSO") == 0 &&
+ (subfieldDefn->GetFormat())[0] == 'A'))
+ {
+ return NULL;
+ }
+
+ LSO = GetLongitudeFromString(subfieldDefn->ExtractStringData(field->GetSubfieldData(subfieldDefn), 11, NULL));
+ CPLDebug("ADRG", "LSO=%f", LSO);
+
+ subfieldDefn = fieldDefn->GetSubfield(4);
+ if (!(strcmp(subfieldDefn->GetName(), "PSO") == 0 &&
+ (subfieldDefn->GetFormat())[0] == 'A'))
+ {
+ return NULL;
+ }
+
+ PSO = GetLatitudeFromString(subfieldDefn->ExtractStringData(field->GetSubfieldData(subfieldDefn), 10, NULL));
+ CPLDebug("ADRG", "PSO=%f", PSO);
+ }
+
+ field = record->GetField(3);
+ fieldDefn = field->GetFieldDefn();
+
+ if (!(strcmp(fieldDefn->GetName(), "SPR") == 0 &&
+ fieldDefn->GetSubfieldCount() == 15))
+ {
+ return NULL;
+ }
+
+ subfieldDefn = fieldDefn->GetSubfield(4);
+ if (!(strcmp(subfieldDefn->GetName(), "NFL") == 0 &&
+ (subfieldDefn->GetFormat())[0] == 'I'))
+ {
+ return NULL;
+ }
+
+ NFL = subfieldDefn->ExtractIntData(field->GetSubfieldData(subfieldDefn), 3, NULL);
+ CPLDebug("ADRG", "NFL=%d", NFL);
+
+ subfieldDefn = fieldDefn->GetSubfield(5);
+ if (!(strcmp(subfieldDefn->GetName(), "NFC") == 0 &&
+ (subfieldDefn->GetFormat())[0] == 'I'))
+ {
+ return NULL;
+ }
+
+ NFC = subfieldDefn->ExtractIntData(field->GetSubfieldData(subfieldDefn), 3, NULL);
+ CPLDebug("ADRG", "NFC=%d", NFC);
+
+ subfieldDefn = fieldDefn->GetSubfield(6);
+ if (!(strcmp(subfieldDefn->GetName(), "PNC") == 0 &&
+ (subfieldDefn->GetFormat())[0] == 'I'))
+ {
+ return NULL;
+ }
+
+ int PNC = subfieldDefn->ExtractIntData(field->GetSubfieldData(subfieldDefn), 6, NULL);
+ CPLDebug("ADRG", "PNC=%d", PNC);
+ if (PNC != 128)
+ {
+ return NULL;
+ }
+
+ subfieldDefn = fieldDefn->GetSubfield(7);
+ if (!(strcmp(subfieldDefn->GetName(), "PNL") == 0 &&
+ (subfieldDefn->GetFormat())[0] == 'I'))
+ {
+ return NULL;
+ }
+
+ int PNL = subfieldDefn->ExtractIntData(field->GetSubfieldData(subfieldDefn), 6, NULL);
+ CPLDebug("ADRG", "PNL=%d", PNL);
+ if (PNL != 128)
+ {
+ return NULL;
+ }
+
+ subfieldDefn = fieldDefn->GetSubfield(13);
+ if (!(strcmp(subfieldDefn->GetName(), "BAD") == 0 &&
+ (subfieldDefn->GetFormat())[0] == 'A'))
+ {
+ return NULL;
+ }
+
+ BAD = subfieldDefn->ExtractStringData(field->GetSubfieldData(subfieldDefn), 12, NULL);
+ {
+ char* c = strchr(BAD, ' ');
+ if (c)
+ *c = 0;
+ }
+ CPLDebug("ADRG", "BAD=%s", (const char*)BAD);
+
+ subfieldDefn = fieldDefn->GetSubfield(14);
+ if (!(strcmp(subfieldDefn->GetName(), "TIF") == 0 &&
+ (subfieldDefn->GetFormat())[0] == 'A'))
+ {
+ return NULL;
+ }
+
+ TIF = subfieldDefn->ExtractStringData(field->GetSubfieldData(subfieldDefn), 1, NULL)[0] == 'Y';
+ CPLDebug("ADRG", "TIF=%d", TIF);
+
+ if (TIF)
+ {
+ if (record->GetFieldCount() != 6)
+ {
+ return NULL;
+ }
+
+ field = record->GetField(5);
+ fieldDefn = field->GetFieldDefn();
+
+ if (!(strcmp(fieldDefn->GetName(), "TIM") == 0))
+ {
+ return NULL;
+ }
+
+ if (field->GetDataSize() != 5 * NFL * NFC + 1)
+ {
+ return NULL;
+ }
+
+ TILEINDEX = new int [NFL * NFC];
+ const char* ptr = field->GetData();
+ char offset[5+1]={0};
+ for(i=0;iNFC = NFC;
+ poDS->NFL = NFL;
+ poDS->nRasterXSize = NFC * 128;
+ poDS->nRasterYSize = NFL * 128;
+ poDS->LSO = LSO;
+ poDS->PSO = PSO;
+ poDS->ARV = ARV;
+ poDS->BRV = BRV;
+ poDS->TILEINDEX = TILEINDEX;
+ poDS->fdIMG = fdIMG;
+ poDS->offsetInIMG = offsetInIMG;
+ poDS->poOverviewDS = NULL;
+
+ if (isGIN)
+ {
+ char pszValue[32];
+ sprintf(pszValue, "%d", SCA);
+ poDS->SetMetadataItem( "ADRG_SCA", pszValue );
+ }
+
+ poDS->nBands = 3;
+ for( i = 0; i < poDS->nBands; i++ )
+ poDS->SetBand( i+1, new ADRGRasterBand( poDS, i+1 ) );
+
+ return poDS;
+}
+
+/************************************************************************/
+/* GetGENFromTHF() */
+/************************************************************************/
+
+CPLString ADRGDataset::GetGENFromTHF(const char* fileName)
+{
+ DDFModule module;
+ DDFRecord * record;
+ DDFField* field;
+ DDFFieldDefn *fieldDefn;
+ DDFSubfieldDefn* subfieldDefn;
+ int i;
+
+ if (!module.Open((const char*)fileName, TRUE))
+ return "";
+
+ while ((record = module.ReadRecord()) != NULL)
+ {
+ if (record->GetFieldCount() >= 2)
+ {
+ field = record->GetField(0);
+ fieldDefn = field->GetFieldDefn();
+ if (!(strcmp(fieldDefn->GetName(), "001") == 0 &&
+ fieldDefn->GetSubfieldCount() == 2))
+ {
+ continue;
+ }
+
+ subfieldDefn = fieldDefn->GetSubfield(0);
+ if (!(strcmp(subfieldDefn->GetName(), "RTY") == 0 &&
+ (subfieldDefn->GetFormat())[0] == 'A'))
+ {
+ continue;
+ }
+
+ const char* RTY = subfieldDefn->ExtractStringData(field->GetSubfieldData(subfieldDefn), 3, NULL);
+ if (! ( strcmp(RTY, "TFN") == 0 ))
+ {
+ continue;
+ }
+
+ for (i = 1; i < record->GetFieldCount() ; i++)
+ {
+ field = record->GetField(i);
+ fieldDefn = field->GetFieldDefn();
+
+ if (!(strcmp(fieldDefn->GetName(), "VFF") == 0 &&
+ fieldDefn->GetSubfieldCount() == 1))
+ {
+ continue;
+ }
+
+ subfieldDefn = fieldDefn->GetSubfield(0);
+ if (!(strcmp(subfieldDefn->GetName(), "VFF") == 0 &&
+ (subfieldDefn->GetFormat())[0] == 'A'))
+ {
+ continue;
+ }
+
+ CPLString subFileName(subfieldDefn->ExtractStringData(field->GetSubfieldData(subfieldDefn), 300, NULL));
+ char* c = strchr(subFileName, ' ');
+ if (c)
+ *c = 0;
+ if (EQUAL(CPLGetExtension((const char*)subFileName), "GEN"))
+ {
+ CPLDebug("ADRG", "Found GEN file in THF : %s", (const char*)subFileName);
+ CPLString GENFileName(CPLGetDirname(fileName));
+ char** tokens = CSLTokenizeString2( subFileName, "/\"", 0);
+ char** ptr = tokens;
+ if (ptr == NULL)
+ continue;
+ while(*ptr)
+ {
+ char** dirContent = VSIReadDir((const char*)GENFileName);
+ char** ptrDir = dirContent;
+ if (ptrDir)
+ {
+ while(*ptrDir)
+ {
+ if (EQUAL(*ptrDir, *ptr))
+ {
+ GENFileName = CPLFormFilename((const char*)GENFileName, *ptrDir, NULL);
+ CPLDebug("ADRG", "Building GEN full file name : %s", (const char*)GENFileName);
+ break;
+ }
+ ptrDir ++;
+ }
+ }
+ if (ptrDir == NULL)
+ break;
+ CSLDestroy(dirContent);
+ ptr++;
+ }
+ int isNameValid = *ptr == NULL;
+ CSLDestroy(tokens);
+ if (isNameValid)
+ return GENFileName;
+ }
+ }
+ }
+ }
+ return "";
+}
+
+/************************************************************************/
+/* Open() */
+/************************************************************************/
+
+GDALDataset *ADRGDataset::Open( GDALOpenInfo * poOpenInfo )
+{
+ DDFModule module;
+ DDFRecord * record;
+ DDFField* field;
+ DDFFieldDefn *fieldDefn;
+ DDFSubfieldDefn* subfieldDefn;
+ ADRGDataset* overviewDS = NULL;
+ CPLString fileName(poOpenInfo->pszFilename);
+ CPLString NAM;
+
+ if (EQUAL(CPLGetExtension((const char*)fileName), "thf"))
+ {
+ fileName = GetGENFromTHF((const char*)fileName);
+ }
+
+ if (!EQUAL(CPLGetExtension((const char*)fileName), "gen"))
+ return NULL;
+
+ if (!module.Open((const char*)fileName, TRUE))
+ return NULL;
+
+ while ((record = module.ReadRecord()) != NULL)
+ {
+ if (record->GetFieldCount() >= 5)
+ {
+ field = record->GetField(0);
+ fieldDefn = field->GetFieldDefn();
+ if (!(strcmp(fieldDefn->GetName(), "001") == 0 &&
+ fieldDefn->GetSubfieldCount() == 2))
+ {
+ continue;
+ }
+
+ subfieldDefn = fieldDefn->GetSubfield(0);
+ if (!(strcmp(subfieldDefn->GetName(), "RTY") == 0 &&
+ (subfieldDefn->GetFormat())[0] == 'A'))
+ {
+ continue;
+ }
+
+ const char* RTY = subfieldDefn->ExtractStringData(field->GetSubfieldData(subfieldDefn), 3, NULL);
+ if (! ( strcmp(RTY, "GIN") == 0 || strcmp(RTY, "OVV") == 0 ))
+ {
+ continue;
+ }
+
+ int isGIN = strcmp(RTY, "GIN") == 0;
+
+ field = record->GetField(1);
+ fieldDefn = field->GetFieldDefn();
+
+ if (!(strcmp(fieldDefn->GetName(), "DSI") == 0 &&
+ fieldDefn->GetSubfieldCount() == 2))
+ {
+ continue;
+ }
+
+ subfieldDefn = fieldDefn->GetSubfield(0);
+ if (!(strcmp(subfieldDefn->GetName(), "PRT") == 0 &&
+ (subfieldDefn->GetFormat())[0] == 'A' &&
+ strcmp(subfieldDefn->ExtractStringData(field->GetSubfieldData(subfieldDefn), 4, NULL), "ADRG") == 0))
+ {
+ continue;
+ }
+
+ subfieldDefn = fieldDefn->GetSubfield(1);
+ if (!(strcmp(subfieldDefn->GetName(), "NAM") == 0 &&
+ (subfieldDefn->GetFormat())[0] == 'A'))
+ {
+ continue;
+ }
+
+ NAM = subfieldDefn->ExtractStringData(field->GetSubfieldData(subfieldDefn), 8, NULL);
+ CPLDebug("ADRG", "NAM=%s", (const char*)NAM);
+
+ if (isGIN)
+ {
+ ADRGDataset* poDS = GetFromRecord((const char*)fileName, record, TRUE);
+ if (poDS)
+ {
+ poDS->SetMetadataItem( "ADRG_NAM", (const char*)NAM );
+
+ poDS->poOverviewDS = overviewDS;
+
+ /* -------------------------------------------------------------------- */
+ /* Check for external overviews. */
+ /* -------------------------------------------------------------------- */
+ poDS->oOvManager.Initialize( poDS, poOpenInfo->pszFilename );
+
+ /* -------------------------------------------------------------------- */
+ /* Initialize any PAM information. */
+ /* -------------------------------------------------------------------- */
+ //poDS->SetDescription( poOpenInfo->pszFilename );
+ //poDS->TryLoadXML();
+
+ }
+ else if (overviewDS)
+ {
+ delete overviewDS;
+ }
+ return poDS;
+ }
+#if 0
+ else
+ overviewDS = GetFromRecord((const char*)fileName, record, FALSE);
+#endif
+
+ }
+ }
+
+ if (overviewDS)
+ delete overviewDS;
+
+ return NULL;
+}
+
+/************************************************************************/
+/* Open() */
+/************************************************************************/
+
+GDALDataset *ADRGDataset::Create(const char* pszFilename, int nXSize, int nYSize,
+ int nBands, GDALDataType eType, char **papszOptions)
+{
+ int i;
+
+ if( eType != GDT_Byte)
+ {
+ CPLError( CE_Failure, CPLE_AppDefined,
+ "Attempt to create ADRG dataset with an illegal\n"
+ "data type (%s), only Byte supported by the format.\n",
+ GDALGetDataTypeName(eType) );
+
+ return NULL;
+ }
+
+ if( nBands != 3 )
+ {
+ CPLError( CE_Failure, CPLE_NotSupported,
+ "ADRG driver doesn't support %d bands. Must be 3 (rgb) bands.\n",
+ nBands );
+ return NULL;
+ }
+
+ if(nXSize < 1 || nYSize < 1)
+ {
+ CPLError( CE_Failure, CPLE_NotSupported,
+ "Specified pixel dimensions (% d x %d) are bad.\n",
+ nXSize, nYSize );
+ }
+
+ if (!EQUAL(CPLGetExtension(pszFilename), "gen"))
+ {
+ CPLError( CE_Failure, CPLE_NotSupported,
+ "Invalid filename. Must be ABCDEF01.GEN\n");
+ return NULL;
+ }
+
+ CPLString baseFileName(CPLGetBasename(pszFilename));
+ if (strlen(baseFileName) != 8 || baseFileName[6] != '0' || baseFileName[7] != '1')
+ {
+ CPLError( CE_Failure, CPLE_NotSupported,
+ "Invalid filename. Must be xxxxxx01.GEN where x is between A and Z\n");
+ return NULL;
+ }
+
+ for(i=0;i<6;i++)
+ {
+ if (!(baseFileName[i] >= 'A' && baseFileName[i] <= 'Z'))
+ {
+ CPLError( CE_Failure, CPLE_NotSupported,
+ "Invalid filename. Must be xxxxxx01.GEN where x is between A and Z\n");
+ return NULL;
+ }
+ }
+
+ FILE* fdGEN = VSIFOpenL((const char*)pszFilename, "wb");
+ if (fdGEN == NULL)
+ {
+ CPLError( CE_Failure, CPLE_NotSupported,
+ "Cannot create GEN file.\n");
+ return NULL;
+ }
+
+ CPLString dirname(CPLGetDirname(pszFilename));
+ FILE* fdTHF = VSIFOpenL(CPLFormFilename((const char*)dirname, "TRANSH01.THF", NULL), "wb");
+ if (fdTHF == NULL)
+ {
+ VSIFCloseL(fdGEN);
+ CPLError( CE_Failure, CPLE_NotSupported,
+ "Cannot create THF file.\n");
+ return NULL;
+ }
+
+ CPLString imgFilename = CPLResetExtension(pszFilename, "IMG");
+ FILE* fdIMG = VSIFOpenL((const char*)imgFilename, "wb");
+ if (fdIMG == NULL)
+ {
+ VSIFCloseL(fdGEN);
+ VSIFCloseL(fdTHF);
+ CPLError( CE_Failure, CPLE_NotSupported,
+ "Cannot create image file.\n");
+ return NULL;
+ }
+
+ ADRGDataset* poDS = new ADRGDataset();
+
+ poDS->fdGEN = fdGEN;
+ poDS->fdIMG = fdIMG;
+ poDS->fdTHF = fdTHF;
+
+ poDS->baseFileName = baseFileName;
+ poDS->bCreation = TRUE;
+ poDS->nNextAvailableBlock = 1;
+ poDS->NFC = (nXSize + 127) / 128;
+ poDS->NFL = (nYSize + 127) / 128;
+ poDS->nRasterXSize = nXSize;
+ poDS->nRasterYSize = nYSize;
+ poDS->bGeoTransformValid = FALSE;
+ poDS->TILEINDEX = new int [poDS->NFC*poDS->NFL];
+ memset(poDS->TILEINDEX, 0, sizeof(int)*poDS->NFC*poDS->NFL);
+ poDS->offsetInIMG = 2048;
+ poDS->poOverviewDS = NULL;
+
+ poDS->nBands = 3;
+ for( i = 0; i < poDS->nBands; i++ )
+ poDS->SetBand( i+1, new ADRGRasterBand( poDS, i+1 ) );
+
+ return poDS;
+}
+
+void ADRGDataset::WriteGENFile()
+{
+ if (!bGeoTransformValid)
+ {
+ CPLError(CE_Failure, CPLE_AppDefined, "No geo transform available !");
+ adfGeoTransform[0] = 0;
+ adfGeoTransform[3] = 0;
+ adfGeoTransform[1] = 1;
+ adfGeoTransform[5] = 1;
+ }
+
+ LSO = adfGeoTransform[0];
+ PSO = adfGeoTransform[3];
+ ARV = (int)floor(360. / adfGeoTransform[1] + .5);
+ BRV = (int)floor(-360. / adfGeoTransform[5] + .5);
+
+ /*ARV = ((ARV + 255) / 512) * 512;
+ BRV = ((BRV + 255) / 512) * 512;*/
+
+ int SCA = (int)floor(1000000. * 400384 / BRV + 0.5);
+
+ int nOvSizeX = nRasterXSize; // FIXME
+ int nOvSizeY = nRasterYSize; // FIXME
+
+ FILE* fd = fdGEN;
+
+ /* Write header */
+ {
+ int nFields = 0;
+ int sizeOfFields[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, };
+ const char* nameOfFields[] = { "000", "001", "DRF", "DSI", "OVI", "GEN", "SPR", "BDF", "TIM" };
+ int pos = BeginHeader(fd, 3, 4, 3, N_ELEMENTS(sizeOfFields));
+
+ sizeOfFields[nFields++] += WriteFieldDecl(fd, ' ', ' ', "GENERAL_INFORMATION_FILE", "", ""); /* 000 */
+ sizeOfFields[nFields++] += WriteFieldDecl(fd, '1', '0', "RECORD_ID_FIELD", /* 001 */
+ "RTY!RID",
+ "(A(3),A(2))");
+ sizeOfFields[nFields++] += WriteFieldDecl(fd, '1', '1', "DATA_SET_DESCRIPTION_FIELD", /* DRF */
+ "NSH!NSV!NOZ!NOS",
+ "(4I(2))");
+ sizeOfFields[nFields++] += WriteFieldDecl(fd, '1', '0', "DATA_SET-ID_FIELD", /* DSI */
+ "PRT!NAM",
+ "(A(4),A(8))");
+ sizeOfFields[nFields++] += WriteFieldDecl(fd, '1', '6', "OVERVIEW_INFORMATION_FIELD", /* OVI */
+ "STR!ARV!BRV!LSO!PSO",
+ "(I(1),I(8),I(8),A(11),A(10))");
+ sizeOfFields[nFields++] += WriteFieldDecl(fd, '1', '6', "GENERAL_INFORMATION_FIELD", /* GEN */
+ "STR!LOD!LAD!UNIloa!SWO!SWA!NWO!NWA!NEO!NEA!SEO!SEA!SCA!ZNA!PSP!IMR!ARV!BRV!LSO!PSO!TXT",
+ "(I(1),2R(6),I(3),A(11),A(10),A(11),A(10),A(11),A(10),A(11),A(10),I(9),I(2),R(5),A(1),2I(8),A(11),A(10),A(64))");
+ sizeOfFields[nFields++] += WriteFieldDecl(fd, '1', '6', "DATA_SET_PARAMETERS_FIELD", /* SPR */
+ "NUL!NUS!NLL!NLS!NFL!NFC!PNC!PNL!COD!ROD!POR!PCB!PVB!BAD!TIF",
+ "(4I(6),2I(3),2I(6),5I(1),A(12),A(1))");
+ sizeOfFields[nFields++] += WriteFieldDecl(fd, '2', '6', "BAND_ID_FIELD", /* BDF */
+ "*BID!WS1!WS2",
+ "(A(5),I(5),I(5))");
+ sizeOfFields[nFields++] += WriteFieldDecl(fd, '2', '1', "TILE_INDEX_MAP_FIELD", /* TIM */
+ "*TSI",
+ "(I(5))");
+
+ FinishWriteHeader(fd, pos, 3, 4, 3, N_ELEMENTS(sizeOfFields), sizeOfFields, nameOfFields);
+ }
+
+ /* Write DATA_SET_DESCRIPTION_RECORD */
+ {
+ int nFields = 0;
+ int sizeOfFields[] = {0, 0};
+ const char* nameOfFields[] = { "001", "DRF" };
+ int pos = BeginLeader(fd, 3, 4, 3, N_ELEMENTS(sizeOfFields));
+
+ /* Field 001 */
+ sizeOfFields[nFields] += WriteSubFieldStr(fd, "DSS", 3); /* RTY */
+ sizeOfFields[nFields] += WriteSubFieldStr(fd, "01", 2); /* RID */
+ sizeOfFields[nFields] += WriteFieldTerminator(fd);
+ nFields++;
+
+ /* Field DRF */
+ sizeOfFields[nFields] += WriteSubFieldInt(fd, 1, 2); /* NSH */
+ sizeOfFields[nFields] += WriteSubFieldInt(fd, 1, 2); /* NSV */
+ sizeOfFields[nFields] += WriteSubFieldInt(fd, 1, 2); /* NOZ */
+ sizeOfFields[nFields] += WriteSubFieldInt(fd, 1, 2); /* NOS */
+ sizeOfFields[nFields] += WriteFieldTerminator(fd);
+ nFields++;
+
+ FinishWriteLeader(fd, pos, 3, 4, 3, N_ELEMENTS(sizeOfFields), sizeOfFields, nameOfFields);
+ }
+
+ /* Write OVERVIEW_RECORD */
+ {
+ int nFields = 0;
+ int sizeOfFields[] = {0, 0, 0, 0, 0, 0};
+ const char* nameOfFields[] = { "001", "DSI", "OVI", "SPR", "BDF", "TIM" };
+ int pos = BeginLeader(fd, 9, 9, 3, N_ELEMENTS(sizeOfFields));
+
+ /* Field 001 */
+ sizeOfFields[nFields] += WriteSubFieldStr(fd, "OVV", 3); /* RTY */
+ sizeOfFields[nFields] += WriteSubFieldStr(fd, "01", 2); /* RID */
+ sizeOfFields[nFields] += WriteFieldTerminator(fd);
+ nFields++;
+
+ /* Field DSI */
+ sizeOfFields[nFields] += WriteSubFieldStr(fd, "ADRG", 4); /* PRT */
+ sizeOfFields[nFields] += WriteSubFieldStr(fd, baseFileName, 8); /* NAM */
+ sizeOfFields[nFields] += WriteFieldTerminator(fd);
+ nFields++;
+
+ /* Field OVI */
+ sizeOfFields[nFields] += WriteSubFieldInt(fd, 3, 1); /* STR */
+ sizeOfFields[nFields] += WriteSubFieldInt(fd, ARV, 8); /* ARV */ /* FIXME */
+ sizeOfFields[nFields] += WriteSubFieldInt(fd, BRV, 8); /* BRV */ /* FIXME */
+ sizeOfFields[nFields] += WriteLongitude(fd, LSO); /* LSO */ /* FIXME */
+ sizeOfFields[nFields] += WriteLatitude(fd, PSO); /* PSO */ /* FIXME */
+ sizeOfFields[nFields] += WriteFieldTerminator(fd);
+ nFields++;
+
+ /* Field SPR */
+ sizeOfFields[nFields] += WriteSubFieldInt(fd, 0, 6); /* NUL */
+ sizeOfFields[nFields] += WriteSubFieldInt(fd, nOvSizeX-1, 6); /* NUS */
+ sizeOfFields[nFields] += WriteSubFieldInt(fd, nOvSizeY-1, 6); /* NLL */
+ sizeOfFields[nFields] += WriteSubFieldInt(fd, 0, 6); /* NLS */
+ sizeOfFields[nFields] += WriteSubFieldInt(fd, (nOvSizeY + 127) / 128, 3); /* NFL */
+ sizeOfFields[nFields] += WriteSubFieldInt(fd, (nOvSizeX + 127) / 128, 3); /* NFC */
+ sizeOfFields[nFields] += WriteSubFieldInt(fd, 128, 6); /* PNC */
+ sizeOfFields[nFields] += WriteSubFieldInt(fd, 128, 6); /* PNL */
+ sizeOfFields[nFields] += WriteSubFieldInt(fd, 0, 1); /* COD */
+ sizeOfFields[nFields] += WriteSubFieldInt(fd, 1, 1); /* ROD */
+ sizeOfFields[nFields] += WriteSubFieldInt(fd, 0, 1); /* POR */
+ sizeOfFields[nFields] += WriteSubFieldInt(fd, 0, 1); /* PCB */
+ sizeOfFields[nFields] += WriteSubFieldInt(fd, 8, 1); /* PVB */
+ char tmp[12+1];
+ sprintf(tmp, "%s.IMG", (const char*)baseFileName); /* FIXME */
+ sizeOfFields[nFields] += WriteSubFieldStr(fd, tmp, 12); /* BAD */
+ sizeOfFields[nFields] += WriteSubFieldStr(fd, "Y", 1); /* TIF */
+ sizeOfFields[nFields] += WriteFieldTerminator(fd);
+ nFields++;
+
+ /* Field BDF */
+ sizeOfFields[nFields] += WriteSubFieldStr(fd, "Red", 5); /* BID */
+ sizeOfFields[nFields] += WriteSubFieldInt(fd, 0, 5); /* WS1 */
+ sizeOfFields[nFields] += WriteSubFieldInt(fd, 0, 5); /* WS2 */
+ sizeOfFields[nFields] += WriteSubFieldStr(fd, "Green", 5); /* BID */
+ sizeOfFields[nFields] += WriteSubFieldInt(fd, 0, 5); /* WS1 */
+ sizeOfFields[nFields] += WriteSubFieldInt(fd, 0, 5); /* WS2 */
+ sizeOfFields[nFields] += WriteSubFieldStr(fd, "Blue", 5); /* BID */
+ sizeOfFields[nFields] += WriteSubFieldInt(fd, 0, 5); /* WS1 */
+ sizeOfFields[nFields] += WriteSubFieldInt(fd, 0, 5); /* WS2 */
+ sizeOfFields[nFields] += WriteFieldTerminator(fd);
+ nFields++;
+
+ /* Field TIM */
+ int i;
+ for(i=0;iSetDescription( "ADRG" );
+ poDriver->SetMetadataItem( GDAL_DMD_LONGNAME,
+ "ARC Digitilized Raster Graphics" );
+ poDriver->SetMetadataItem( GDAL_DMD_HELPTOPIC,
+ "frmt_various.html#ADRG" );
+ poDriver->SetMetadataItem( GDAL_DMD_EXTENSION, "gen" );
+ poDriver->SetMetadataItem( GDAL_DMD_CREATIONDATATYPES,
+ "Byte" );
+
+ poDriver->pfnOpen = ADRGDataset::Open;
+ poDriver->pfnCreate = ADRGDataset::Create;
+
+ GetGDALDriverManager()->RegisterDriver( poDriver );
+ }
+}
+
Index: frmts/adrg/makefile.vc
===================================================================
--- frmts/adrg/makefile.vc (révision 0)
+++ frmts/adrg/makefile.vc (révision 0)
@@ -0,0 +1,16 @@
+
+OBJ = adrgdataset.obj
+
+EXTRAFLAGS = -I..\iso8211
+
+GDAL_ROOT = ..\..
+
+!INCLUDE $(GDAL_ROOT)\nmake.opt
+
+default: $(OBJ)
+ xcopy /D /Y *.obj ..\o
+
+clean:
+ -del *.obj
+
+
Index: frmts/adrg/GNUmakefile
===================================================================
--- frmts/adrg/GNUmakefile (révision 0)
+++ frmts/adrg/GNUmakefile (révision 0)
@@ -0,0 +1,14 @@
+
+
+include ../../GDALmake.opt
+
+OBJ = adrgdataset.o
+
+CPPFLAGS := $(GDAL_INCLUDE) $(CPPFLAGS) -I../iso8211
+
+default: $(OBJ)
+
+clean:
+ rm -f *.o
+
+install-obj: $(O_OBJ)
Index: frmts/gdalallregister.cpp
===================================================================
--- frmts/gdalallregister.cpp (révision 12327)
+++ frmts/gdalallregister.cpp (copie de travail)
@@ -353,6 +353,9 @@
GDALRegister_HDF5Image();
#endif
+#ifdef FRMT_adrg
+ GDALRegister_ADRG();
+#endif
/* -------------------------------------------------------------------- */
/* Deregister any drivers explicitly marked as supressed by the */
/* GDAL_SKIP environment variable. */
Index: frmts/iso8211/ddffielddefn.cpp
===================================================================
--- frmts/iso8211/ddffielddefn.cpp (révision 12327)
+++ frmts/iso8211/ddffielddefn.cpp (copie de travail)
@@ -263,6 +263,7 @@
/* -------------------------------------------------------------------- */
switch( pachFieldArea[0] )
{
+ case ' ': /* for ADRG, DIGEST USRP, DIGEST ASRP files */
case '0':
_data_struct_code = dsc_elementary;
break;
@@ -289,6 +290,7 @@
switch( pachFieldArea[1] )
{
+ case ' ': /* for ADRG, DIGEST USRP, DIGEST ASRP files */
case '0':
_data_type_code = dtc_char_string;
break;
Index: gcore/gdal_frmts.h
===================================================================
--- gcore/gdal_frmts.h (révision 12327)
+++ gcore/gdal_frmts.h (copie de travail)
@@ -121,6 +121,7 @@
void CPL_DLL GDALRegister_PALSAR();
void CPL_DLL GDALRegister_DIMAP();
void CPL_DLL GDALRegister_GFF(void);
+void CPL_DLL GDALRegister_ADRG(void);
CPL_C_END
#endif /* ndef GDAL_FRMTS_H_INCLUDED */
Index: GDALmake.opt.in
===================================================================
--- GDALmake.opt.in (révision 12327)
+++ GDALmake.opt.in (copie de travail)
@@ -331,7 +331,7 @@
GDAL_FORMATS = gxf gtiff hfa aigrid aaigrid ceos ceos2 iso8211 xpm \
sdts raw dted mem jdem envisat elas fit vrt usgsdem l1b \
nitf bmp pcidsk airsar rs2 ilwis rmf rik leveller sgi srtmhgt \
- idrisi gsg ingr ers palsar dimap gff \
+ idrisi gsg ingr ers palsar dimap gff adrg \
@OPT_GDAL_FORMATS@
#
|