Changeset 7320
- Timestamp:
- 08/30/07 12:15:35
- Files:
-
- OpenSceneGraph/trunk/include/osgTerrain/Layer (modified) (1 diff)
- OpenSceneGraph/trunk/src/osgPlugins/gdal/DataSetLayer.cpp (modified) (1 diff)
- OpenSceneGraph/trunk/src/osgPlugins/gdal/DataSetLayer.h (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
OpenSceneGraph/trunk/include/osgTerrain/Layer
r7317 r7320 321 321 322 322 /** Extract an ImageLayer from the ProxyLayer.*/ 323 virtual ImageLayer* extractImageLayer(unsigned int /* minX*/, unsigned int /*minY*/, unsigned int /*maxX*/, unsigned int /*maxY*/) { return 0; }323 virtual ImageLayer* extractImageLayer(unsigned int /*sourceMinX*/, unsigned int /*sourceMinY*/, unsigned int /*sourceMaxX*/, unsigned int /*sourceMaxY*/, unsigned int /*targetWidth*/=0, unsigned int /*targetHeight*/=0) { return 0; } 324 324 325 325 protected: OpenSceneGraph/trunk/src/osgPlugins/gdal/DataSetLayer.cpp
r7317 r7320 71 71 } 72 72 73 osgTerrain::ImageLayer* DataSetLayer::extractImageLayer(unsigned int minX, unsigned int minY, unsigned int maxX, unsigned int maxY)73 osgTerrain::ImageLayer* DataSetLayer::extractImageLayer(unsigned int sourceMinX, unsigned int sourceMinY, unsigned int sourceMaxX, unsigned int sourceMaxY, unsigned int targetWidth, unsigned int targetHeight) 74 74 { 75 if (!_dataset || maxX<minX || maxY<minY) return 0;75 if (!_dataset || sourceMaxX<sourceMinX || sourceMaxY<sourceMinY) return 0; 76 76 77 osg::notify(osg::NOTICE)<<"DataSetLayer::extractImageLayer("<< minX<<", "<<minY<<", "<<maxX<<", "<<maxY<<") not yet implemented"<<std::endl;77 osg::notify(osg::NOTICE)<<"DataSetLayer::extractImageLayer("<<sourceMinX<<", "<<sourceMinY<<", "<<sourceMaxX<<", "<<sourceMaxY<<", target:"<<targetWidth<<", "<<targetHeight<<") not yet implemented"<<std::endl; 78 78 79 79 return 0; OpenSceneGraph/trunk/src/osgPlugins/gdal/DataSetLayer.h
r7317 r7320 44 44 virtual unsigned int getNumRows() const; 45 45 46 virtual osgTerrain::ImageLayer* extractImageLayer(unsigned int minX, unsigned int minY, unsigned int maxX, unsigned int maxY);46 virtual osgTerrain::ImageLayer* extractImageLayer(unsigned int sourceMinX, unsigned int sourceMinY, unsigned int sourceMaxX, unsigned int sourceMaxY, unsigned int targetWidth=0, unsigned int targetHeight=0); 47 47 48 48 protected:
