oak-team/oak-editor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

openglcolorprocessor: renamed CreateOpenGL() to Create()

Browse Source 
We hide ColorProcessor::Create() to create a derived class rather than the
base class and clear up confusion over the two functions existing.
This commit is contained in:
itsmattkc
2020-02-22 00:34:55 +11:00
parent acb107bd92
commit 65db108be2
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/render/backend/opengl/openglcolorprocessor.cpp
+2 -2
View File
@@ -66,12 +66,12 @@ OpenGLColorProcessor::~OpenGLColorProcessor()
ClearTexture();
}
OpenGLColorProcessorPtr OpenGLColorProcessor::CreateOpenGL(OCIO::ConstConfigRcPtr config, const QString &source_space, const QString &dest_space)
OpenGLColorProcessorPtr OpenGLColorProcessor::Create(OCIO::ConstConfigRcPtr config, const QString &source_space, const QString &dest_space)
{
return std::make_shared<OpenGLColorProcessor>(config, source_space, dest_space);
}
OpenGLColorProcessorPtr OpenGLColorProcessor::CreateOpenGL(OCIO::ConstConfigRcPtr config, const QString &source_space, const QString &display, const QString &view, const QString &look)
OpenGLColorProcessorPtr OpenGLColorProcessor::Create(OCIO::ConstConfigRcPtr config, const QString &source_space, const QString &display, const QString &view, const QString &look)
{
return std::make_shared<OpenGLColorProcessor>(config, source_space, display, view, look);
}
app/render/backend/opengl/openglcolorprocessor.h
+6 -6
View File
@@ -21,13 +21,13 @@ public:
~OpenGLColorProcessor();
static OpenGLColorProcessorPtr CreateOpenGL(OCIO::ConstConfigRcPtr config, const QString& source_space, const QString& dest_space);
static OpenGLColorProcessorPtr Create(OCIO::ConstConfigRcPtr config, const QString& source_space, const QString& dest_space);
static OpenGLColorProcessorPtr CreateOpenGL(OCIO::ConstConfigRcPtr config,
const QString& source_space,
const QString& display,
const QString& view,
const QString& look);
static OpenGLColorProcessorPtr Create(OCIO::ConstConfigRcPtr config,
const QString& source_space,
const QString& display,
const QString& view,
const QString& look);
void Enable(QOpenGLContext* context, bool alpha_is_associated);
bool IsEnabled() const;
app/render/backend/opengl/openglproxy.cpp
+1 -1
View File
@@ -58,7 +58,7 @@ void OpenGLProxy::FrameToValue(StreamPtr stream, FramePtr frame, NodeValueTable
OpenGLColorProcessorPtr color_processor = std::static_pointer_cast<OpenGLColorProcessor>(color_cache_.Get(colorspace_match));
if (!color_processor) {
color_processor = OpenGLColorProcessor::CreateOpenGL(video_stream->footage()->project()->color_manager()->GetConfig(),
color_processor = OpenGLColorProcessor::Create(video_stream->footage()->project()->color_manager()->GetConfig(),
video_stream->colorspace(),
OCIO::ROLE_SCENE_LINEAR);
color_cache_.Add(colorspace_match, color_processor);
app/widget/viewer/viewerglwidget.cpp
+1 -1
View File
@@ -276,7 +276,7 @@ void ViewerGLWidget::SetupColorProcessor()
ocio_view_,
ocio_look_);
color_service_ = OpenGLColorProcessor::CreateOpenGL(color_manager_->GetConfig(),
color_service_ = OpenGLColorProcessor::Create(color_manager_->GetConfig(),
OCIO::ROLE_SCENE_LINEAR,
ocio_display_,
ocio_view_,