From ba4460a3b359e14e1bfc5c140261f6dc60a1986f Mon Sep 17 00:00:00 2001 From: Jeremy Rimpo Date: Fri, 8 Sep 2023 01:11:11 -0500 Subject: [PATCH] Fixes for python 3.11 and PyQt6 6.5.x --- src/DDS/DDSDefinitions.py | 2 +- src/DDSPreview.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/DDS/DDSDefinitions.py b/src/DDS/DDSDefinitions.py index a058370..2d44812 100644 --- a/src/DDS/DDSDefinitions.py +++ b/src/DDS/DDSDefinitions.py @@ -235,7 +235,7 @@ class DDS_HEADER: dwDepth: int = 0 dwMipMapCount: int = 0 dwReserved1: List[int] = dataclasses.field(default_factory=lambda: [0] * 11, metadata={"count": 11}) - ddspf: DDS_PIXELFORMAT = DDS_PIXELFORMAT() + ddspf: DDS_PIXELFORMAT = dataclasses.field(default_factory=DDS_PIXELFORMAT) dwCaps: Caps = 0 dwCaps2: Caps2 = 0 dwCaps3: int = 0 diff --git a/src/DDSPreview.py b/src/DDSPreview.py index 0b7746f..4ea439a 100644 --- a/src/DDSPreview.py +++ b/src/DDSPreview.py @@ -280,8 +280,8 @@ class DDSWidget(QOpenGLWidget): gl.glEnableVertexAttribArray(0) gl.glEnableVertexAttribArray(1) - gl.glVertexAttribPointer(0, 4, gl.GL_FLOAT, False, 6 * 4, 0) - gl.glVertexAttribPointer(1, 2, gl.GL_FLOAT, False, 6 * 4, 4 * 4) + gl.glVertexAttribPointer(0, 4, gl.GL_FLOAT, b'0', 6 * 4, 0) + gl.glVertexAttribPointer(1, 2, gl.GL_FLOAT, b'0', 6 * 4, 4 * 4) self.texture = self.ddsFile.asQOpenGLTexture(gl, QOpenGLContext.currentContext())