[education/rkward] /: Fix transformation matrix by inverting height...

[Thomas Friedrichsmeier]

Git commit 9dcb13c10f1818a162825e32aca5bdad8e4cd029 by Thomas Friedrichsmeier.
Committed on 03/04/2022 at 14:22.
Pushed by tfry into branch 'master'.

Fix transformation matrix by inverting height...

The signature to size() really is this backwards, but somehow, mixing this never caused trouble, before.

M  +1    -1    ChangeLog
M  +0    -1    rkward/rbackend/rkwarddevice/rkgraphicsdevice_frontendtransmitter.cpp
M  +1    -1    rkward/rbackend/rkwarddevice/rkgraphicsdevice_stubs.cpp

https://invent.kde.org/education/rkward/commit/9dcb13c10f1818a162825e32aca5bdad8e4cd029

diff --git a/ChangeLog b/ChangeLog
index b83ca7ce..b30b0be3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,7 +9,7 @@ TODOS for autotests:
 - Space-saving placement of main window status bar, and display more tips in it
 - Fixed: Intial graphics window size would be (mostly) ignored
 - Fix some buglets around closing on-screen devices
-- Impelment R 4.2 graphics functions: stroked and filled paths
+- Impelment R 4.2 graphics functions: stroked and filled paths, groups, lumincance masks
 - Implement R 4.1 graphics functions: gradients, patterns, clip paths, masks
 - Add icons to settings dialog for quick visual orientation
 - Merge ktexteditor (script) settings into the main settings dialog
diff --git a/rkward/rbackend/rkwarddevice/rkgraphicsdevice_frontendtransmitter.cpp b/rkward/rbackend/rkwarddevice/rkgraphicsdevice_frontendtransmitter.cpp
index 580353aa..a0e7e2d4 100644
--- a/rkward/rbackend/rkwarddevice/rkgraphicsdevice_frontendtransmitter.cpp
+++ b/rkward/rbackend/rkwarddevice/rkgraphicsdevice_frontendtransmitter.cpp
@@ -456,7 +456,6 @@ void RKGraphicsDeviceFrontendTransmitter::newData () {
 				for (int i = 0; i < 6; ++i) streamer.instream >> m[i];
 				// order in cairo terms: xx, xy, x0, yx, yy, y0
 				//                       11, 21, 31, 12, 22, 32
-				// TODO: somehow this still differs from the result in the Cairo device
 				matrix = QTransform(m[0], m[3], m[1], m[4], m[2], m[5]);
 			}
 			device->useGroup(index, matrix);
diff --git a/rkward/rbackend/rkwarddevice/rkgraphicsdevice_stubs.cpp b/rkward/rbackend/rkwarddevice/rkgraphicsdevice_stubs.cpp
index c2f73da6..0eea4225 100644
--- a/rkward/rbackend/rkwarddevice/rkgraphicsdevice_stubs.cpp
+++ b/rkward/rbackend/rkwarddevice/rkgraphicsdevice_stubs.cpp
@@ -219,7 +219,7 @@ static void RKD_Create (double width, double height, pDevDesc dev, const char *t
 	}
 }
 
-static void RKD_Size (double *left, double *right, double *top, double *bottom, pDevDesc dev) {
+static void RKD_Size (double *left, double *right, double *bottom, double *top, pDevDesc dev) {
 	RK_TRACE(GRAPHICS_DEVICE);
 // NOTE: This does *not* query the frontend for the current size. This is only done on request
 	*left = dev->left;