diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2021-01-28 09:39:48 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2021-01-28 10:43:09 +0100 |
| commit | b3737c638671ab39c5e6aaeaf5426d102392cc0a (patch) | |
| tree | 5d7ee4798ba55992e8f693e219a368bf1344ee38 /vcl/osx/salmacos.cxx | |
| parent | 46984619f8b7fa30678b5c7ccd40a0d727a57ce5 (diff) | |
Revert "tdf#138122 Detect window scaling for multi display configurations on macOS"
This reverts commit f318b856ed055f1952276355f811153f6b29c93e.
It appears this reliably causes CppunitTest_vcl_backend_test to fail on macOS on
at least tb69, see e.g. <https://ci.libreoffice.org/job/gerrit_mac/82587/
consoleFull#-500134232d893063f-7f3d-4b7e-b56f-4e0f225817cd> and
<https://ci.libreoffice.org/job/gerrit_mac/82592/
consoleFull#-500134232d893063f-7f3d-4b7e-b56f-4e0f225817cd>,
[_RUN_____] BackendTest::testDrawBlendExtended
/Users/tdf/lode/jenkins/workspace/lo_gerrit/Config/macosx_clang_dbgutil/vcl/qa/cppunit/BackendTest.cxx:688:BackendTest::testDrawBlendExtended
equality assertion failed
- Expected: c[000080ff]
- Actual : c[ffffffff]
BackendTest::testDrawBlendExtended finished in: 1ms
[_RUN_____] BackendTest::testDrawAlphaBitmapMirrored
/Users/tdf/lode/jenkins/workspace/lo_gerrit/Config/macosx_clang_dbgutil/vcl/qa/cppunit/BackendTest.cxx:749:BackendTest::testDrawAlphaBitmapMirrored
equality assertion failed
- Expected: c[ff0000ff]
- Actual : c[000000ff]
BackendTest::testDrawAlphaBitmapMirrored finished in: 1ms
[_RUN_____] BackendTest::testTdf124848
/Users/tdf/lode/jenkins/workspace/lo_gerrit/Config/macosx_clang_dbgutil/vcl/qa/cppunit/BackendTest.cxx:808:BackendTest::testTdf124848
equality assertion failed
- Expected: c[000000ff]
- Actual : c[ffffffff]
And it also causes my local macOS 11.1 ARM64 build to consistently fail that
way, both the original patch set 1 (with the older parent) and the submitted
patch set 2 (with a newer parent).
Change-Id: I2c36fada271e8bc300b6caa19370d8e8bb1e7599
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110055
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Jenkins
Diffstat (limited to 'vcl/osx/salmacos.cxx')
| -rw-r--r-- | vcl/osx/salmacos.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vcl/osx/salmacos.cxx b/vcl/osx/salmacos.cxx index 5b1265130cd0..0f41dd9e8c4a 100644 --- a/vcl/osx/salmacos.cxx +++ b/vcl/osx/salmacos.cxx @@ -19,7 +19,7 @@ // This file contains the macOS-specific versions of the functions which were touched in the commit // to fix tdf#138122. The iOS-specific versions of these functions are kept (for now, when this -// comment is written) as they were before that commit in vcl/ios/salios.cxx. +// comment is written) as they were before that commit in vcl/isx/salios.cxx. #include <sal/config.h> #include <sal/log.hxx> |