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

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

This commit is contained in:
Matthias Koefferlein 2022-05-24 23:45:24 +02:00
parent a4dd5c1d3c 348faa64b3
commit c5ecb67557
3 changed files with 4 additions and 3 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 "tlMath.h"
#include <ctype.h> #include <ctype.h>
#include <algorithm>
namespace lay namespace lay
{ {

4
src/laybasic/laybasic/layPixelBuffer.cc
View File

@ -290,7 +290,7 @@ QImage
PixelBuffer::to_image_copy () const PixelBuffer::to_image_copy () const
{ {
QImage img (m_width, m_height, m_transparent ? QImage::Format_ARGB32 : QImage::Format_RGB32); 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 ()); memcpy (img.bits (), data (), img.byteCount ());
#else #else
memcpy (img.bits (), data (), img.sizeInBytes ()); memcpy (img.bits (), data (), img.sizeInBytes ());
@ -707,7 +707,7 @@ QImage
BitmapBuffer::to_image_copy () const BitmapBuffer::to_image_copy () const
{ {
QImage img (m_width, m_height, QImage::Format_MonoLSB); QImage img (m_width, m_height, QImage::Format_MonoLSB);
#if QT_VERSION < 0x050000 #if QT_VERSION < 0x051000
memcpy (img.bits (), data (), img.byteCount ()); memcpy (img.bits (), data (), img.byteCount ());
#else #else
memcpy (img.bits (), data (), img.sizeInBytes ()); memcpy (img.bits (), data (), img.sizeInBytes ());

2
src/layview/layview/gsiDeclLayLayoutView_qt.cc
View File

@ -55,7 +55,7 @@ static lay::LayoutView *new_view2 (bool editable, db::Manager *manager, unsigned
return new lay::LayoutView (manager, editable, 0 /*plugin parent*/, 0 /*parent*/, "view", options); return new lay::LayoutView (manager, editable, 0 /*plugin parent*/, 0 /*parent*/, "view", options);
} }
extern Class<lay::LayoutViewBase> decl_LayoutViewBase; extern LAYBASIC_PUBLIC Class<lay::LayoutViewBase> decl_LayoutViewBase;
Class<lay::LayoutView> decl_LayoutView (decl_LayoutViewBase, "lay", "LayoutView", Class<lay::LayoutView> decl_LayoutView (decl_LayoutViewBase, "lay", "LayoutView",
#if defined(HAVE_QTBINDINGS) #if defined(HAVE_QTBINDINGS)