From 00f57533e662ed67a6230f8010833f2e431a5f6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E7=BE=BD?= Date: Thu, 28 May 2026 18:21:42 +0800 Subject: [PATCH] Add null checks for color processing functions --- app/render/colorprocessor.cpp | 8 ++++++++ app/widget/viewer/viewerdisplay.cpp | 6 +++++- package.json | 14 -------------- 3 files changed, 13 insertions(+), 15 deletions(-) delete mode 100644 package.json diff --git a/app/render/colorprocessor.cpp b/app/render/colorprocessor.cpp index 36e23ba48..eb6d56063 100644 --- a/app/render/colorprocessor.cpp +++ b/app/render/colorprocessor.cpp @@ -97,6 +97,10 @@ ColorProcessor::ColorProcessor(OCIO::ConstProcessorRcPtr processor) void ColorProcessor::ConvertFrame(Frame *f) { + if (!cpu_processor_) { + return; + } + OCIO::BitDepth ocio_bit_depth = OCIOUtils::GetOCIOBitDepthFromPixelFormat(f->format()); @@ -115,6 +119,10 @@ void ColorProcessor::ConvertFrame(Frame *f) Color ColorProcessor::ConvertColor(const Color &in) { + if (!cpu_processor_) { + return in; + } + // I've been bamboozled float c[4] = { float(in.red()), float(in.green()), float(in.blue()), float(in.alpha()) }; diff --git a/app/widget/viewer/viewerdisplay.cpp b/app/widget/viewer/viewerdisplay.cpp index d5c0f96cd..73b0116a9 100644 --- a/app/widget/viewer/viewerdisplay.cpp +++ b/app/widget/viewer/viewerdisplay.cpp @@ -1107,7 +1107,11 @@ void ViewerDisplayWidget::EmitColorAtCursor(QMouseEvent *e) reference = renderer()->GetPixelFromTexture(texture_.get(), pixel_pos); - display = color_service()->ConvertColor(reference); + if (color_service()) { + display = color_service()->ConvertColor(reference); + } else { + display = reference; + } } emit CursorColor(reference, display); diff --git a/package.json b/package.json deleted file mode 100644 index 7e41ea5f9..000000000 --- a/package.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "name": "oak-video-editor-docs", - "private": true, - "type": "module", - "scripts": { - "docs:dev": "vuepress dev docs", - "docs:build": "vuepress build docs" - }, - "devDependencies": { - "@vuepress/bundler-vite": "^2.0.0-rc.19", - "vuepress": "^2.0.0-rc.19", - "vuepress-theme-hope": "^2.0.0-rc.42" - } -}