Navigation

Changeset 14719

Timestamp:

06/17/08 17:19:41 (6 months ago)

Author:

rouault

Message:

RawRasterBand? : add extra parameter bOwnsFP to enable the RawRasterBand? to take ownership of the fpRaw so as to close it properly in its destructor

Files:

r14675	r14719
42	42	int nPixelOffset, int nLineOffset,
43	43	GDALDataType eDataType, int bNativeOrder,
44		int bIsVSIL )
	44	int bIsVSIL, int bOwnsFP )
45	45
46	46	{
…	…
51	51	this->eDataType = eDataType;
52	52	this->bIsVSIL = bIsVSIL;
	53	this->bOwnsFP =bOwnsFP;
53	54
54	55	this->fpRaw = fpRaw;
…	…
86	87	int nPixelOffset, int nLineOffset,
87	88	GDALDataType eDataType, int bNativeOrder,
88		int nXSize, int nYSize, int bIsVSIL )
	89	int nXSize, int nYSize, int bIsVSIL, int bOwnsFP )
89	90
90	91	{
…	…
95	96	this->eDataType = eDataType;
96	97	this->bIsVSIL = bIsVSIL;
	98	this->bOwnsFP =bOwnsFP;
97	99
98	100	this->fpRaw = fpRaw;
…	…
153	155
154	156	FlushCache();
	157
	158	if (bOwnsFP)
	159	{
	160	if ( bIsVSIL )
	161	VSIFCloseL( fpRaw );
	162	else
	163	VSIFClose( fpRaw );
	164	}
155	165
156	166	CPLFree( pLineBuffer );

r14675	r14719
81	81
82	82	char **papszCategoryNames;
	83
	84	int bOwnsFP;
83	85
84	86	int Seek( vsi_l_offset, int );
…	…
101	103	int nLineOffset,
102	104	GDALDataType eDataType, int bNativeOrder,
103		int bIsVSIL = FALSE );
	105	int bIsVSIL = FALSE, int bOwnsFP = FALSE );
104	106
105	107	RawRasterBand( FILE * fpRaw,
…	…
107	109	int nLineOffset,
108	110	GDALDataType eDataType, int bNativeOrder,
109		int nXSize, int nYSize, int bIsVSIL = FALSE );
	111	int nXSize, int nYSize, int bIsVSIL = FALSE, int bOwnsFP = FALSE );
110	112
111	113	~RawRasterBand();
…	…
138	140	int GetIsVSIL() { return bIsVSIL; }
139	141	FILE *GetFP() { return fpRaw; }
	142	int GetOwnsFP() { return bOwnsFP; }
140	143	};
141	144