"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "src/core/providers/gdal/qgsgdalprovider.cpp" between
QGIS-final-3_14_15.tar.gz and QGIS-final-3_14_16.tar.gz

About: QGIS (Quantum GIS) is a Geographic Information System that supports vector, raster, and database formats. Latest release (3.14.x series).

qgsgdalprovider.cpp  (QGIS-final-3_14_15):qgsgdalprovider.cpp  (QGIS-final-3_14_16)
skipping to change at line 2674 skipping to change at line 2674
|| GDALGetGCPCount( mGdalBaseDataset ) > 0 || GDALGetGCPCount( mGdalBaseDataset ) > 0
|| GDALGetMetadata( mGdalBaseDataset, "RPC" ) ) || GDALGetMetadata( mGdalBaseDataset, "RPC" ) )
{ {
QgsLogger::warning( QStringLiteral( "Creating Warped VRT." ) ); QgsLogger::warning( QStringLiteral( "Creating Warped VRT." ) );
if ( GDALGetMetadata( mGdalBaseDataset, "RPC" ) ) if ( GDALGetMetadata( mGdalBaseDataset, "RPC" ) )
{ {
mGdalDataset = mGdalDataset =
QgsGdalUtils::rpcAwareAutoCreateWarpedVrt( mGdalBaseDataset, nullptr, nu llptr, QgsGdalUtils::rpcAwareAutoCreateWarpedVrt( mGdalBaseDataset, nullptr, nu llptr,
GRA_NearestNeighbour, 0.2, nullptr ); GRA_NearestNeighbour, 0.2, nullptr );
mGdalTransformerArg = QgsGdalUtils::rpcAwareCreateTransformer( mGdalBaseDa taset );
} }
else else
{ {
mGdalDataset = mGdalDataset =
GDALAutoCreateWarpedVRT( mGdalBaseDataset, nullptr, nullptr, GDALAutoCreateWarpedVRT( mGdalBaseDataset, nullptr, nullptr,
GRA_NearestNeighbour, 0.2, nullptr ); GRA_NearestNeighbour, 0.2, nullptr );
} }
if ( !mGdalDataset ) if ( !mGdalDataset )
{ {
skipping to change at line 2697 skipping to change at line 2698
else else
{ {
hasGeoTransform = GDALGetGeoTransform( mGdalDataset, mGeoTransform ) == CE _None; hasGeoTransform = GDALGetGeoTransform( mGdalDataset, mGeoTransform ) == CE _None;
} }
} }
else else
{ {
mGdalDataset = mGdalBaseDataset; mGdalDataset = mGdalBaseDataset;
} }
mGdalTransformerArg = GDALCreateGenImgProjTransformer( mGdalBaseDataset, nullp if ( !mGdalTransformerArg )
tr, nullptr, nullptr, TRUE, 1.0, 0 ); {
mGdalTransformerArg = GDALCreateGenImgProjTransformer( mGdalBaseDataset, nul
lptr, nullptr, nullptr, TRUE, 1.0, 0 );
}
if ( !hasGeoTransform ) if ( !hasGeoTransform )
{ {
// Initialize the affine transform matrix // Initialize the affine transform matrix
mGeoTransform[0] = 0; mGeoTransform[0] = 0;
mGeoTransform[1] = 1; mGeoTransform[1] = 1;
mGeoTransform[2] = 0; mGeoTransform[2] = 0;
mGeoTransform[3] = 0; mGeoTransform[3] = 0;
mGeoTransform[4] = 0; mGeoTransform[4] = 0;
mGeoTransform[5] = -1; mGeoTransform[5] = -1;
 End of changes. 2 change blocks. 
2 lines changed or deleted 6 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)