Skip to content

Commit 153dea2

Browse files
committed
Rename variable to make intention clearer
1 parent 318a716 commit 153dea2

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

src/core/raster/qgsrasterprojector.cpp

+9-9
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ void QgsRasterProjector::calc()
253253
double myDestRes = mDestXRes < mDestYRes ? mDestXRes : mDestYRes;
254254
mSqrTolerance = myDestRes * myDestRes;
255255

256-
const QgsCoordinateTransform* ct = QgsCoordinateTransformCache::instance()->transform( mDestCRS.authid(), mSrcCRS.authid(), mDestDatumTransform, mSrcDatumTransform );
256+
const QgsCoordinateTransform* inverseCt = QgsCoordinateTransformCache::instance()->transform( mDestCRS.authid(), mSrcCRS.authid(), mDestDatumTransform, mSrcDatumTransform );
257257

258258
// Initialize the matrix by corners and middle points
259259
mCPCols = mCPRows = 3;
@@ -273,20 +273,20 @@ void QgsRasterProjector::calc()
273273
}
274274
for ( int i = 0; i < mCPRows; i++ )
275275
{
276-
calcRow( i, ct );
276+
calcRow( i, inverseCt );
277277
}
278278

279279
while ( true )
280280
{
281-
bool myColsOK = checkCols( ct );
281+
bool myColsOK = checkCols( inverseCt );
282282
if ( !myColsOK )
283283
{
284-
insertRows( ct );
284+
insertRows( inverseCt );
285285
}
286-
bool myRowsOK = checkRows( ct );
286+
bool myRowsOK = checkRows( inverseCt );
287287
if ( !myRowsOK )
288288
{
289-
insertCols( ct );
289+
insertCols( inverseCt );
290290
}
291291
if ( myColsOK && myRowsOK )
292292
{
@@ -893,10 +893,10 @@ QgsRasterBlock * QgsRasterProjector::block( int bandNo, QgsRectangle const & ex
893893
// we cannot fill output block with no data because we use memcpy for data, not setValue().
894894
bool doNoData = !QgsRasterBlock::typeIsNumeric( inputBlock->dataType() ) && inputBlock->hasNoData() && !inputBlock->hasNoDataValue();
895895

896-
const QgsCoordinateTransform* ct = 0;
896+
const QgsCoordinateTransform* inverseCt = 0;
897897
if ( !mApproximate )
898898
{
899-
ct = QgsCoordinateTransformCache::instance()->transform( mDestCRS.authid(), mSrcCRS.authid(), mDestDatumTransform, mSrcDatumTransform );
899+
inverseCt = QgsCoordinateTransformCache::instance()->transform( mDestCRS.authid(), mSrcCRS.authid(), mDestDatumTransform, mSrcDatumTransform );
900900
}
901901

902902
outputBlock->setIsNoData();
@@ -906,7 +906,7 @@ QgsRasterBlock * QgsRasterProjector::block( int bandNo, QgsRectangle const & ex
906906
{
907907
for ( int j = 0; j < width; ++j )
908908
{
909-
bool inside = srcRowCol( i, j, &srcRow, &srcCol, ct );
909+
bool inside = srcRowCol( i, j, &srcRow, &srcCol, inverseCt );
910910
if ( !inside ) continue; // we have everything set to no data
911911

912912
qgssize srcIndex = ( qgssize )srcRow * mSrcCols + srcCol;

0 commit comments

Comments
 (0)