← Back to branch summary

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

« back to all changes in this revision

Viewing changes to frmts/pcidsk/pcidskdataset.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/pcidsk/pcidskdataset.cpp
1
1
/******************************************************************************
2
 
 * $Id: pcidskdataset.cpp 18241 2009-12-10 15:58:39Z warmerdam $
 
2
 * $Id: pcidskdataset.cpp 20996 2010-10-28 18:38:15Z rouault $
3
3
 *
4
4
 * Project:  PCIDSK Database File
5
5
 * Purpose:  Read/write PCIDSK Database File used by the PCI software
29
29
 
30
30
#include "gdal_pcidsk.h"
31
31
 
32
 
CPL_CVSID("$Id: pcidskdataset.cpp 18241 2009-12-10 15:58:39Z warmerdam $");
 
32
CPL_CVSID("$Id: pcidskdataset.cpp 20996 2010-10-28 18:38:15Z rouault $");
33
33
 
34
34
CPL_C_START
35
35
void    GDALRegister_PCIDSK(void);
640
640
        vsi_l_offset    nPixelOffset = 0, nLineOffset = 0, nLineSize = 0;
641
641
        int             bNativeOrder;
642
642
        int             i;
643
 
        FILE            *fp = poDS->fp;
 
643
        VSILFILE       *fp = poDS->fp;
644
644
 
645
645
        VSIFSeekL( poDS->fp, nImgHdrOffset, SEEK_SET );
646
646
        if ( VSIFReadL( szTemp, 1, 1024, poDS->fp ) != 1024 )
732
732
                  }
733
733
 
734
734
                  poDS->nBandFileCount++;
735
 
                  poDS->pafpBandFiles = (FILE **)
 
735
                  poDS->pafpBandFiles = (VSILFILE **)
736
736
                      CPLRealloc( poDS->pafpBandFiles,
737
 
                                  poDS->nBandFileCount * sizeof(FILE*) );
 
737
                                  poDS->nBandFileCount * sizeof(VSILFILE*) );
738
738
                  poDS->pafpBandFiles[poDS->nBandFileCount-1] = fp;
739
739
              }
740
740
 
1247
1247
/* -------------------------------------------------------------------- */
1248
1248
/*      Try to create the file.                                         */
1249
1249
/* -------------------------------------------------------------------- */
1250
 
    FILE        *fp = VSIFOpenL( pszFilename, "wb" );
 
1250
    VSILFILE        *fp = VSIFOpenL( pszFilename, "wb" );
1251
1251
 
1252
1252
    if( fp == NULL )
1253
1253
    {