Changes between Version 57 and Version 58 of rfc24_progressive_data_support
- Timestamp:
- Sep 4, 2008, 9:20:40 AM (16 years ago)
Legend:
- Unmodified
- Added
- Removed
- Modified
-
rfc24_progressive_data_support
v57 v58 76 76 * Purpose: Implementation of Dataset and RasterBand classes for JPIP and other 77 77 * progressive rendering protocols / formats 78 * Author: Norman Barker, nbarker@ittvis.com 78 79 ******************************************************************************* 79 80 */ … … 116 117 117 118 119 CPLErr DeleteRasterIOContext(GDALRasterIOContext *); 120 118 121 /* 119 122 * GDALAsyncDatasetOpen called with Access.GA_ReadOnly … … 124 127 125 128 }; 126 127 129 128 130 /*********************************************************************/ … … 134 136 GDALAsyncRasterBand(GDALAsyncDataset *parent_dataset, int band, double scale); 135 137 virtual GDALRasterIOContext *CreateRasterIOContext(GDALRWFlag eRWFlag, 136 int nDSXOff, int nDSYOff, 137 int nDSXSize, int nDSYSize, 138 int nBXSize, int nBYSize, 139 GDALDataType eBDataType, 140 int nPixelSpace, int nLineSpace); 138 int nDSXOff, int nDSYOff, 139 int nDSXSize, int nDSYSize, 140 int nBXSize, int nBYSize, 141 GDALDataType eBDataType, 142 int nPixelSpace, int nLineSpace); 143 CPLErr DeleteRasterIOContext(GDALRasterIOContext *); 141 144 virtual ~GDALAsyncRasterBand(){}; 142 145 }; … … 155 158 AsyncStatus GetStatus(){return status;} 156 159 157 virtual CPLErr SetView(int xOff, int yOff, int xSize, int ySize, int nFXSize, int nFYSize);158 virtual CPLErr RasterIO(void *pData, int nTimeoutMilliseconds = -1, char **papszOptions);160 virtual CPLErr SetView(int xOff, int yOff, int xSize, int ySize, int fxSize, int fySize); 161 virtual CPLErr RasterIO(void *pData, char **papszOptions, int nTimeoutMilliseconds = -1); 159 162 virtual void CancelIO(); 160 163 }; 161 162 164 163 165 }}} … … 204 206 */ 205 207 GDALRasterIOContext *GDALAsyncDataset::CreateRasterIOContext(GDALRWFlag eRWFlag, 206 207 208 209 210 211 208 int nDSXOff, int nDSYOff, 209 int nDSXSize, int nDSYSize, 210 int nBXSize, int nBYSize, 211 GDALDataType eBDataType, 212 int nBandCount, int* panBandMap, 213 int nPixelSpace, int nLineSpace, int nBandSpace) 212 214 { 213 215 return 0; 216 } 217 218 /************************************************************************/ 219 /* DeleteRasterIOContext() */ 220 /************************************************************************/ 221 222 /** 223 * Clean up operations for child GDALRasterIOContext 224 */ 225 CPLErr GDALAsyncDataset::DeleteRasterIOContext(GDALRasterIOContext *) 226 { 227 // return a warning, this method should be overridden 228 return CE_Warning; 214 229 } 215 230 … … 248 263 */ 249 264 GDALRasterIOContext *GDALAsyncRasterBand::CreateRasterIOContext(GDALRWFlag eRWFlag, 250 251 252 253 254 265 int nDSXOff, int nDSYOff, 266 int nDSXSize, int nDSYSize, 267 int nBXSize, int nBYSize, 268 GDALDataType eBDataType, 269 int nPixelSpace, int nLineSpace) 255 270 { 256 271 return 0; 272 } 273 274 /************************************************************************/ 275 /* DeleteRasterIOContext() */ 276 /************************************************************************/ 277 278 /** 279 * Clean up operations for child GDALRasterIOContext 280 */ 281 CPLErr GDALAsyncRasterBand::DeleteRasterIOContext(GDALRasterIOContext *) 282 { 283 // return a warning, this method should be overridden 284 return CE_Warning; 257 285 } 258 286 … … 277 305 * @param xSize request width of the server image at resolution 1:1 278 306 * @param ySize request height of the server image at resolution 1:1 279 * @param nFXSize Requested frame width, JPIP will select the resolution level that best fits nBXSize, nBYSize280 * @param nFYSize Requested frame height, JPIP will select the resolution level that best fits nBXSize, nBYSize281 */ 282 CPLErr GDALRasterIOContext::SetView(int xOff, int yOff, int xSize, int ySize )307 * @param fxSize Requested frame width, JPIP will select the resolution level that best fits nBXSize, nBYSize 308 * @param fySize Requested frame height, JPIP will select the resolution level that best fits nBXSize, nBYSize 309 */ 310 CPLErr GDALRasterIOContext::SetView(int xOff, int yOff, int xSize, int ySize, int fxSize, int fySize) 283 311 { 284 312 // return a warning, this method should be overridden … … 312 340 * @papszOptions options for the driver implementation e.g. Quality="Xxx" to specify maximum jpip quality 313 341 */ 314 CPLErr RasterIO(void *pData, int nTimeoutMilliseconds = -1, char **papszOptions)342 CPLErr RasterIO(void *pData, char **papszOptions, int nTimeoutMilliseconds = -1) 315 343 { 316 344 // return a warning, this method should be overridden 317 345 return CE_Warning; 318 346 } 347 319 348 }}}