oak-team/oak-editor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gcc: fixed shadowed parameter

Browse Source
This commit is contained in:
itsmattkc
2020-09-06 18:33:22 +10:00
parent 83c7596038
commit 4f65e83322
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/widget/viewer/viewerdisplay.cpp
+4 -4
View File
@@ -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;
}