[Libreoffice-commits] core.git: vcl/osx
Tor Lillqvist (via logerrit)
logerrit at kemper.freedesktop.org
Wed Oct 21 08:18:12 UTC 2020
vcl/osx/saldata.cxx | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 86d4419c6c4961c8b473decccea99338c176ffe1
Author: Tor Lillqvist <tml at collabora.com>
AuthorDate: Wed Oct 21 11:04:24 2020 +0300
Commit: Tor Lillqvist <tml at collabora.com>
CommitDate: Wed Oct 21 10:17:39 2020 +0200
Revert "tdf#137468: Use the colour space of the main display"
Sadly that commit made the CppunitTest_vcl_bitmap_render_test fail on
many Macs, including my 2020 iMac.
This reverts commit cb48b7205cc6cdcf6741bc430266481a8b6b4769.
Change-Id: If1a9605c112904d253664cbc9749cf3987dff473
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104613
Tested-by: Tor Lillqvist <tml at collabora.com>
Reviewed-by: Tor Lillqvist <tml at collabora.com>
diff --git a/vcl/osx/saldata.cxx b/vcl/osx/saldata.cxx
index 14124e4b00f8..5235f657f8ca 100644
--- a/vcl/osx/saldata.cxx
+++ b/vcl/osx/saldata.cxx
@@ -23,7 +23,6 @@
#include <osx/saldata.hxx>
#include <osx/salnsmenu.h>
#include <osx/salinst.h>
-#include <quartz/utils.h>
#include <o3tl/enumarray.hxx>
#include <tools/stream.hxx>
#include <vcl/ImageTree.hxx>
@@ -52,7 +51,7 @@ SalData::SalData()
mpFirstPrinter( nullptr ),
mpFontList( nullptr ),
mpStatusItem( nil ),
- mxRGBSpace( CGDisplayCopyColorSpace( CGMainDisplayID() ) ),
+ mxRGBSpace( CGColorSpaceCreateWithName(kCGColorSpaceSRGB) ),
mxGraySpace( CGColorSpaceCreateWithName(kCGColorSpaceGenericGrayGamma2_2) ),
maCursors(),
mbIsScrollbarDoubleMax( false ),
More information about the Libreoffice-commits
mailing list