Merge branch 'master' of github.com:KLayout/klayout

This commit is contained in:
Matthias Koefferlein
2022-05-24 23:45:24 +02:00
3 changed files with 4 additions and 3 deletions
+1
View File
@@ -26,6 +26,7 @@
#include "tlMath.h"
#include <ctype.h>
#include <algorithm>
namespace lay
{
+2 -2
View File
@@ -290,7 +290,7 @@ QImage
PixelBuffer::to_image_copy () const
{
QImage img (m_width, m_height, m_transparent ? QImage::Format_ARGB32 : QImage::Format_RGB32);
#if QT_VERSION < 0x050000
#if QT_VERSION < 0x051000
memcpy (img.bits (), data (), img.byteCount ());
#else
memcpy (img.bits (), data (), img.sizeInBytes ());
@@ -707,7 +707,7 @@ QImage
BitmapBuffer::to_image_copy () const
{
QImage img (m_width, m_height, QImage::Format_MonoLSB);
#if QT_VERSION < 0x050000
#if QT_VERSION < 0x051000
memcpy (img.bits (), data (), img.byteCount ());
#else
memcpy (img.bits (), data (), img.sizeInBytes ());