Remove legacy code in palleted raster renderer

qgis · Dec 24, 2011 · 4786279 · 4786279
1 parent 8336565
commit 4786279
Showing 1 changed file with 0 additions and 58 deletions.
diff --git a/src/core/raster/qgspalettedrasterrenderer.cpp b/src/core/raster/qgspalettedrasterrenderer.cpp
@@ -88,62 +88,4 @@ void QgsPalettedRasterRenderer::draw( QPainter* p, QgsRasterViewPort* viewPort,
       p->drawImage( tlPoint, img );
     }
   }
-
-#if 0
-  int nCols, nRows;
-  if ( mResampler )
-  {
-    //read data at source resolution if zoomed in, else do oversampling with factor 2.5
-    QgsRectangle providerExtent = mProvider->extent();
-    if ( viewPort->mSrcCRS.isValid() && viewPort->mDestCRS.isValid() && viewPort->mSrcCRS != viewPort->mDestCRS )
-    {
-      QgsCoordinateTransform t( viewPort->mSrcCRS, viewPort->mDestCRS );
-      providerExtent = t.transformBoundingBox( providerExtent );
-    }
-    double pixelRatio = theQgsMapToPixel->mapUnitsPerPixel() / ( providerExtent.width() / mProvider->xSize() );
-    double oversampling = pixelRatio > 1.0 ? 2.5 : pixelRatio;
-    nCols = viewPort->drawableAreaXDim * oversampling;
-    nRows = viewPort->drawableAreaYDim * oversampling;
-  }
-  else
-  {
-    nCols = viewPort->drawableAreaXDim;
-    nRows = viewPort->drawableAreaYDim;
-  }
-
-  //read data from provider
-  int typeSize = mProvider->dataTypeSize( mBandNumber ) / 8;
-  QgsRasterDataProvider::DataType rasterType = ( QgsRasterDataProvider::DataType )mProvider->dataType( mBandNumber );
-  void* rasterData = VSIMalloc( typeSize * nCols *  nRows );
-  mProvider->readBlock( mBandNumber, viewPort->mDrawnExtent, nCols, nRows,
-                        viewPort->mSrcCRS, viewPort->mDestCRS, rasterData );
-  int currentRasterPos = 0;
-
-  QImage img( nCols, nRows, QImage::Format_ARGB32_Premultiplied );
-  QRgb* imageScanLine = 0;
-  int val = 0;
-
-  for ( int i = 0; i < nRows; ++i )
-  {
-    imageScanLine = ( QRgb* )( img.scanLine( i ) );
-    for ( int j = 0; j < nCols; ++j )
-    {
-      val = readValue( rasterData, rasterType, currentRasterPos );
-      imageScanLine[j] = mColors[ val ].rgba();
-      ++currentRasterPos;
-    }
-  }
-  CPLFree( rasterData );
-
-  if ( mResampler ) //resample to output resolution
-  {
-    QImage dstImg( viewPort->drawableAreaXDim, viewPort->drawableAreaYDim, QImage::Format_ARGB32_Premultiplied );
-    mResampler->resample( img, dstImg );
-    p->drawImage( QPointF( viewPort->topLeftPoint.x(), viewPort->topLeftPoint.y() ), dstImg );
-  }
-  else //use original image
-  {
-    p->drawImage( QPointF( viewPort->topLeftPoint.x(), viewPort->topLeftPoint.y() ), img );
-  }
-#endif //0
 }