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

Merge remote-tracking branch 'origin/master' into master-mac-qt6

This commit is contained in:
Kazunari Sekigawa 2022-05-25 06:10:50 +09:00
parent 4912f8a424 348faa64b3
commit 9b2e2cd5ed
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/laybasic/laybasic/layColor.cc
View File

@ -26,6 +26,7 @@
#include "tlMath.h"
#include <ctype.h>
#include <algorithm>
namespace lay
{

4
src/laybasic/laybasic/layPixelBuffer.cc
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 ());