[Libreoffice-commits] core.git: 2 commits - vcl/quartz

[Libreoffice Gerrit user]

 vcl/quartz/salbmp.cxx       |    2 +-
 vcl/quartz/salgdicommon.cxx |    5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 1cbcaebc524a615cbb2aa2c0221db8f743ac5640
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Fri Dec 21 00:06:11 2018 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Fri Dec 21 00:08:13 2018 +0200

    Add follow-up comment with guess why it must be 96
    
    Change-Id: Ifa725c40c5756ba7999423a782180c1ac3901d30

diff --git a/vcl/quartz/salgdicommon.cxx b/vcl/quartz/salgdicommon.cxx
index 535bfa3c32b0..53f0e2706e63 100644
--- a/vcl/quartz/salgdicommon.cxx
+++ b/vcl/quartz/salgdicommon.cxx
@@ -1407,6 +1407,11 @@ void AquaSalGraphics::GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY )
     // don't match each others at their boundaries, and other issues). But *why* it must be 96 I
     // have no idea. The commit that changed it to 96 from (the arbitrary) 200 did not say. If you
     // know where else 96 is explicitly or implicitly hard-coded, please modify this comment.
+
+    // Follow-up: It might be this: in 'online', loleaflet/src/map/Map.js:
+        // 15 = 1440 twips-per-inch / 96 dpi.
+        // Chosen to match previous hardcoded value of 3840 for
+        // the current tile pixel size of 256.
     rDPIX = rDPIY = 96;
 #endif
 }
commit 2e263affe54f8c3cdcbcea5fc4f0fb0b5b958b00
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Thu Dec 20 19:42:06 2018 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Fri Dec 21 00:08:13 2018 +0200

    Add a bit more information to a SAL_WARN
    
    Change-Id: Iea825271825119bddfdaa79af3b111659f084d0b

diff --git a/vcl/quartz/salbmp.cxx b/vcl/quartz/salbmp.cxx
index cc3c06f95619..34fd42caf2ad 100644
--- a/vcl/quartz/salbmp.cxx
+++ b/vcl/quartz/salbmp.cxx
@@ -298,7 +298,7 @@ bool QuartzSalBitmap::AllocateUserData()
     }
     if (!alloc)
     {
-        SAL_WARN( "vcl.quartz", "bad alloc " << mnBytesPerRow << "x" << mnHeight);
+        SAL_WARN( "vcl.quartz", "bad_alloc: " << mnWidth << "x" << mnHeight << " (" << mnBytesPerRow * mnHeight << " bytes)");
         m_pUserBuffer.reset( static_cast<sal_uInt8*>(nullptr) );
         mnBytesPerRow = 0;
     }