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

[offtkp (via logerrit)]

 vcl/source/image/ImplImageTree.cxx |    6 +++---
 vcl/source/opengl/OpenGLHelper.cxx |    6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit f5371a2e5367ab4cb1cd62efb18e46872159a94e
Author:     offtkp <parisop...@gmail.com>
AuthorDate: Sat Jul 16 19:13:13 2022 +0300
Commit:     Tomaž Vajngerl <qui...@gmail.com>
CommitDate: Tue Jul 19 13:22:20 2022 +0200

    Replace old png writer in OpenGLHelper.cxx
    
    Change-Id: I028db48230fae64a539ee0a7964d73c039289740
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137134
    Tested-by: Jenkins
    Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>

diff --git a/vcl/source/opengl/OpenGLHelper.cxx 
b/vcl/source/opengl/OpenGLHelper.cxx
index a0dff4a5f567..b04afad288f3 100644
--- a/vcl/source/opengl/OpenGLHelper.cxx
+++ b/vcl/source/opengl/OpenGLHelper.cxx
@@ -19,7 +19,7 @@
 #include <tools/stream.hxx>
 #include <config_folders.h>
 #include <memory>
-#include <vcl/pngwrite.hxx>
+#include <vcl/filter/PngImageWriter.hxx>
 #include <vcl/svapp.hxx>
 #include <officecfg/Office/Common.hxx>
 #include <com/sun/star/util/XFlushable.hpp>
@@ -531,9 +531,9 @@ void OpenGLHelper::renderToFile(tools::Long nWidth, 
tools::Long nHeight, const O
     glReadPixels(0, 0, nWidth, nHeight, OptimalBufferFormat(), 
GL_UNSIGNED_BYTE, pBuffer.get());
     BitmapEx aBitmap = ConvertBufferToBitmapEx(pBuffer.get(), nWidth, nHeight);
     try {
-        vcl::PNGWriter aWriter( aBitmap );
         SvFileStream sOutput( rFileName, StreamMode::WRITE );
-        aWriter.Write( sOutput );
+        vcl::PngImageWriter aWriter( sOutput );
+        aWriter.write( aBitmap );
         sOutput.Close();
     } catch (...) {
         SAL_WARN("vcl.opengl", "Error writing png to " << rFileName);
commit a91d5e5a69682ac857e39f6d015b6c8470273e96
Author:     offtkp <parisop...@gmail.com>
AuthorDate: Sat Jul 16 19:12:09 2022 +0300
Commit:     Tomaž Vajngerl <qui...@gmail.com>
CommitDate: Tue Jul 19 13:22:04 2022 +0200

    Replace old png writer in ImplImageTree.cxx
    
    Change-Id: I26702462ec19056f33a582083e69630bec1fb3a9
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137133
    Tested-by: Jenkins
    Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>

diff --git a/vcl/source/image/ImplImageTree.cxx 
b/vcl/source/image/ImplImageTree.cxx
index 94105a48545d..4489fe1d9e0f 100644
--- a/vcl/source/image/ImplImageTree.cxx
+++ b/vcl/source/image/ImplImageTree.cxx
@@ -55,7 +55,7 @@
 #include <IconThemeScanner.hxx>
 #include <vcl/filter/PngImageReader.hxx>
 #include <vcl/outdev.hxx>
-#include <vcl/pngwrite.hxx>
+#include <vcl/filter/PngImageWriter.hxx>
 #include <o3tl/string_view.hxx>
 #include <bitmap/BitmapLightenFilter.hxx>
 
@@ -381,11 +381,11 @@ bool loadDiskCachedVersion(std::u16string_view sVariant, 
ImageRequestParameters&
 void cacheBitmapToDisk(std::u16string_view sVariant, ImageRequestParameters 
const & rParameters)
 {
     OUString sUrl(createIconCacheUrl(sVariant, rParameters));
-    vcl::PNGWriter aWriter(rParameters.mrBitmap);
     try
     {
         SvFileStream aStream(sUrl, StreamMode::WRITE);
-        aWriter.Write(aStream);
+        vcl::PngImageWriter aWriter(aStream);
+        aWriter.write(rParameters.mrBitmap);
         aStream.Close();
     }
     catch (...)