← Back to branch summary

~ubuntu-branches/debian/sid/gdal/sid

« back to all changes in this revision

Viewing changes to frmts/raw/mffdataset.cpp

  • Committer: Package Import Robot
  • Author(s): Francesco Paolo Lovergine
  • Date: 2012-05-07 15:04:42 UTC
  • mfrom: (5.5.16 experimental)
  • Revision ID: package-import@ubuntu.com-20120507150442-2eks97loeh6rq005
Tags: 1.9.0-1
* Ready for sid, starting transition.
* All symfiles updated to latest builds.
* Added dh_numpy call in debian/rules to depend on numpy ABI.
* Policy bumped to 3.9.3, no changes required.

Show diffs side-by-side

added added

removed removed

Lines of Context:
frmts/raw/mffdataset.cpp
1
1
/******************************************************************************
2
 
 * $Id: mffdataset.cpp 18182 2009-12-05 01:12:13Z warmerdam $
 
2
 * $Id: mffdataset.cpp 23425 2011-11-26 19:14:25Z rouault $
3
3
 *
4
4
 * Project:  GView
5
5
 * Purpose:  Implementation of Atlantis MFF Support
33
33
#include "ogr_spatialref.h"
34
34
#include "atlsci_spheroid.h"
35
35
 
36
 
CPL_CVSID("$Id: mffdataset.cpp 18182 2009-12-05 01:12:13Z warmerdam $");
 
36
CPL_CVSID("$Id: mffdataset.cpp 23425 2011-11-26 19:14:25Z rouault $");
37
37
 
38
38
CPL_C_START
39
39
void    GDALRegister_MFF(void);
75
75
    
76
76
    char        **papszHdrLines;
77
77
    
78
 
    FILE        **pafpBandFiles;
 
78
    VSILFILE        **pafpBandFiles;
79
79
    
80
80
    virtual int    GetGCPCount();
81
81
    virtual const char *GetGCPProjection();
106
106
{
107
107
    friend class MFFDataset;
108
108
 
109
 
    FILE        *fpRaw;
 
109
    VSILFILE        *fpRaw;
110
110
    int         bNative;
111
111
 
112
112
  public:
113
113
 
114
 
                   MFFTiledBand( MFFDataset *, int, FILE *, int, int, 
 
114
                   MFFTiledBand( MFFDataset *, int, VSILFILE *, int, int,
115
115
                                 GDALDataType, int );
116
116
                   ~MFFTiledBand();
117
117
 
123
123
/*                            MFFTiledBand()                            */
124
124
/************************************************************************/
125
125
 
126
 
MFFTiledBand::MFFTiledBand( MFFDataset *poDS, int nBand, FILE *fp, 
 
126
MFFTiledBand::MFFTiledBand( MFFDataset *poDS, int nBand, VSILFILE *fp, 
127
127
                            int nTileXSize, int nTileYSize, 
128
128
                            GDALDataType eDataType, int bNative )
129
129
 
543
543
    if (pszOriginLong != NULL)
544
544
        oLL.SetProjParm(SRS_PP_LONGITUDE_OF_ORIGIN,atof(pszOriginLong));
545
545
 
546
 
    if ((pszSpheroidName == NULL))
 
546
    if (pszSpheroidName == NULL)
547
547
    {
548
548
        CPLError(CE_Warning,CPLE_AppDefined,
549
549
            "Warning- unspecified ellipsoid.  Using wgs-84 parameters.\n");
855
855
            break;
856
856
 
857
857
        /* open the file for required level of access */
858
 
        FILE     *fpRaw;
 
858
        VSILFILE     *fpRaw;
859
859
        const char *pszRawFilename = CPLFormFilename(pszTargetPath, 
860
860
                                                     papszDirFiles[i], NULL );
861
861