Skip to content

Georeferencing: Fix variable shadowing #2490

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dl3sdo wants to merge 1 commit into
base: master
Choose a base branch
from
+2 −2
Open

Georeferencing: Fix variable shadowing #2490

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/core/georeferencing.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1208,11 +1208,11 @@ MapCoordF Georeferencing::toMapCoordF(const Georeferencing* other, const MapCoor
bool ok_forward = proj_transform.isValid();
bool ok_inverse = other->proj_transform.isValid();
QPointF projected = other->toProjectedCoords(map_coords);
if (ok_forward && ok_inverse) {
if (ok_forward && ok_inverse)
{
// Use geographic coordinates as intermediate step to enforce
// that coordinates are assumed to have WGS84 datum if datum is specified in only one CRS spec.
/// \todo Use direct pipeline instead of intermediate WGS84
bool ok_inverse, ok_forward;
projected = proj_transform.forward(other->proj_transform.inverse(projected, &ok_inverse), &ok_forward);
}
if (ok)
Expand Down