From 4f65e83322481eca4055a021e0b7d32a17ea25d9 Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Sun, 6 Sep 2020 18:33:22 +1000 Subject: [PATCH] gcc: fixed shadowed parameter --- app/widget/viewer/viewerdisplay.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/widget/viewer/viewerdisplay.cpp b/app/widget/viewer/viewerdisplay.cpp index aee82eaed..983f422e1 100644 --- a/app/widget/viewer/viewerdisplay.cpp +++ b/app/widget/viewer/viewerdisplay.cpp @@ -414,14 +414,14 @@ QTransform ViewerDisplayWidget::GenerateWorldTransform() * | 0 0 Sz Tz | * | 0 0 0 1 | */ - float *data = combined_matrix_.data(); + float *d = combined_matrix_.data(); QTransform world; // Move corner of canvas to correct point - world.translate(width() * 0.5 - width() * *(data)*0.5, height() * 0.5 - height() * *(data + 5) * 0.5); + world.translate(width() * 0.5 - width() * *(d)*0.5, height() * 0.5 - height() * *(d + 5) * 0.5); // Scale - world.scale(*(data), *(data + 5)); + world.scale(*(d), *(d + 5)); // Translate for mouse movement - world.translate(*(data + 12) * width() * 0.5 / *(data), *(data + 13) * height() * 0.5 / *(data + 5)); + world.translate(*(d + 12) * width() * 0.5 / *(d), *(d + 13) * height() * 0.5 / *(d + 5)); return world; }