Merge branch 'main' of https://github.com/OakVideoEditorCommunity/oak

2026-05-28 21:43:57 +08:00
parent 9cae5d9c5f 00f57533e6
commit 9a4d635a7a
11 changed files with 61 additions and 59 deletions
@@ -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()) };