From feb50f49ddbf1dce6946df6b3f0d8d6df263f3a1 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sat, 4 Mar 2023 20:32:44 +0100 Subject: [PATCH] Enabling some more PNG related features by falling back to Qt without libpng --- src/gsi/gsi/gsiDeclTlPixelBuffer.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gsi/gsi/gsiDeclTlPixelBuffer.cc b/src/gsi/gsi/gsiDeclTlPixelBuffer.cc index d0eee7146..a2d61c90d 100644 --- a/src/gsi/gsi/gsiDeclTlPixelBuffer.cc +++ b/src/gsi/gsi/gsiDeclTlPixelBuffer.cc @@ -249,7 +249,7 @@ static tl::BitmapBuffer read_bitmap_buffer (const std::string &file) #if defined(HAVE_PNG) tl::InputStream stream (file); return tl::BitmapBuffer::read_png (stream); -#elif defined(HAVE_QT) && defined(HAVE_QTBINDINGS) +#elif defined(HAVE_QT) // QImage is fallback QImage img; img.load (tl::to_qstring (file), "PNG"); @@ -267,7 +267,7 @@ static tl::BitmapBuffer bitmap_buffer_from_png (const std::vector &data) tl::InputMemoryStream data_stream (data.begin ().operator-> (), data.size ()); tl::InputStream stream (data_stream); return tl::BitmapBuffer::read_png (stream); -#elif defined(HAVE_QT) && defined(HAVE_QTBINDINGS) +#elif defined(HAVE_QT) // QImage is fallback tl_assert (data.size () < std::numeric_limits::max ()); QImage img = QImage::fromData ((const uchar *) data.begin ().operator-> (), int (data.size ())); @@ -283,7 +283,7 @@ static void write_bitmap_buffer (const tl::BitmapBuffer *pb, const std::string & #if defined(HAVE_PNG) tl::OutputStream stream (file); pb->write_png (stream); -#elif defined(HAVE_QT) && defined(HAVE_QTBINDINGS) +#elif defined(HAVE_QT) // QImage is fallback QImage img = pb->to_image (); img.save (tl::to_qstring (file), "PNG"); @@ -302,7 +302,7 @@ static std::vector bitmap_buffer_to_png (const tl::BitmapBuffer *pb) pb->write_png (stream); } return std::vector (data_stream.data (), data_stream.data () + data_stream.size ()); -#elif defined(HAVE_QT) && defined(HAVE_QTBINDINGS) +#elif defined(HAVE_QT) // QImage is fallback QImage img = pb->to_image (); QBuffer data;