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

[Luboš Luňák (via logerrit)]

 cui/source/dialogs/AdditionsDialog.cxx |    1 +
 vcl/source/filter/jpeg/jpegc.cxx       |    6 ++++++
 2 files changed, 7 insertions(+)

New commits:
commit 7c90ea5ebc18d36d44870fc829475e471c675a95
Author:     Luboš Luňák <l.lunak at collabora.com>
AuthorDate: Fri Oct 9 20:52:05 2020 +0200
Commit:     Luboš Luňák <l.lunak at collabora.com>
CommitDate: Mon Oct 12 15:11:28 2020 +0200

    try to read JPEGs as BGR if wanted and available
    
    BGR(A) is actually the format used by most VCL backends (Cairo and
    Skia at least).
    
    Change-Id: I1574aadabafcea274049d4c7021352913813bae2
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104130
    Tested-by: Jenkins
    Reviewed-by: Luboš Luňák <l.lunak at collabora.com>

diff --git a/vcl/source/filter/jpeg/jpegc.cxx b/vcl/source/filter/jpeg/jpegc.cxx
index c1fbb535a8e4..0270cc448e82 100644
--- a/vcl/source/filter/jpeg/jpegc.cxx
+++ b/vcl/source/filter/jpeg/jpegc.cxx
@@ -231,6 +231,12 @@ static void ReadJPEG(JpegStuff& rContext, JPEGReader* pJPEGReader, void* pInputS
                 nPixelSize = 1;
             }
 #if defined(JCS_EXTENSIONS)
+            else if (eFinalFormat == ScanlineFormat::N24BitTcBgr)
+            {
+                best_out_color_space = JCS_EXT_BGR;
+                eScanlineFormat = eFinalFormat;
+                nPixelSize = 3;
+            }
             else if (eFinalFormat == ScanlineFormat::N32BitTcBgra)
             {
                 best_out_color_space = JCS_EXT_BGRA;
commit e1eb5d616b701853532f8c6ba2e89366d596789e
Author:     Heiko Tietze <tietze.heiko at gmail.com>
AuthorDate: Mon Oct 12 08:26:28 2020 +0200
Commit:     Heiko Tietze <heiko.tietze at documentfoundation.org>
CommitDate: Mon Oct 12 15:11:11 2020 +0200

    Resolves tdf#137189 - Fixes crash at CheckInstalledExtensions()
    
    SolarMutex added
    
    Change-Id: I18c6683e7a26892ce7f1d019cb1ee59ce03981ac
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104198
    Reviewed-by: Muhammet Kara <muhammet.kara at collabora.com>
    Tested-by: Jenkins

diff --git a/cui/source/dialogs/AdditionsDialog.cxx b/cui/source/dialogs/AdditionsDialog.cxx
index ebd23ba077d9..7eb277b3d0f8 100644
--- a/cui/source/dialogs/AdditionsDialog.cxx
+++ b/cui/source/dialogs/AdditionsDialog.cxx
@@ -408,6 +408,7 @@ void SearchAndParseThread::CheckInstalledExtensions()
                     }
                     else
                     {
+                        SolarMutexGuard aGuard;
                         rInfo->m_xButtonInstall->set_sensitive(false);
                         rInfo->m_xButtonInstall->set_label(
                             CuiResId(RID_SVXSTR_ADDITIONS_INSTALLEDBUTTON));