From 203a280d8e95f6c6325dec79345fe304e7acb877 Mon Sep 17 00:00:00 2001 From: Mike Solar Date: Sun, 13 Jul 2025 14:37:53 +0800 Subject: [PATCH] fix: compilation errors --- app/node/project/serializer/serializer230220.cpp | 5 +++-- app/render/renderer.cpp | 4 ++-- ext/core | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/node/project/serializer/serializer230220.cpp b/app/node/project/serializer/serializer230220.cpp index 66f807ff6..3f46980b1 100644 --- a/app/node/project/serializer/serializer230220.cpp +++ b/app/node/project/serializer/serializer230220.cpp @@ -17,6 +17,7 @@ along with this program. If not, see . ***/ +#include #include "serializer230220.h" @@ -190,9 +191,9 @@ ProjectSerializer230220::LoadData ProjectSerializer230220::Load(Project *project } else if (attr.name() == QStringLiteral("ptr")) { ptr = attr.value().toULongLong(); } else if (attr.name() == QStringLiteral("items")) { - QVector l = attr.value().split(','); + QVector l = attr.value().split(','); items.reserve(l.size()); - for (const QStringRef &s : l) { + for (const QStringView &s : l) { items.append(s.toULongLong()); } } diff --git a/app/render/renderer.cpp b/app/render/renderer.cpp index d00fa0d40..e43e22ed1 100644 --- a/app/render/renderer.cpp +++ b/app/render/renderer.cpp @@ -241,8 +241,8 @@ bool Renderer::GetColorContext(const ColorTransformJob &color_job, Renderer::Col unsigned int width = 0, height = 0; OCIO::GpuShaderDesc::TextureType channel = OCIO::GpuShaderDesc::TEXTURE_RGB_CHANNEL; OCIO::Interpolation interpolation = OCIO::INTERP_LINEAR; - - shader_desc->getTexture(i, tex_name, sampler_name, width, height, channel, interpolation); + OCIO::GpuShaderDesc::TextureDimensions dimensions=OCIO::GpuShaderDesc::TEXTURE_2D; + shader_desc->getTexture(i, tex_name, sampler_name, width, height, channel, dimensions, interpolation); if (!tex_name || !*tex_name || !sampler_name || !*sampler_name diff --git a/ext/core b/ext/core index 327f66582..b6951d1d7 160000 --- a/ext/core +++ b/ext/core @@ -1 +1 @@ -Subproject commit 327f66582cba63434ec6ac19053613e70943ec2d +Subproject commit b6951d1d7a32a97e0e27ce92c2997bf16107dd78