luke
/
klayout
mirror of https://github.com/KLayout/klayout.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Enabling some more PNG related features by falling back to Qt without libpng

This commit is contained in:
Matthias Koefferlein 2023-03-04 20:32:44 +01:00
parent 2facc75807
commit feb50f49dd
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/gsi/gsi/gsiDeclTlPixelBuffer.cc
View File

@ -249,7 +249,7 @@ static tl::BitmapBuffer read_bitmap_buffer (const std::string &file)
#if defined(HAVE_PNG) #if defined(HAVE_PNG)
tl::InputStream stream (file); tl::InputStream stream (file);
return tl::BitmapBuffer::read_png (stream); return tl::BitmapBuffer::read_png (stream);
#elif defined(HAVE_QT) && defined(HAVE_QTBINDINGS) #elif defined(HAVE_QT)
// QImage is fallback // QImage is fallback
QImage img; QImage img;
img.load (tl::to_qstring (file), "PNG"); img.load (tl::to_qstring (file), "PNG");
@ -267,7 +267,7 @@ static tl::BitmapBuffer bitmap_buffer_from_png (const std::vector<char> &data)
tl::InputMemoryStream data_stream (data.begin ().operator-> (), data.size ()); tl::InputMemoryStream data_stream (data.begin ().operator-> (), data.size ());
tl::InputStream stream (data_stream); tl::InputStream stream (data_stream);
return tl::BitmapBuffer::read_png (stream); return tl::BitmapBuffer::read_png (stream);
#elif defined(HAVE_QT) && defined(HAVE_QTBINDINGS) #elif defined(HAVE_QT)
// QImage is fallback // QImage is fallback
tl_assert (data.size () < std::numeric_limits<int>::max ()); tl_assert (data.size () < std::numeric_limits<int>::max ());
QImage img = QImage::fromData ((const uchar *) data.begin ().operator-> (), int (data.size ())); 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) #if defined(HAVE_PNG)
tl::OutputStream stream (file); tl::OutputStream stream (file);
pb->write_png (stream); pb->write_png (stream);
#elif defined(HAVE_QT) && defined(HAVE_QTBINDINGS) #elif defined(HAVE_QT)
// QImage is fallback // QImage is fallback
QImage img = pb->to_image (); QImage img = pb->to_image ();
img.save (tl::to_qstring (file), "PNG"); img.save (tl::to_qstring (file), "PNG");
@ -302,7 +302,7 @@ static std::vector<char> bitmap_buffer_to_png (const tl::BitmapBuffer *pb)
pb->write_png (stream); pb->write_png (stream);
} }
return std::vector<char> (data_stream.data (), data_stream.data () + data_stream.size ()); return std::vector<char> (data_stream.data (), data_stream.data () + data_stream.size ());
#elif defined(HAVE_QT) && defined(HAVE_QTBINDINGS) #elif defined(HAVE_QT)
// QImage is fallback // QImage is fallback
QImage img = pb->to_image (); QImage img = pb->to_image ();
QBuffer data; QBuffer data;