From e06daa58c335b7bedf232a22dbab2f82ab86532c Mon Sep 17 00:00:00 2001 From: Robert Mader Date: Fri, 8 May 2020 21:13:55 +0200 Subject: [PATCH 1/2] tests/monitor-transform: Test only valid enums This test was introduces assuming we'd do interger math outside of `meta-monitor-transform`. We later agreed to not do that and require valid enums, but forgot to remove the corresponding test case. Test the corresponding valid enums instead of negative ones. See https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1064 https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1234 --- src/tests/monitor-transform-tests.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/tests/monitor-transform-tests.c b/src/tests/monitor-transform-tests.c index 91ce985beb3..fb505d00c8a 100644 --- a/src/tests/monitor-transform-tests.c +++ b/src/tests/monitor-transform-tests.c @@ -62,22 +62,22 @@ test_transform (void) }, { .transform = META_MONITOR_TRANSFORM_NORMAL, - .other = -META_MONITOR_TRANSFORM_90, + .other = META_MONITOR_TRANSFORM_270, .expect = META_MONITOR_TRANSFORM_270, }, { .transform = META_MONITOR_TRANSFORM_FLIPPED, - .other = -META_MONITOR_TRANSFORM_90, + .other = META_MONITOR_TRANSFORM_270, .expect = META_MONITOR_TRANSFORM_FLIPPED_270, }, { .transform = META_MONITOR_TRANSFORM_FLIPPED_180, - .other = -META_MONITOR_TRANSFORM_270, + .other = META_MONITOR_TRANSFORM_90, .expect = META_MONITOR_TRANSFORM_FLIPPED_270, }, { .transform = META_MONITOR_TRANSFORM_FLIPPED_180, - .other = -META_MONITOR_TRANSFORM_FLIPPED_180, + .other = META_MONITOR_TRANSFORM_FLIPPED_180, .expect = META_MONITOR_TRANSFORM_NORMAL, }, }; -- GitLab From d823a54b5dbee5697f40d5c2f6cabdc658cca1a0 Mon Sep 17 00:00:00 2001 From: Ting-Wei Lan Date: Tue, 5 May 2020 21:07:02 +0800 Subject: [PATCH 2/2] monitor-transform: Don't call abs on non-negative enum It causes Clang to show a lot of warnings during compilation because it thinks the abs call is useless. https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1234 --- src/backends/meta-monitor-transform.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/backends/meta-monitor-transform.h b/src/backends/meta-monitor-transform.h index 6fca0a4e3fb..e5757e86945 100644 --- a/src/backends/meta-monitor-transform.h +++ b/src/backends/meta-monitor-transform.h @@ -49,7 +49,7 @@ meta_monitor_transform_is_rotated (MetaMonitorTransform transform) static inline gboolean meta_monitor_transform_is_flipped (MetaMonitorTransform transform) { - return (abs(transform) >= META_MONITOR_TRANSFORM_FLIPPED); + return (transform >= META_MONITOR_TRANSFORM_FLIPPED); } MetaMonitorTransform meta_monitor_transform_invert (MetaMonitorTransform transform); -- GitLab