Changeset 14792

Timestamp:

06/30/08 17:04:49 (5 months ago)

Author:

rouault

Message:

Use new proxy API instead of RPFTOCGDALDatasetCache

Files:

• trunk/gdal/frmts/nitf/rpftocdataset.cpp (modified) (19 diffs)

trunk/gdal/frmts/nitf/rpftocdataset.cpp

@@ -29 +29 @@
-
-#include "gdal_pam.h"
+#include "gdal_proxy.h"
-#include "rpftoclib.h"
-#include "ogr_spatialref.h"
@@ -200 +201 @@
-                                                  const RPFTocEntry* entry, int isRGBA);
-};
-        
-/************************************************************************/
-/* ==================================================================== */
-/*                            RPFTOCGDALDatasetCache                      */
-/* ==================================================================== */
-/************************************************************************/
-
-class RPFTOCGDALDatasetCache;
-static RPFTOCGDALDatasetCache* singleton = NULL;
-static int refCount = 0;
-static void* RPFTOCCacheMutex = NULL;
-
-typedef struct
-{
-    const char* fileName;
-    GDALDataset* ds;
-} CacheEntry;
-
-/* This class is a singleton that maintains a pool of opened datasets */
-/* This is to handle efficiently a potential huge number of NITF tiles */
-/* inside a RPFTOC product */
-/* The cache uses a LRU strategy */
-class RPFTOCGDALDatasetCache
-{
-    int size;
-    CacheEntry* entries;
-
-    RPFTOCGDALDatasetCache(int size)
-    {
-        this->size = size;
-        entries = (CacheEntry*)CPLMalloc(size * sizeof(CacheEntry));
-        memset(entries, 0, size * sizeof(CacheEntry));
-
-    }
-
-    ~RPFTOCGDALDatasetCache()
-    {
-        int i;
-        for(i=0;i<size;i++)
-        {
-            if (entries[i].ds)
-            {
-                GDALClose(entries[i].ds);
-            }
-        }
-        CPLFree(entries);
-    }
-    
-    GDALDataset* _GetDataset(const char* fileName)
-    {
-        int i;
-        for(i=0;i<size;i++)
-        {
-            if (entries[i].fileName == NULL)
-            {
-                if (i != 0)
-                    memmove(&entries[1], &entries[0], sizeof(CacheEntry) * i);
-                entries[0].fileName = fileName;
-                entries[0].ds = (GDALDataset *) GDALOpenShared( fileName, GA_ReadOnly );
-                return entries[0].ds;
-            }
-            /* Optimization here : we can compare the strings by address.... */
-            else if (entries[i].fileName == fileName)
-            {
-                if (i != 0)
-                {
-                    GDALDataset* ds = entries[i].ds;
-                    memmove(&entries[1], &entries[0], sizeof(CacheEntry) * i);
-                    entries[0].ds = ds;
-                    entries[0].fileName = fileName;
-                }
-                return entries[0].ds;
-            }
-        }
-        GDALClose(entries[size-1].ds);
-        memmove(&entries[1], &entries[0], sizeof(CacheEntry) * (size-1));
-        entries[0].fileName = fileName;
-        entries[0].ds = (GDALDataset *) GDALOpenShared( fileName, GA_ReadOnly );
-        return entries[0].ds;
-    }
-
-    public:
-        static void Ref()
-        {
-            CPLMutexHolderD( &RPFTOCCacheMutex );
-            if (singleton == NULL)
-                singleton = new RPFTOCGDALDatasetCache(100);
-            refCount++;
-        }
-
-        static void Unref()
-        {
-            CPLMutexHolderD( &RPFTOCCacheMutex );
-            refCount--;
-            if (refCount == 0)
-            {
-                delete singleton;
-                singleton = NULL;
-            }
-        }
-
-        static GDALDataset* GetDataset(const char* fileName)
-        {
-            CPLMutexHolderD( &RPFTOCCacheMutex );
-            if (! singleton) return NULL;
-            GDALDataset* ds = singleton->_GetDataset(fileName);
-            ds->Reference();
-            return ds;
-        }
-
-        static void ReleaseDataset(GDALDataset* ds)
-        {
-            CPLMutexHolderD( &RPFTOCCacheMutex );
-            ds->Dereference();
-        }
-};
-
-
-/************************************************************************/
@@ -324 +208 @@
-/************************************************************************/
-
-
-
-
-
+
+
-    /* The following parameters are only for sanity checking */
-    int checkDone;
-    int checkOK;
-    const char* projectionRef;
-    double nwLong, nwLat;
-    GDALColorTable* colorTableRef;
@@ -337 +218 @@
-    double noDataValue;
-    RPFTOCSubDataset* subdataset;
-
+
-    public:
-        RPFTOCProxyRasterDataSet(RPFTOCSubDataset* subdataset,
@@ -346 +227 @@
-                                 int nBands);
-
-        ~RPFTOCProxyRasterDataSet()
-        {
-            if (fileName)
-                CPLFree(fileName);
-        }
-        
-        void SetNoDataValue(double noDataValue) {
-            this->noDataValue = noDataValue;
-            bHasNoDataValue = TRUE;
-        }
-
+
-        double GetNoDataValue(int* bHasNoDataValue)
-        {
@@ -362 +237 @@
-                *bHasNoDataValue = this->bHasNoDataValue;
-            return noDataValue;
-
-
+
+
+
+
-        void SetReferenceColorTable(GDALColorTable* colorTableRef) { this->colorTableRef = colorTableRef;}
-
+
-        const GDALColorTable* GetReferenceColorTable() { return colorTableRef; }
-
-        const char* GetFileName() { return fileName; }
-        
-        int SanityCheckOK(GDALDataset* sourceDS);
-
+
-        RPFTOCSubDataset* GetSubDataset() { return subdataset; }
-};
@@ -391 +266 @@
-
-    public:
-int nRasterXSize, int nRasterYSize
+GDALProxyPoolDataset* poDS, int nBand
-                                  int nBlockXSize, int nBlockYSize)
-        {
-RPFTOCGDALDatasetCache::Ref()
-this->eAccess = GA_ReadOnly
-this->eDataType = GDT_Byte
+this->poDS = poDS
+nRasterXSize = poDS->GetRasterXSize()
+nRasterYSize = poDS->GetRasterYSize()
-            this->nBlockXSize = nBlockXSize;
-            this->nBlockYSize = nBlockYSize;
-this->nRasterXSize = nRasterXSiz
-RasterYSize = nRasterYSize
+eDataType = GDT_Byt
+Band = nBand
-            blockByteSize = nBlockXSize * nBlockYSize;
-            initDone = FALSE;
-        }
-
-        ~RPFTOCProxyRasterBandRGBA()
-        {
-            RPFTOCGDALDatasetCache::Unref();
-        }
-        
-        virtual GDALColorInterp GetColorInterpretation()
-        {
@@ -460 +330 @@
-    CPLErr ret;
-    RPFTOCProxyRasterDataSet* proxyDS = (RPFTOCProxyRasterDataSet*)poDS;
-
-
+
-    if (ds)
-    {
-        if (proxyDS->SanityCheckOK(ds) == FALSE)
-        {
-            RPFTOCGDALDatasetCache::ReleaseDataset(ds);
-            return CE_Failure;
-        }
@@ -500 +368 @@
-        /* computing the R tile, the G tile, the B tile and the A tile */
-        void* cachedImage =
-fileName
+GetDescription()
-        if (cachedImage == NULL)
-        {
-            CPLDebug("RPFTOC", "Read (%d, %d) of band %d, of file %s",
-fileName
+GetDescription()
-            ret = srcBand->ReadBlock(nBlockXOff, nBlockYOff, pImage);
-            if (ret == CE_None)
-            {
-                proxyDS->GetSubDataset()->SetCachedTile
-fileName
+GetDescription()
-                Expand(pImage, pImage);
-            }
@@ -543 +411 @@
-        ret = CE_Failure;
-
-    RPFTOCGDALDatasetCache::ReleaseDataset(ds);
-
-    return ret;
-}
@@ -562 +428 @@
-
-    public:
-int nRasterXSize, int nRasterYSize
+GDALProxyPoolDataset* poDS, int nBand
-                                     int nBlockXSize, int nBlockYSize)
-        {
-RPFTOCGDALDatasetCache::Ref()
-this->eAccess = GA_ReadOnly
-this->eDataType = GDT_Byte
+this->poDS = poDS
+nRasterXSize = poDS->GetRasterXSize()
+nRasterYSize = poDS->GetRasterYSize()
-            this->nBlockXSize = nBlockXSize;
-            this->nBlockYSize = nBlockYSize;
-this->nRasterXSize = nRasterXSiz
-RasterYSize = nRasterYSize
+eDataType = GDT_Byt
+Band = nBand
-            blockByteSize = nBlockXSize * nBlockYSize;
-            initDone = FALSE;
-        }
-
-        ~RPFTOCProxyRasterBandPalette()
-        {
-            RPFTOCGDALDatasetCache::Unref();
-        }
-        
-        virtual GDALColorInterp GetColorInterpretation()
-        {
-            return GCI_PaletteIndex;
-        }
-
+
-        virtual double GetNoDataValue(int* bHasNoDataValue)
-        {
-            return ((RPFTOCProxyRasterDataSet*)poDS)->GetNoDataValue(bHasNoDataValue);
-        }
-
+
-        virtual GDALColorTable *GetColorTable()
-        {
@@ -610 +471 @@
-    CPLErr ret;
-    RPFTOCProxyRasterDataSet* proxyDS = (RPFTOCProxyRasterDataSet*)poDS;
-
-
+
-    if (ds)
-    {
-        if (proxyDS->SanityCheckOK(ds) == FALSE)
-        {
-            RPFTOCGDALDatasetCache::ReleaseDataset(ds);
-            return CE_Failure;
-        }
@@ -633 +492 @@
-                    CPLError( CE_Failure, CPLE_AppDefined,
-                              "Palette for %s is different from reference palette. "
-fileName
+GetDescription()
-                }
-            }
@@ -658 +517 @@
-        ret = CE_Failure;
-
-    RPFTOCGDALDatasetCache::ReleaseDataset(ds);
-
-    return ret;
-}
@@ -673 +530 @@
-         int nBlockXSize, int nBlockYSize,
-         const char* projectionRef, double nwLong, double nwLat,
-
+
+
+
-{
-    int i;
-    this->subdataset = subdataset;
-    this->fileName = CPLStrdup(fileName);
-    this->nRasterXSize = nRasterXSize;
-    this->nRasterYSize = nRasterYSize;
-    this->eAccess = GA_ReadOnly;
-    this->projectionRef = projectionRef;
-    this->nwLong = nwLong;
-    this->nwLat = nwLat;
@@ -687 +541 @@
-    noDataValue = 0;
-    colorTableRef = NULL;
-
+
-    checkDone = FALSE;
-    checkOK = FALSE;
@@ -694 +548 @@
-        for(i=0;i<4;i++)
-        {
-+1, new RPFTOCProxyRasterBandRGBA(nRasterXSize, nRasterYSize
+ + 1, new RPFTOCProxyRasterBandRGBA(this, i+1
-        }
-    }
-    else
-nRasterXSize, nRasterYSize
+this, 1
-}
-
@@ -705 +559 @@
-/************************************************************************/
-
-fileName
+GetDescription()
-
-int RPFTOCProxyRasterDataSet::SanityCheckOK(GDALDataset* sourceDS)
@@ -726 +580 @@
-    WARN_CHECK_DS(sourceDS->GetRasterXSize() == nRasterXSize);
-    WARN_CHECK_DS(sourceDS->GetRasterYSize() == nRasterYSize);
-projectionRef
+GetProjectionRef()
-    sourceDS->GetRasterBand(1)->GetBlockSize(&src_nBlockXSize, &src_nBlockYSize);
-    GetRasterBand(1)->GetBlockSize(&nBlockXSize, &nBlockYSize);