@@ -659,7 +659,7 @@ QgsRasterBlock *QgsGdalProvider::block( int bandNo, const QgsRectangle &extent,
659
659
return block;
660
660
}
661
661
662
- void QgsGdalProvider::readBlock ( int bandNo, int xBlock, int yBlock, void *block )
662
+ void QgsGdalProvider::readBlock ( int bandNo, int xBlock, int yBlock, void *data )
663
663
{
664
664
QMutexLocker locker ( mpMutex );
665
665
if ( !initIfNeeded () )
@@ -677,25 +677,25 @@ void QgsGdalProvider::readBlock( int bandNo, int xBlock, int yBlock, void *block
677
677
// We have to read with correct data type consistent with other readBlock functions
678
678
int xOff = xBlock * mXBlockSize ;
679
679
int yOff = yBlock * mYBlockSize ;
680
- gdalRasterIO ( myGdalBand, GF_Read, xOff, yOff, mXBlockSize , mYBlockSize , block , mXBlockSize , mYBlockSize , ( GDALDataType ) mGdalDataType .at ( bandNo - 1 ), 0 , 0 );
680
+ gdalRasterIO ( myGdalBand, GF_Read, xOff, yOff, mXBlockSize , mYBlockSize , data , mXBlockSize , mYBlockSize , ( GDALDataType ) mGdalDataType .at ( bandNo - 1 ), 0 , 0 );
681
681
}
682
682
683
- void QgsGdalProvider::readBlock ( int bandNo, QgsRectangle const &extent, int pixelWidth, int pixelHeight, void *block , QgsRasterBlockFeedback *feedback )
683
+ void QgsGdalProvider::readBlock ( int bandNo, QgsRectangle const &extent, int pixelWidth, int pixelHeight, void *data , QgsRasterBlockFeedback *feedback )
684
684
{
685
685
QMutexLocker locker ( mpMutex );
686
686
if ( !initIfNeeded () )
687
687
return ;
688
688
689
- QgsDebugMsgLevel ( " thePixelWidth = " + QString::number ( pixelWidth ), 5 );
690
- QgsDebugMsgLevel ( " thePixelHeight = " + QString::number ( pixelHeight ), 5 );
691
- QgsDebugMsgLevel ( " theExtent : " + extent.toString (), 5 );
689
+ QgsDebugMsgLevel ( " pixelWidth = " + QString::number ( pixelWidth ), 5 );
690
+ QgsDebugMsgLevel ( " pixelHeight = " + QString::number ( pixelHeight ), 5 );
691
+ QgsDebugMsgLevel ( " extent : " + extent.toString (), 5 );
692
692
693
693
for ( int i = 0 ; i < 6 ; i++ )
694
694
{
695
695
QgsDebugMsgLevel ( QStringLiteral ( " transform : %1" ).arg ( mGeoTransform [i] ), 5 );
696
696
}
697
697
698
- int dataSize = dataTypeSize ( bandNo );
698
+ size_t dataSize = static_cast < size_t >( dataTypeSize ( bandNo ) );
699
699
700
700
// moved to block()
701
701
#if 0
@@ -713,14 +713,14 @@ void QgsGdalProvider::readBlock( int bandNo, QgsRectangle const &extent, int pi
713
713
}
714
714
#endif
715
715
716
- QgsRectangle myRasterExtent = extent.intersect ( mExtent );
717
- if ( myRasterExtent .isEmpty () )
716
+ QgsRectangle rasterExtent = extent.intersect ( mExtent );
717
+ if ( rasterExtent .isEmpty () )
718
718
{
719
719
QgsDebugMsg ( QStringLiteral ( " draw request outside view extent." ) );
720
720
return ;
721
721
}
722
- QgsDebugMsgLevel ( " mExtent : " + mExtent .toString (), 5 );
723
- QgsDebugMsgLevel ( " myRasterExtent : " + myRasterExtent .toString (), 5 );
722
+ QgsDebugMsgLevel ( " extent : " + mExtent .toString (), 5 );
723
+ QgsDebugMsgLevel ( " rasterExtent : " + rasterExtent .toString (), 5 );
724
724
725
725
double xRes = extent.width () / pixelWidth;
726
726
double yRes = extent.height () / pixelHeight;
@@ -751,7 +751,7 @@ void QgsGdalProvider::readBlock( int bandNo, QgsRectangle const &extent, int pi
751
751
right = std::round( ( myRasterExtent.xMaximum() - extent.xMinimum() ) / xRes ) - 1;
752
752
}
753
753
#endif
754
- QRect subRect = QgsRasterBlock::subRect ( extent, pixelWidth, pixelHeight, myRasterExtent );
754
+ QRect subRect = QgsRasterBlock::subRect ( extent, pixelWidth, pixelHeight, rasterExtent );
755
755
int top = subRect.top ();
756
756
int bottom = subRect.bottom ();
757
757
int left = subRect.left ();
@@ -804,23 +804,23 @@ void QgsGdalProvider::readBlock( int bandNo, QgsRectangle const &extent, int pi
804
804
// another resampling here which appeares to be quite fast
805
805
806
806
// Get necessary src extent aligned to src resolution
807
- if ( mExtent .xMinimum () < myRasterExtent .xMinimum () )
807
+ if ( mExtent .xMinimum () < rasterExtent .xMinimum () )
808
808
{
809
- srcLeft = static_cast <int >( std::floor ( ( myRasterExtent .xMinimum () - mExtent .xMinimum () ) / srcXRes ) );
809
+ srcLeft = static_cast <int >( std::floor ( ( rasterExtent .xMinimum () - mExtent .xMinimum () ) / srcXRes ) );
810
810
}
811
- if ( mExtent .xMaximum () > myRasterExtent .xMaximum () )
811
+ if ( mExtent .xMaximum () > rasterExtent .xMaximum () )
812
812
{
813
- srcRight = static_cast <int >( std::floor ( ( myRasterExtent .xMaximum () - mExtent .xMinimum () ) / srcXRes ) );
813
+ srcRight = static_cast <int >( std::floor ( ( rasterExtent .xMaximum () - mExtent .xMinimum () ) / srcXRes ) );
814
814
}
815
815
816
816
// GDAL states that mGeoTransform[3] is top, may it also be bottom and mGeoTransform[5] positive?
817
- if ( mExtent .yMaximum () > myRasterExtent .yMaximum () )
817
+ if ( mExtent .yMaximum () > rasterExtent .yMaximum () )
818
818
{
819
- srcTop = static_cast <int >( std::floor ( -1 . * ( mExtent .yMaximum () - myRasterExtent .yMaximum () ) / srcYRes ) );
819
+ srcTop = static_cast <int >( std::floor ( -1 . * ( mExtent .yMaximum () - rasterExtent .yMaximum () ) / srcYRes ) );
820
820
}
821
- if ( mExtent .yMinimum () < myRasterExtent .yMinimum () )
821
+ if ( mExtent .yMinimum () < rasterExtent .yMinimum () )
822
822
{
823
- srcBottom = static_cast <int >( std::floor ( -1 . * ( mExtent .yMaximum () - myRasterExtent .yMinimum () ) / srcYRes ) );
823
+ srcBottom = static_cast <int >( std::floor ( -1 . * ( mExtent .yMaximum () - rasterExtent .yMinimum () ) / srcYRes ) );
824
824
}
825
825
826
826
QgsDebugMsgLevel ( QStringLiteral ( " srcTop = %1 srcBottom = %2 srcLeft = %3 srcRight = %4" ).arg ( srcTop ).arg ( srcBottom ).arg ( srcLeft ).arg ( srcRight ), 5 );
@@ -864,12 +864,12 @@ void QgsGdalProvider::readBlock( int bandNo, QgsRectangle const &extent, int pi
864
864
return ;
865
865
}
866
866
GDALRasterBandH gdalBand = getBand ( bandNo );
867
- GDALDataType type = ( GDALDataType ) mGdalDataType .at ( bandNo - 1 );
867
+ GDALDataType type = static_cast <GDALDataType>( mGdalDataType .at ( bandNo - 1 ) );
868
868
CPLErrorReset ();
869
869
870
870
CPLErr err = gdalRasterIO ( gdalBand, GF_Read,
871
871
srcLeft, srcTop, srcWidth, srcHeight,
872
- ( void * ) tmpBlock,
872
+ static_cast < void *>( tmpBlock ) ,
873
873
tmpWidth, tmpHeight, type,
874
874
0 , 0 , feedback );
875
875
@@ -883,15 +883,15 @@ void QgsGdalProvider::readBlock( int bandNo, QgsRectangle const &extent, int pi
883
883
double tmpXRes = srcWidth * srcXRes / tmpWidth;
884
884
double tmpYRes = srcHeight * srcYRes / tmpHeight; // negative
885
885
886
- double y = myRasterExtent .yMaximum () - 0.5 * yRes;
886
+ double y = rasterExtent .yMaximum () - 0.5 * yRes;
887
887
for ( int row = 0 ; row < height; row++ )
888
888
{
889
889
int tmpRow = static_cast <int >( std::floor ( -1 . * ( tmpYMax - y ) / tmpYRes ) );
890
890
891
891
char *srcRowBlock = tmpBlock + dataSize * tmpRow * tmpWidth;
892
- char *dstRowBlock = ( char * )block + dataSize * ( top + row ) * pixelWidth;
892
+ char *dstRowBlock = ( char * )data + dataSize * ( top + row ) * pixelWidth;
893
893
894
- double x = ( myRasterExtent .xMinimum () + 0.5 * xRes - tmpXMin ) / tmpXRes; // cell center
894
+ double x = ( rasterExtent .xMinimum () + 0.5 * xRes - tmpXMin ) / tmpXRes; // cell center
895
895
double increment = xRes / tmpXRes;
896
896
897
897
char *dst = dstRowBlock + dataSize * left;
0 commit comments