@@ -88,62 +88,4 @@ void QgsPalettedRasterRenderer::draw( QPainter* p, QgsRasterViewPort* viewPort,
88
88
p->drawImage ( tlPoint, img );
89
89
}
90
90
}
91
-
92
- #if 0
93
- int nCols, nRows;
94
- if ( mResampler )
95
- {
96
- //read data at source resolution if zoomed in, else do oversampling with factor 2.5
97
- QgsRectangle providerExtent = mProvider->extent();
98
- if ( viewPort->mSrcCRS.isValid() && viewPort->mDestCRS.isValid() && viewPort->mSrcCRS != viewPort->mDestCRS )
99
- {
100
- QgsCoordinateTransform t( viewPort->mSrcCRS, viewPort->mDestCRS );
101
- providerExtent = t.transformBoundingBox( providerExtent );
102
- }
103
- double pixelRatio = theQgsMapToPixel->mapUnitsPerPixel() / ( providerExtent.width() / mProvider->xSize() );
104
- double oversampling = pixelRatio > 1.0 ? 2.5 : pixelRatio;
105
- nCols = viewPort->drawableAreaXDim * oversampling;
106
- nRows = viewPort->drawableAreaYDim * oversampling;
107
- }
108
- else
109
- {
110
- nCols = viewPort->drawableAreaXDim;
111
- nRows = viewPort->drawableAreaYDim;
112
- }
113
-
114
- //read data from provider
115
- int typeSize = mProvider->dataTypeSize( mBandNumber ) / 8;
116
- QgsRasterDataProvider::DataType rasterType = ( QgsRasterDataProvider::DataType )mProvider->dataType( mBandNumber );
117
- void* rasterData = VSIMalloc( typeSize * nCols * nRows );
118
- mProvider->readBlock( mBandNumber, viewPort->mDrawnExtent, nCols, nRows,
119
- viewPort->mSrcCRS, viewPort->mDestCRS, rasterData );
120
- int currentRasterPos = 0;
121
-
122
- QImage img( nCols, nRows, QImage::Format_ARGB32_Premultiplied );
123
- QRgb* imageScanLine = 0;
124
- int val = 0;
125
-
126
- for ( int i = 0; i < nRows; ++i )
127
- {
128
- imageScanLine = ( QRgb* )( img.scanLine( i ) );
129
- for ( int j = 0; j < nCols; ++j )
130
- {
131
- val = readValue( rasterData, rasterType, currentRasterPos );
132
- imageScanLine[j] = mColors[ val ].rgba();
133
- ++currentRasterPos;
134
- }
135
- }
136
- CPLFree( rasterData );
137
-
138
- if ( mResampler ) //resample to output resolution
139
- {
140
- QImage dstImg( viewPort->drawableAreaXDim, viewPort->drawableAreaYDim, QImage::Format_ARGB32_Premultiplied );
141
- mResampler->resample( img, dstImg );
142
- p->drawImage( QPointF( viewPort->topLeftPoint.x(), viewPort->topLeftPoint.y() ), dstImg );
143
- }
144
- else //use original image
145
- {
146
- p->drawImage( QPointF( viewPort->topLeftPoint.x(), viewPort->topLeftPoint.y() ), img );
147
- }
148
- #endif // 0
149
91
}
0 commit comments