Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Bakker <jeroen@blender.org>2021-03-24 17:30:36 +0300
committerJeroen Bakker <jeroen@blender.org>2021-03-24 19:56:29 +0300
commite2d362757fb7e2e9d768906d5b4aefc5aaccdf67 (patch)
tree305864b9f5a58695df610a196f21de873e8ef8d0 /source/blender/compositor/operations
parent9ad3d1d36b64f336fabdd9b3d9f02b13740068b0 (diff)
Cleanup: Add override keyword.
Diffstat (limited to 'source/blender/compositor/operations')
-rw-r--r--source/blender/compositor/operations/COM_AlphaOverKeyOperation.h2
-rw-r--r--source/blender/compositor/operations/COM_AlphaOverMixedOperation.h2
-rw-r--r--source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.h2
-rw-r--r--source/blender/compositor/operations/COM_AntiAliasOperation.h10
-rw-r--r--source/blender/compositor/operations/COM_BilateralBlurOperation.h8
-rw-r--r--source/blender/compositor/operations/COM_BlurBaseOperation.h7
-rw-r--r--source/blender/compositor/operations/COM_BokehBlurOperation.h15
-rw-r--r--source/blender/compositor/operations/COM_BokehImageOperation.h9
-rw-r--r--source/blender/compositor/operations/COM_BoxMaskOperation.h6
-rw-r--r--source/blender/compositor/operations/COM_BrightnessOperation.h6
-rw-r--r--source/blender/compositor/operations/COM_CalculateMeanOperation.h10
-rw-r--r--source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.h4
-rw-r--r--source/blender/compositor/operations/COM_ChangeHSVOperation.h6
-rw-r--r--source/blender/compositor/operations/COM_ChannelMatteOperation.h6
-rw-r--r--source/blender/compositor/operations/COM_ChromaMatteOperation.h6
-rw-r--r--source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.h6
-rw-r--r--source/blender/compositor/operations/COM_ColorBalanceLGGOperation.h6
-rw-r--r--source/blender/compositor/operations/COM_ColorCorrectionOperation.h6
-rw-r--r--source/blender/compositor/operations/COM_ColorCurveOperation.h12
-rw-r--r--source/blender/compositor/operations/COM_ColorExposureOperation.h6
-rw-r--r--source/blender/compositor/operations/COM_ColorMatteOperation.h6
-rw-r--r--source/blender/compositor/operations/COM_ColorRampOperation.h6
-rw-r--r--source/blender/compositor/operations/COM_ColorSpillOperation.h6
-rw-r--r--source/blender/compositor/operations/COM_CompositorOperation.h13
-rw-r--r--source/blender/compositor/operations/COM_ConvertColorProfileOperation.h6
-rw-r--r--source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.h6
-rw-r--r--source/blender/compositor/operations/COM_ConvertOperation.h46
-rw-r--r--source/blender/compositor/operations/COM_ConvolutionEdgeFilterOperation.h2
-rw-r--r--source/blender/compositor/operations/COM_ConvolutionFilterOperation.h8
-rw-r--r--source/blender/compositor/operations/COM_CropOperation.h13
-rw-r--r--source/blender/compositor/operations/COM_CryptomatteOperation.h4
-rw-r--r--source/blender/compositor/operations/COM_CurveBaseOperation.h4
-rw-r--r--source/blender/compositor/operations/COM_DenoiseOperation.h8
-rw-r--r--source/blender/compositor/operations/COM_DespeckleOperation.h8
-rw-r--r--source/blender/compositor/operations/COM_DifferenceMatteOperation.h6
-rw-r--r--source/blender/compositor/operations/COM_DilateErodeOperation.h40
-rw-r--r--source/blender/compositor/operations/COM_DirectionalBlurOperation.h10
-rw-r--r--source/blender/compositor/operations/COM_DisplaceOperation.h8
-rw-r--r--source/blender/compositor/operations/COM_DisplaceSimpleOperation.h8
-rw-r--r--source/blender/compositor/operations/COM_DistanceRGBMatteOperation.h6
-rw-r--r--source/blender/compositor/operations/COM_DistanceYCCMatteOperation.h2
-rw-r--r--source/blender/compositor/operations/COM_DotproductOperation.h6
-rw-r--r--source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.h10
-rw-r--r--source/blender/compositor/operations/COM_EllipseMaskOperation.h6
-rw-r--r--source/blender/compositor/operations/COM_FastGaussianBlurOperation.h20
-rw-r--r--source/blender/compositor/operations/COM_FlipOperation.h8
-rw-r--r--source/blender/compositor/operations/COM_GammaCorrectOperation.h12
-rw-r--r--source/blender/compositor/operations/COM_GammaOperation.h6
-rw-r--r--source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.h10
-rw-r--r--source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.h10
-rw-r--r--source/blender/compositor/operations/COM_GaussianBokehBlurOperation.h20
-rw-r--r--source/blender/compositor/operations/COM_GaussianXBlurOperation.h12
-rw-r--r--source/blender/compositor/operations/COM_GaussianYBlurOperation.h12
-rw-r--r--source/blender/compositor/operations/COM_GlareBaseOperation.h8
-rw-r--r--source/blender/compositor/operations/COM_GlareFogGlowOperation.h2
-rw-r--r--source/blender/compositor/operations/COM_GlareGhostOperation.h2
-rw-r--r--source/blender/compositor/operations/COM_GlareSimpleStarOperation.h2
-rw-r--r--source/blender/compositor/operations/COM_GlareStreaksOperation.h2
-rw-r--r--source/blender/compositor/operations/COM_GlareThresholdOperation.h9
-rw-r--r--source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.h6
-rw-r--r--source/blender/compositor/operations/COM_IDMaskOperation.h4
-rw-r--r--source/blender/compositor/operations/COM_ImageOperation.h13
-rw-r--r--source/blender/compositor/operations/COM_InpaintOperation.h10
-rw-r--r--source/blender/compositor/operations/COM_InvertOperation.h6
-rw-r--r--source/blender/compositor/operations/COM_KeyingBlurOperation.h6
-rw-r--r--source/blender/compositor/operations/COM_KeyingClipOperation.h6
-rw-r--r--source/blender/compositor/operations/COM_KeyingDespillOperation.h6
-rw-r--r--source/blender/compositor/operations/COM_KeyingOperation.h6
-rw-r--r--source/blender/compositor/operations/COM_KeyingScreenOperation.h13
-rw-r--r--source/blender/compositor/operations/COM_LuminanceMatteOperation.h6
-rw-r--r--source/blender/compositor/operations/COM_MapRangeOperation.h6
-rw-r--r--source/blender/compositor/operations/COM_MapUVOperation.h8
-rw-r--r--source/blender/compositor/operations/COM_MapValueOperation.h6
-rw-r--r--source/blender/compositor/operations/COM_MaskOperation.h9
-rw-r--r--source/blender/compositor/operations/COM_MathBaseOperation.h92
-rw-r--r--source/blender/compositor/operations/COM_MixOperation.h47
-rw-r--r--source/blender/compositor/operations/COM_MovieClipAttributeOperation.h7
-rw-r--r--source/blender/compositor/operations/COM_MovieClipOperation.h11
-rw-r--r--source/blender/compositor/operations/COM_MovieDistortionOperation.h8
-rw-r--r--source/blender/compositor/operations/COM_NormalizeOperation.h12
-rw-r--r--source/blender/compositor/operations/COM_OutputFileMultiViewOperation.h6
-rw-r--r--source/blender/compositor/operations/COM_OutputFileOperation.h24
-rw-r--r--source/blender/compositor/operations/COM_PixelateOperation.h6
-rw-r--r--source/blender/compositor/operations/COM_PlaneCornerPinOperation.h17
-rw-r--r--source/blender/compositor/operations/COM_PlaneDistortCommonOperation.h12
-rw-r--r--source/blender/compositor/operations/COM_PlaneTrackOperation.h10
-rw-r--r--source/blender/compositor/operations/COM_PreviewOperation.h17
-rw-r--r--source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.h10
-rw-r--r--source/blender/compositor/operations/COM_ReadBufferOperation.h15
-rw-r--r--source/blender/compositor/operations/COM_RenderLayersProg.h6
-rw-r--r--source/blender/compositor/operations/COM_RotateOperation.h8
-rw-r--r--source/blender/compositor/operations/COM_ScaleOperation.h27
-rw-r--r--source/blender/compositor/operations/COM_ScreenLensDistortionOperation.h10
-rw-r--r--source/blender/compositor/operations/COM_SetAlphaMultiplyOperation.h6
-rw-r--r--source/blender/compositor/operations/COM_SetAlphaReplaceOperation.h6
-rw-r--r--source/blender/compositor/operations/COM_SetColorOperation.h7
-rw-r--r--source/blender/compositor/operations/COM_SetSamplerOperation.h6
-rw-r--r--source/blender/compositor/operations/COM_SetValueOperation.h7
-rw-r--r--source/blender/compositor/operations/COM_SetVectorOperation.h7
-rw-r--r--source/blender/compositor/operations/COM_SplitOperation.h9
-rw-r--r--source/blender/compositor/operations/COM_SunBeamsOperation.h8
-rw-r--r--source/blender/compositor/operations/COM_TextureOperation.h11
-rw-r--r--source/blender/compositor/operations/COM_TonemapOperation.h14
-rw-r--r--source/blender/compositor/operations/COM_TrackPositionOperation.h9
-rw-r--r--source/blender/compositor/operations/COM_TranslateOperation.h8
-rw-r--r--source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.h27
-rw-r--r--source/blender/compositor/operations/COM_VectorBlurOperation.h10
-rw-r--r--source/blender/compositor/operations/COM_VectorCurveOperation.h6
-rw-r--r--source/blender/compositor/operations/COM_ViewerOperation.h17
-rw-r--r--source/blender/compositor/operations/COM_WrapOperation.h4
-rw-r--r--source/blender/compositor/operations/COM_WriteBufferOperation.h15
-rw-r--r--source/blender/compositor/operations/COM_ZCombineOperation.h16
112 files changed, 590 insertions, 567 deletions
diff --git a/source/blender/compositor/operations/COM_AlphaOverKeyOperation.h b/source/blender/compositor/operations/COM_AlphaOverKeyOperation.h
index f2ec5ff12c2..b62105d7c41 100644
--- a/source/blender/compositor/operations/COM_AlphaOverKeyOperation.h
+++ b/source/blender/compositor/operations/COM_AlphaOverKeyOperation.h
@@ -34,5 +34,5 @@ class AlphaOverKeyOperation : public MixBaseOperation {
/**
* The inner loop of this operation.
*/
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};
diff --git a/source/blender/compositor/operations/COM_AlphaOverMixedOperation.h b/source/blender/compositor/operations/COM_AlphaOverMixedOperation.h
index 73433ec3077..3f7137a8d36 100644
--- a/source/blender/compositor/operations/COM_AlphaOverMixedOperation.h
+++ b/source/blender/compositor/operations/COM_AlphaOverMixedOperation.h
@@ -37,7 +37,7 @@ class AlphaOverMixedOperation : public MixBaseOperation {
/**
* The inner loop of this operation.
*/
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
void setX(float x)
{
diff --git a/source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.h b/source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.h
index b149789878e..cb60f8393d0 100644
--- a/source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.h
+++ b/source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.h
@@ -34,5 +34,5 @@ class AlphaOverPremultiplyOperation : public MixBaseOperation {
/**
* The inner loop of this operation.
*/
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};
diff --git a/source/blender/compositor/operations/COM_AntiAliasOperation.h b/source/blender/compositor/operations/COM_AntiAliasOperation.h
index 571655813ae..691fb970b11 100644
--- a/source/blender/compositor/operations/COM_AntiAliasOperation.h
+++ b/source/blender/compositor/operations/COM_AntiAliasOperation.h
@@ -39,20 +39,20 @@ class AntiAliasOperation : public NodeOperation {
/**
* The inner loop of this operation.
*/
- void executePixel(float output[4], int x, int y, void *data);
+ void executePixel(float output[4], int x, int y, void *data) override;
/**
* Initialize the execution
*/
- void initExecution();
+ void initExecution() override;
- void *initializeTileData(rcti *rect);
+ void *initializeTileData(rcti *rect) override;
/**
* Deinitialize the execution
*/
- void deinitExecution();
+ void deinitExecution() override;
bool determineDependingAreaOfInterest(rcti *input,
ReadBufferOperation *readOperation,
- rcti *output);
+ rcti *output) override;
};
diff --git a/source/blender/compositor/operations/COM_BilateralBlurOperation.h b/source/blender/compositor/operations/COM_BilateralBlurOperation.h
index d059510f0bc..bdc77325aaf 100644
--- a/source/blender/compositor/operations/COM_BilateralBlurOperation.h
+++ b/source/blender/compositor/operations/COM_BilateralBlurOperation.h
@@ -34,21 +34,21 @@ class BilateralBlurOperation : public NodeOperation, public QualityStepHelper {
/**
* The inner loop of this operation.
*/
- void executePixel(float output[4], int x, int y, void *data);
+ void executePixel(float output[4], int x, int y, void *data) override;
/**
* Initialize the execution
*/
- void initExecution();
+ void initExecution() override;
/**
* Deinitialize the execution
*/
- void deinitExecution();
+ void deinitExecution() override;
bool determineDependingAreaOfInterest(rcti *input,
ReadBufferOperation *readOperation,
- rcti *output);
+ rcti *output) override;
void setData(NodeBilateralBlurData *data)
{
diff --git a/source/blender/compositor/operations/COM_BlurBaseOperation.h b/source/blender/compositor/operations/COM_BlurBaseOperation.h
index 56dacc96710..84f94dfe124 100644
--- a/source/blender/compositor/operations/COM_BlurBaseOperation.h
+++ b/source/blender/compositor/operations/COM_BlurBaseOperation.h
@@ -53,12 +53,12 @@ class BlurBaseOperation : public NodeOperation, public QualityStepHelper {
/**
* Initialize the execution
*/
- void initExecution();
+ void initExecution() override;
/**
* Deinitialize the execution
*/
- void deinitExecution();
+ void deinitExecution() override;
void setData(const NodeBlurData *data);
@@ -73,5 +73,6 @@ class BlurBaseOperation : public NodeOperation, public QualityStepHelper {
this->m_extend_bounds = extend_bounds;
}
- void determineResolution(unsigned int resolution[2], unsigned int preferredResolution[2]);
+ void determineResolution(unsigned int resolution[2],
+ unsigned int preferredResolution[2]) override;
};
diff --git a/source/blender/compositor/operations/COM_BokehBlurOperation.h b/source/blender/compositor/operations/COM_BokehBlurOperation.h
index a2e320dfdad..9bdf8bc4035 100644
--- a/source/blender/compositor/operations/COM_BokehBlurOperation.h
+++ b/source/blender/compositor/operations/COM_BokehBlurOperation.h
@@ -37,25 +37,25 @@ class BokehBlurOperation : public NodeOperation, public QualityStepHelper {
public:
BokehBlurOperation();
- void *initializeTileData(rcti *rect);
+ void *initializeTileData(rcti *rect) override;
/**
* The inner loop of this operation.
*/
- void executePixel(float output[4], int x, int y, void *data);
+ void executePixel(float output[4], int x, int y, void *data) override;
/**
* Initialize the execution
*/
- void initExecution();
+ void initExecution() override;
/**
* Deinitialize the execution
*/
- void deinitExecution();
+ void deinitExecution() override;
bool determineDependingAreaOfInterest(rcti *input,
ReadBufferOperation *readOperation,
- rcti *output);
+ rcti *output) override;
void setSize(float size)
{
@@ -68,12 +68,13 @@ class BokehBlurOperation : public NodeOperation, public QualityStepHelper {
cl_mem clOutputBuffer,
MemoryBuffer **inputMemoryBuffers,
std::list<cl_mem> *clMemToCleanUp,
- std::list<cl_kernel> *clKernelsToCleanUp);
+ std::list<cl_kernel> *clKernelsToCleanUp) override;
void setExtendBounds(bool extend_bounds)
{
this->m_extend_bounds = extend_bounds;
}
- void determineResolution(unsigned int resolution[2], unsigned int preferredResolution[2]);
+ void determineResolution(unsigned int resolution[2],
+ unsigned int preferredResolution[2]) override;
};
diff --git a/source/blender/compositor/operations/COM_BokehImageOperation.h b/source/blender/compositor/operations/COM_BokehImageOperation.h
index 2d775bdf738..34fd4f6411b 100644
--- a/source/blender/compositor/operations/COM_BokehImageOperation.h
+++ b/source/blender/compositor/operations/COM_BokehImageOperation.h
@@ -110,23 +110,24 @@ class BokehImageOperation : public NodeOperation {
/**
* \brief The inner loop of this operation.
*/
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
/**
* \brief Initialize the execution
*/
- void initExecution();
+ void initExecution() override;
/**
* \brief Deinitialize the execution
*/
- void deinitExecution();
+ void deinitExecution() override;
/**
* \brief determine the resolution of this operation. currently fixed at [COM_BLUR_BOKEH_PIXELS,
* COM_BLUR_BOKEH_PIXELS] \param resolution: \param preferredResolution:
*/
- void determineResolution(unsigned int resolution[2], unsigned int preferredResolution[2]);
+ void determineResolution(unsigned int resolution[2],
+ unsigned int preferredResolution[2]) override;
/**
* \brief set the node data
diff --git a/source/blender/compositor/operations/COM_BoxMaskOperation.h b/source/blender/compositor/operations/COM_BoxMaskOperation.h
index c98972b82b7..6ffa7d98aff 100644
--- a/source/blender/compositor/operations/COM_BoxMaskOperation.h
+++ b/source/blender/compositor/operations/COM_BoxMaskOperation.h
@@ -41,17 +41,17 @@ class BoxMaskOperation : public NodeOperation {
/**
* The inner loop of this operation.
*/
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
/**
* Initialize the execution
*/
- void initExecution();
+ void initExecution() override;
/**
* Deinitialize the execution
*/
- void deinitExecution();
+ void deinitExecution() override;
void setData(NodeBoxMask *data)
{
diff --git a/source/blender/compositor/operations/COM_BrightnessOperation.h b/source/blender/compositor/operations/COM_BrightnessOperation.h
index 6fbcfe3a17a..fa2c80ab3f1 100644
--- a/source/blender/compositor/operations/COM_BrightnessOperation.h
+++ b/source/blender/compositor/operations/COM_BrightnessOperation.h
@@ -37,17 +37,17 @@ class BrightnessOperation : public NodeOperation {
/**
* The inner loop of this operation.
*/
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
/**
* Initialize the execution
*/
- void initExecution();
+ void initExecution() override;
/**
* Deinitialize the execution
*/
- void deinitExecution();
+ void deinitExecution() override;
void setUsePremultiply(bool use_premultiply);
};
diff --git a/source/blender/compositor/operations/COM_CalculateMeanOperation.h b/source/blender/compositor/operations/COM_CalculateMeanOperation.h
index e4937931df0..e1a5bc3fd75 100644
--- a/source/blender/compositor/operations/COM_CalculateMeanOperation.h
+++ b/source/blender/compositor/operations/COM_CalculateMeanOperation.h
@@ -42,23 +42,23 @@ class CalculateMeanOperation : public NodeOperation {
/**
* The inner loop of this operation.
*/
- void executePixel(float output[4], int x, int y, void *data);
+ void executePixel(float output[4], int x, int y, void *data) override;
/**
* Initialize the execution
*/
- void initExecution();
+ void initExecution() override;
- void *initializeTileData(rcti *rect);
+ void *initializeTileData(rcti *rect) override;
/**
* Deinitialize the execution
*/
- void deinitExecution();
+ void deinitExecution() override;
bool determineDependingAreaOfInterest(rcti *input,
ReadBufferOperation *readOperation,
- rcti *output);
+ rcti *output) override;
void setSetting(int setting)
{
this->m_setting = setting;
diff --git a/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.h b/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.h
index a267663cfc8..f377f96418a 100644
--- a/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.h
+++ b/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.h
@@ -36,7 +36,7 @@ class CalculateStandardDeviationOperation : public CalculateMeanOperation {
/**
* The inner loop of this operation.
*/
- void executePixel(float output[4], int x, int y, void *data);
+ void executePixel(float output[4], int x, int y, void *data) override;
- void *initializeTileData(rcti *rect);
+ void *initializeTileData(rcti *rect) override;
};
diff --git a/source/blender/compositor/operations/COM_ChangeHSVOperation.h b/source/blender/compositor/operations/COM_ChangeHSVOperation.h
index edc532a3f43..f448956df16 100644
--- a/source/blender/compositor/operations/COM_ChangeHSVOperation.h
+++ b/source/blender/compositor/operations/COM_ChangeHSVOperation.h
@@ -37,11 +37,11 @@ class ChangeHSVOperation : public NodeOperation {
*/
ChangeHSVOperation();
- void initExecution();
- void deinitExecution();
+ void initExecution() override;
+ void deinitExecution() override;
/**
* The inner loop of this operation.
*/
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};
diff --git a/source/blender/compositor/operations/COM_ChannelMatteOperation.h b/source/blender/compositor/operations/COM_ChannelMatteOperation.h
index 9a0b888b5a2..b295f7709d6 100644
--- a/source/blender/compositor/operations/COM_ChannelMatteOperation.h
+++ b/source/blender/compositor/operations/COM_ChannelMatteOperation.h
@@ -56,10 +56,10 @@ class ChannelMatteOperation : public NodeOperation {
/**
* The inner loop of this operation.
*/
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
- void initExecution();
- void deinitExecution();
+ void initExecution() override;
+ void deinitExecution() override;
void setSettings(NodeChroma *nodeChroma, const int custom2)
{
diff --git a/source/blender/compositor/operations/COM_ChromaMatteOperation.h b/source/blender/compositor/operations/COM_ChromaMatteOperation.h
index c8d261284ed..11f8c540a4b 100644
--- a/source/blender/compositor/operations/COM_ChromaMatteOperation.h
+++ b/source/blender/compositor/operations/COM_ChromaMatteOperation.h
@@ -39,10 +39,10 @@ class ChromaMatteOperation : public NodeOperation {
/**
* The inner loop of this operation.
*/
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
- void initExecution();
- void deinitExecution();
+ void initExecution() override;
+ void deinitExecution() override;
void setSettings(NodeChroma *nodeChroma)
{
diff --git a/source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.h b/source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.h
index 1ec920cb2da..b7ee5d341ad 100644
--- a/source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.h
+++ b/source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.h
@@ -45,17 +45,17 @@ class ColorBalanceASCCDLOperation : public NodeOperation {
/**
* The inner loop of this operation.
*/
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
/**
* Initialize the execution
*/
- void initExecution();
+ void initExecution() override;
/**
* Deinitialize the execution
*/
- void deinitExecution();
+ void deinitExecution() override;
void setOffset(float offset[3])
{
diff --git a/source/blender/compositor/operations/COM_ColorBalanceLGGOperation.h b/source/blender/compositor/operations/COM_ColorBalanceLGGOperation.h
index e6acd16e4f0..4b2db3da134 100644
--- a/source/blender/compositor/operations/COM_ColorBalanceLGGOperation.h
+++ b/source/blender/compositor/operations/COM_ColorBalanceLGGOperation.h
@@ -45,17 +45,17 @@ class ColorBalanceLGGOperation : public NodeOperation {
/**
* The inner loop of this operation.
*/
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
/**
* Initialize the execution
*/
- void initExecution();
+ void initExecution() override;
/**
* Deinitialize the execution
*/
- void deinitExecution();
+ void deinitExecution() override;
void setGain(const float gain[3])
{
diff --git a/source/blender/compositor/operations/COM_ColorCorrectionOperation.h b/source/blender/compositor/operations/COM_ColorCorrectionOperation.h
index 9a2e60c0d77..be0c9c198cf 100644
--- a/source/blender/compositor/operations/COM_ColorCorrectionOperation.h
+++ b/source/blender/compositor/operations/COM_ColorCorrectionOperation.h
@@ -39,17 +39,17 @@ class ColorCorrectionOperation : public NodeOperation {
/**
* The inner loop of this operation.
*/
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
/**
* Initialize the execution
*/
- void initExecution();
+ void initExecution() override;
/**
* Deinitialize the execution
*/
- void deinitExecution();
+ void deinitExecution() override;
void setData(NodeColorCorrection *data)
{
diff --git a/source/blender/compositor/operations/COM_ColorCurveOperation.h b/source/blender/compositor/operations/COM_ColorCurveOperation.h
index 2eb20148db9..d57ff81bbe7 100644
--- a/source/blender/compositor/operations/COM_ColorCurveOperation.h
+++ b/source/blender/compositor/operations/COM_ColorCurveOperation.h
@@ -38,17 +38,17 @@ class ColorCurveOperation : public CurveBaseOperation {
/**
* The inner loop of this operation.
*/
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
/**
* Initialize the execution
*/
- void initExecution();
+ void initExecution() override;
/**
* Deinitialize the execution
*/
- void deinitExecution();
+ void deinitExecution() override;
};
class ConstantLevelColorCurveOperation : public CurveBaseOperation {
@@ -67,17 +67,17 @@ class ConstantLevelColorCurveOperation : public CurveBaseOperation {
/**
* The inner loop of this operation.
*/
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
/**
* Initialize the execution
*/
- void initExecution();
+ void initExecution() override;
/**
* Deinitialize the execution
*/
- void deinitExecution();
+ void deinitExecution() override;
void setBlackLevel(float black[3])
{
diff --git a/source/blender/compositor/operations/COM_ColorExposureOperation.h b/source/blender/compositor/operations/COM_ColorExposureOperation.h
index 97590b85d77..981caeb2663 100644
--- a/source/blender/compositor/operations/COM_ColorExposureOperation.h
+++ b/source/blender/compositor/operations/COM_ColorExposureOperation.h
@@ -34,15 +34,15 @@ class ExposureOperation : public NodeOperation {
/**
* The inner loop of this operation.
*/
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
/**
* Initialize the execution
*/
- void initExecution();
+ void initExecution() override;
/**
* Deinitialize the execution
*/
- void deinitExecution();
+ void deinitExecution() override;
};
diff --git a/source/blender/compositor/operations/COM_ColorMatteOperation.h b/source/blender/compositor/operations/COM_ColorMatteOperation.h
index 91ba27ce2b6..643dc83b3d9 100644
--- a/source/blender/compositor/operations/COM_ColorMatteOperation.h
+++ b/source/blender/compositor/operations/COM_ColorMatteOperation.h
@@ -39,10 +39,10 @@ class ColorMatteOperation : public NodeOperation {
/**
* The inner loop of this operation.
*/
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
- void initExecution();
- void deinitExecution();
+ void initExecution() override;
+ void deinitExecution() override;
void setSettings(NodeChroma *nodeChroma)
{
diff --git a/source/blender/compositor/operations/COM_ColorRampOperation.h b/source/blender/compositor/operations/COM_ColorRampOperation.h
index 49bdb266ce9..8e725ccf709 100644
--- a/source/blender/compositor/operations/COM_ColorRampOperation.h
+++ b/source/blender/compositor/operations/COM_ColorRampOperation.h
@@ -35,17 +35,17 @@ class ColorRampOperation : public NodeOperation {
/**
* The inner loop of this operation.
*/
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
/**
* Initialize the execution
*/
- void initExecution();
+ void initExecution() override;
/**
* Deinitialize the execution
*/
- void deinitExecution();
+ void deinitExecution() override;
void setColorBand(ColorBand *colorBand)
{
diff --git a/source/blender/compositor/operations/COM_ColorSpillOperation.h b/source/blender/compositor/operations/COM_ColorSpillOperation.h
index e51101adf84..e8cd15fb3bc 100644
--- a/source/blender/compositor/operations/COM_ColorSpillOperation.h
+++ b/source/blender/compositor/operations/COM_ColorSpillOperation.h
@@ -44,10 +44,10 @@ class ColorSpillOperation : public NodeOperation {
/**
* The inner loop of this operation.
*/
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
- void initExecution();
- void deinitExecution();
+ void initExecution() override;
+ void deinitExecution() override;
void setSettings(NodeColorspill *nodeColorSpill)
{
diff --git a/source/blender/compositor/operations/COM_CompositorOperation.h b/source/blender/compositor/operations/COM_CompositorOperation.h
index 63b87563852..1c964a80093 100644
--- a/source/blender/compositor/operations/COM_CompositorOperation.h
+++ b/source/blender/compositor/operations/COM_CompositorOperation.h
@@ -86,7 +86,7 @@ class CompositorOperation : public NodeOperation {
{
return this->m_active;
}
- void executeRegion(rcti *rect, unsigned int tileNumber);
+ void executeRegion(rcti *rect, unsigned int tileNumber) override;
void setScene(const struct Scene *scene)
{
m_scene = scene;
@@ -103,17 +103,18 @@ class CompositorOperation : public NodeOperation {
{
this->m_rd = rd;
}
- bool isOutputOperation(bool /*rendering*/) const
+ bool isOutputOperation(bool /*rendering*/) const override
{
return this->isActiveCompositorOutput();
}
- void initExecution();
- void deinitExecution();
- CompositorPriority getRenderPriority() const
+ void initExecution() override;
+ void deinitExecution() override;
+ CompositorPriority getRenderPriority() const override
{
return CompositorPriority::Medium;
}
- void determineResolution(unsigned int resolution[2], unsigned int preferredResolution[2]);
+ void determineResolution(unsigned int resolution[2],
+ unsigned int preferredResolution[2]) override;
void setUseAlphaInput(bool value)
{
this->m_useAlphaInput = value;
diff --git a/source/blender/compositor/operations/COM_ConvertColorProfileOperation.h b/source/blender/compositor/operations/COM_ConvertColorProfileOperation.h
index 7b96895d845..927a5a7fef1 100644
--- a/source/blender/compositor/operations/COM_ConvertColorProfileOperation.h
+++ b/source/blender/compositor/operations/COM_ConvertColorProfileOperation.h
@@ -55,17 +55,17 @@ class ConvertColorProfileOperation : public NodeOperation {
/**
* The inner loop of this operation.
*/
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
/**
* Initialize the execution
*/
- void initExecution();
+ void initExecution() override;
/**
* Deinitialize the execution
*/
- void deinitExecution();
+ void deinitExecution() override;
void setFromColorProfile(int colorProfile)
{
diff --git a/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.h b/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.h
index 564a0facec7..6a7cc4e004a 100644
--- a/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.h
+++ b/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.h
@@ -51,17 +51,17 @@ class ConvertDepthToRadiusOperation : public NodeOperation {
/**
* The inner loop of this operation.
*/
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
/**
* Initialize the execution
*/
- void initExecution();
+ void initExecution() override;
/**
* Deinitialize the execution
*/
- void deinitExecution();
+ void deinitExecution() override;
void setfStop(float fStop)
{
diff --git a/source/blender/compositor/operations/COM_ConvertOperation.h b/source/blender/compositor/operations/COM_ConvertOperation.h
index ca026528a38..7e359a30d6c 100644
--- a/source/blender/compositor/operations/COM_ConvertOperation.h
+++ b/source/blender/compositor/operations/COM_ConvertOperation.h
@@ -27,57 +27,57 @@ class ConvertBaseOperation : public NodeOperation {
public:
ConvertBaseOperation();
- void initExecution();
- void deinitExecution();
+ void initExecution() override;
+ void deinitExecution() override;
};
class ConvertValueToColorOperation : public ConvertBaseOperation {
public:
ConvertValueToColorOperation();
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};
class ConvertColorToValueOperation : public ConvertBaseOperation {
public:
ConvertColorToValueOperation();
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};
class ConvertColorToBWOperation : public ConvertBaseOperation {
public:
ConvertColorToBWOperation();
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};
class ConvertColorToVectorOperation : public ConvertBaseOperation {
public:
ConvertColorToVectorOperation();
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};
class ConvertValueToVectorOperation : public ConvertBaseOperation {
public:
ConvertValueToVectorOperation();
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};
class ConvertVectorToColorOperation : public ConvertBaseOperation {
public:
ConvertVectorToColorOperation();
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};
class ConvertVectorToValueOperation : public ConvertBaseOperation {
public:
ConvertVectorToValueOperation();
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};
class ConvertRGBToYCCOperation : public ConvertBaseOperation {
@@ -88,7 +88,7 @@ class ConvertRGBToYCCOperation : public ConvertBaseOperation {
public:
ConvertRGBToYCCOperation();
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
/** Set the YCC mode */
void setMode(int mode);
@@ -102,7 +102,7 @@ class ConvertYCCToRGBOperation : public ConvertBaseOperation {
public:
ConvertYCCToRGBOperation();
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
/** Set the YCC mode */
void setMode(int mode);
@@ -112,42 +112,42 @@ class ConvertRGBToYUVOperation : public ConvertBaseOperation {
public:
ConvertRGBToYUVOperation();
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};
class ConvertYUVToRGBOperation : public ConvertBaseOperation {
public:
ConvertYUVToRGBOperation();
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};
class ConvertRGBToHSVOperation : public ConvertBaseOperation {
public:
ConvertRGBToHSVOperation();
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};
class ConvertHSVToRGBOperation : public ConvertBaseOperation {
public:
ConvertHSVToRGBOperation();
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};
class ConvertPremulToStraightOperation : public ConvertBaseOperation {
public:
ConvertPremulToStraightOperation();
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};
class ConvertStraightToPremulOperation : public ConvertBaseOperation {
public:
ConvertStraightToPremulOperation();
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};
class SeparateChannelOperation : public NodeOperation {
@@ -157,10 +157,10 @@ class SeparateChannelOperation : public NodeOperation {
public:
SeparateChannelOperation();
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
- void initExecution();
- void deinitExecution();
+ void initExecution() override;
+ void deinitExecution() override;
void setChannel(int channel)
{
@@ -177,8 +177,8 @@ class CombineChannelsOperation : public NodeOperation {
public:
CombineChannelsOperation();
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
- void initExecution();
- void deinitExecution();
+ void initExecution() override;
+ void deinitExecution() override;
};
diff --git a/source/blender/compositor/operations/COM_ConvolutionEdgeFilterOperation.h b/source/blender/compositor/operations/COM_ConvolutionEdgeFilterOperation.h
index ab4b8a1dad1..4ee72ffdd97 100644
--- a/source/blender/compositor/operations/COM_ConvolutionEdgeFilterOperation.h
+++ b/source/blender/compositor/operations/COM_ConvolutionEdgeFilterOperation.h
@@ -23,5 +23,5 @@
class ConvolutionEdgeFilterOperation : public ConvolutionFilterOperation {
public:
ConvolutionEdgeFilterOperation();
- void executePixel(float output[4], int x, int y, void *data);
+ void executePixel(float output[4], int x, int y, void *data) override;
};
diff --git a/source/blender/compositor/operations/COM_ConvolutionFilterOperation.h b/source/blender/compositor/operations/COM_ConvolutionFilterOperation.h
index d178b0a7418..08353fecca3 100644
--- a/source/blender/compositor/operations/COM_ConvolutionFilterOperation.h
+++ b/source/blender/compositor/operations/COM_ConvolutionFilterOperation.h
@@ -36,9 +36,9 @@ class ConvolutionFilterOperation : public NodeOperation {
float f1, float f2, float f3, float f4, float f5, float f6, float f7, float f8, float f9);
bool determineDependingAreaOfInterest(rcti *input,
ReadBufferOperation *readOperation,
- rcti *output);
- void executePixel(float output[4], int x, int y, void *data);
+ rcti *output) override;
+ void executePixel(float output[4], int x, int y, void *data) override;
- void initExecution();
- void deinitExecution();
+ void initExecution() override;
+ void deinitExecution() override;
};
diff --git a/source/blender/compositor/operations/COM_CropOperation.h b/source/blender/compositor/operations/COM_CropOperation.h
index f20664f0501..d2b9aee0bf3 100644
--- a/source/blender/compositor/operations/COM_CropOperation.h
+++ b/source/blender/compositor/operations/COM_CropOperation.h
@@ -34,8 +34,8 @@ class CropBaseOperation : public NodeOperation {
public:
CropBaseOperation();
- void initExecution();
- void deinitExecution();
+ void initExecution() override;
+ void deinitExecution() override;
void setCropSettings(NodeTwoXYs *settings)
{
this->m_settings = settings;
@@ -50,7 +50,7 @@ class CropOperation : public CropBaseOperation {
private:
public:
CropOperation();
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};
class CropImageOperation : public CropBaseOperation {
@@ -59,7 +59,8 @@ class CropImageOperation : public CropBaseOperation {
CropImageOperation();
bool determineDependingAreaOfInterest(rcti *input,
ReadBufferOperation *readOperation,
- rcti *output);
- void determineResolution(unsigned int resolution[2], unsigned int preferredResolution[2]);
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ rcti *output) override;
+ void determineResolution(unsigned int resolution[2],
+ unsigned int preferredResolution[2]) override;
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};
diff --git a/source/blender/compositor/operations/COM_CryptomatteOperation.h b/source/blender/compositor/operations/COM_CryptomatteOperation.h
index 8c5a3134720..a9cef7fe24b 100644
--- a/source/blender/compositor/operations/COM_CryptomatteOperation.h
+++ b/source/blender/compositor/operations/COM_CryptomatteOperation.h
@@ -29,8 +29,8 @@ class CryptomatteOperation : public NodeOperation {
CryptomatteOperation(size_t num_inputs = 6);
- void initExecution();
- void executePixel(float output[4], int x, int y, void *data);
+ void initExecution() override;
+ void executePixel(float output[4], int x, int y, void *data) override;
void addObjectIndex(float objectIndex);
};
diff --git a/source/blender/compositor/operations/COM_CurveBaseOperation.h b/source/blender/compositor/operations/COM_CurveBaseOperation.h
index 63e667cfe12..15e484f4762 100644
--- a/source/blender/compositor/operations/COM_CurveBaseOperation.h
+++ b/source/blender/compositor/operations/COM_CurveBaseOperation.h
@@ -35,8 +35,8 @@ class CurveBaseOperation : public NodeOperation {
/**
* Initialize the execution
*/
- void initExecution();
- void deinitExecution();
+ void initExecution() override;
+ void deinitExecution() override;
void setCurveMapping(CurveMapping *mapping);
};
diff --git a/source/blender/compositor/operations/COM_DenoiseOperation.h b/source/blender/compositor/operations/COM_DenoiseOperation.h
index 5af6e16c958..162fe70617f 100644
--- a/source/blender/compositor/operations/COM_DenoiseOperation.h
+++ b/source/blender/compositor/operations/COM_DenoiseOperation.h
@@ -40,12 +40,12 @@ class DenoiseOperation : public SingleThreadedOperation {
/**
* Initialize the execution
*/
- void initExecution();
+ void initExecution() override;
/**
* Deinitialize the execution
*/
- void deinitExecution();
+ void deinitExecution() override;
void setDenoiseSettings(NodeDenoise *settings)
{
@@ -53,7 +53,7 @@ class DenoiseOperation : public SingleThreadedOperation {
}
bool determineDependingAreaOfInterest(rcti *input,
ReadBufferOperation *readOperation,
- rcti *output);
+ rcti *output) override;
protected:
void generateDenoise(float *data,
@@ -62,5 +62,5 @@ class DenoiseOperation : public SingleThreadedOperation {
MemoryBuffer *inputTileAlbedo,
NodeDenoise *settings);
- MemoryBuffer *createMemoryBuffer(rcti *rect);
+ MemoryBuffer *createMemoryBuffer(rcti *rect) override;
};
diff --git a/source/blender/compositor/operations/COM_DespeckleOperation.h b/source/blender/compositor/operations/COM_DespeckleOperation.h
index af37c276bd2..dee355696af 100644
--- a/source/blender/compositor/operations/COM_DespeckleOperation.h
+++ b/source/blender/compositor/operations/COM_DespeckleOperation.h
@@ -36,8 +36,8 @@ class DespeckleOperation : public NodeOperation {
DespeckleOperation();
bool determineDependingAreaOfInterest(rcti *input,
ReadBufferOperation *readOperation,
- rcti *output);
- void executePixel(float output[4], int x, int y, void *data);
+ rcti *output) override;
+ void executePixel(float output[4], int x, int y, void *data) override;
void setThreshold(float threshold)
{
@@ -48,6 +48,6 @@ class DespeckleOperation : public NodeOperation {
this->m_threshold_neighbor = threshold;
}
- void initExecution();
- void deinitExecution();
+ void initExecution() override;
+ void deinitExecution() override;
};
diff --git a/source/blender/compositor/operations/COM_DifferenceMatteOperation.h b/source/blender/compositor/operations/COM_DifferenceMatteOperation.h
index 0ee5eab3fe7..ded819850f8 100644
--- a/source/blender/compositor/operations/COM_DifferenceMatteOperation.h
+++ b/source/blender/compositor/operations/COM_DifferenceMatteOperation.h
@@ -39,10 +39,10 @@ class DifferenceMatteOperation : public NodeOperation {
/**
* The inner loop of this operation.
*/
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
- void initExecution();
- void deinitExecution();
+ void initExecution() override;
+ void deinitExecution() override;
void setSettings(NodeChroma *nodeChroma)
{
diff --git a/source/blender/compositor/operations/COM_DilateErodeOperation.h b/source/blender/compositor/operations/COM_DilateErodeOperation.h
index 35f9be89220..7497fb8ab08 100644
--- a/source/blender/compositor/operations/COM_DilateErodeOperation.h
+++ b/source/blender/compositor/operations/COM_DilateErodeOperation.h
@@ -43,18 +43,18 @@ class DilateErodeThresholdOperation : public NodeOperation {
/**
* The inner loop of this operation.
*/
- void executePixel(float output[4], int x, int y, void *data);
+ void executePixel(float output[4], int x, int y, void *data) override;
/**
* Initialize the execution
*/
- void initExecution();
+ void initExecution() override;
- void *initializeTileData(rcti *rect);
+ void *initializeTileData(rcti *rect) override;
/**
* Deinitialize the execution
*/
- void deinitExecution();
+ void deinitExecution() override;
void setDistance(float distance)
{
@@ -71,7 +71,7 @@ class DilateErodeThresholdOperation : public NodeOperation {
bool determineDependingAreaOfInterest(rcti *input,
ReadBufferOperation *readOperation,
- rcti *output);
+ rcti *output) override;
};
class DilateDistanceOperation : public NodeOperation {
@@ -90,18 +90,18 @@ class DilateDistanceOperation : public NodeOperation {
/**
* The inner loop of this operation.
*/
- void executePixel(float output[4], int x, int y, void *data);
+ void executePixel(float output[4], int x, int y, void *data) override;
/**
* Initialize the execution
*/
- void initExecution();
+ void initExecution() override;
- void *initializeTileData(rcti *rect);
+ void *initializeTileData(rcti *rect) override;
/**
* Deinitialize the execution
*/
- void deinitExecution();
+ void deinitExecution() override;
void setDistance(float distance)
{
@@ -109,14 +109,14 @@ class DilateDistanceOperation : public NodeOperation {
}
bool determineDependingAreaOfInterest(rcti *input,
ReadBufferOperation *readOperation,
- rcti *output);
+ rcti *output) override;
void executeOpenCL(OpenCLDevice *device,
MemoryBuffer *outputMemoryBuffer,
cl_mem clOutputBuffer,
MemoryBuffer **inputMemoryBuffers,
std::list<cl_mem> *clMemToCleanUp,
- std::list<cl_kernel> *clKernelsToCleanUp);
+ std::list<cl_kernel> *clKernelsToCleanUp) override;
};
class ErodeDistanceOperation : public DilateDistanceOperation {
public:
@@ -125,14 +125,14 @@ class ErodeDistanceOperation : public DilateDistanceOperation {
/**
* The inner loop of this operation.
*/
- void executePixel(float output[4], int x, int y, void *data);
+ void executePixel(float output[4], int x, int y, void *data) override;
void executeOpenCL(OpenCLDevice *device,
MemoryBuffer *outputMemoryBuffer,
cl_mem clOutputBuffer,
MemoryBuffer **inputMemoryBuffers,
std::list<cl_mem> *clMemToCleanUp,
- std::list<cl_kernel> *clKernelsToCleanUp);
+ std::list<cl_kernel> *clKernelsToCleanUp) override;
};
class DilateStepOperation : public NodeOperation {
@@ -150,19 +150,19 @@ class DilateStepOperation : public NodeOperation {
/**
* The inner loop of this operation.
*/
- void executePixel(float output[4], int x, int y, void *data);
+ void executePixel(float output[4], int x, int y, void *data) override;
/**
* Initialize the execution
*/
- void initExecution();
+ void initExecution() override;
- void *initializeTileData(rcti *rect);
+ void *initializeTileData(rcti *rect) override;
/**
* Deinitialize the execution
*/
- void deinitExecution();
- void deinitializeTileData(rcti *rect, void *data);
+ void deinitExecution() override;
+ void deinitializeTileData(rcti *rect, void *data) override;
void setIterations(int iterations)
{
@@ -171,12 +171,12 @@ class DilateStepOperation : public NodeOperation {
bool determineDependingAreaOfInterest(rcti *input,
ReadBufferOperation *readOperation,
- rcti *output);
+ rcti *output) override;
};
class ErodeStepOperation : public DilateStepOperation {
public:
ErodeStepOperation();
- void *initializeTileData(rcti *rect);
+ void *initializeTileData(rcti *rect) override;
};
diff --git a/source/blender/compositor/operations/COM_DirectionalBlurOperation.h b/source/blender/compositor/operations/COM_DirectionalBlurOperation.h
index 0c220f0e239..daf6bc75254 100644
--- a/source/blender/compositor/operations/COM_DirectionalBlurOperation.h
+++ b/source/blender/compositor/operations/COM_DirectionalBlurOperation.h
@@ -36,21 +36,21 @@ class DirectionalBlurOperation : public NodeOperation, public QualityStepHelper
/**
* The inner loop of this operation.
*/
- void executePixel(float output[4], int x, int y, void *data);
+ void executePixel(float output[4], int x, int y, void *data) override;
/**
* Initialize the execution
*/
- void initExecution();
+ void initExecution() override;
/**
* Deinitialize the execution
*/
- void deinitExecution();
+ void deinitExecution() override;
bool determineDependingAreaOfInterest(rcti *input,
ReadBufferOperation *readOperation,
- rcti *output);
+ rcti *output) override;
void setData(NodeDBlurData *data)
{
@@ -62,5 +62,5 @@ class DirectionalBlurOperation : public NodeOperation, public QualityStepHelper
cl_mem clOutputBuffer,
MemoryBuffer **inputMemoryBuffers,
std::list<cl_mem> *clMemToCleanUp,
- std::list<cl_kernel> *clKernelsToCleanUp);
+ std::list<cl_kernel> *clKernelsToCleanUp) override;
};
diff --git a/source/blender/compositor/operations/COM_DisplaceOperation.h b/source/blender/compositor/operations/COM_DisplaceOperation.h
index 52874779f73..368ed29ff0b 100644
--- a/source/blender/compositor/operations/COM_DisplaceOperation.h
+++ b/source/blender/compositor/operations/COM_DisplaceOperation.h
@@ -41,24 +41,24 @@ class DisplaceOperation : public NodeOperation {
*/
bool determineDependingAreaOfInterest(rcti *input,
ReadBufferOperation *readOperation,
- rcti *output);
+ rcti *output) override;
/**
* The inner loop of this operation.
*/
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
void pixelTransform(const float xy[2], float r_uv[2], float r_deriv[2][2]);
/**
* Initialize the execution
*/
- void initExecution();
+ void initExecution() override;
/**
* Deinitialize the execution
*/
- void deinitExecution();
+ void deinitExecution() override;
private:
bool read_displacement(
diff --git a/source/blender/compositor/operations/COM_DisplaceSimpleOperation.h b/source/blender/compositor/operations/COM_DisplaceSimpleOperation.h
index 3b850d94750..63fe569c812 100644
--- a/source/blender/compositor/operations/COM_DisplaceSimpleOperation.h
+++ b/source/blender/compositor/operations/COM_DisplaceSimpleOperation.h
@@ -41,20 +41,20 @@ class DisplaceSimpleOperation : public NodeOperation {
*/
bool determineDependingAreaOfInterest(rcti *input,
ReadBufferOperation *readOperation,
- rcti *output);
+ rcti *output) override;
/**
* The inner loop of this operation.
*/
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
/**
* Initialize the execution
*/
- void initExecution();
+ void initExecution() override;
/**
* Deinitialize the execution
*/
- void deinitExecution();
+ void deinitExecution() override;
};
diff --git a/source/blender/compositor/operations/COM_DistanceRGBMatteOperation.h b/source/blender/compositor/operations/COM_DistanceRGBMatteOperation.h
index 5c8c2204637..0593dc6b976 100644
--- a/source/blender/compositor/operations/COM_DistanceRGBMatteOperation.h
+++ b/source/blender/compositor/operations/COM_DistanceRGBMatteOperation.h
@@ -41,10 +41,10 @@ class DistanceRGBMatteOperation : public NodeOperation {
/**
* The inner loop of this operation.
*/
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
- void initExecution();
- void deinitExecution();
+ void initExecution() override;
+ void deinitExecution() override;
void setSettings(NodeChroma *nodeChroma)
{
diff --git a/source/blender/compositor/operations/COM_DistanceYCCMatteOperation.h b/source/blender/compositor/operations/COM_DistanceYCCMatteOperation.h
index e9b2cda6251..ce91e3a62ba 100644
--- a/source/blender/compositor/operations/COM_DistanceYCCMatteOperation.h
+++ b/source/blender/compositor/operations/COM_DistanceYCCMatteOperation.h
@@ -27,7 +27,7 @@
*/
class DistanceYCCMatteOperation : public DistanceRGBMatteOperation {
protected:
- virtual float calculateDistance(float key[4], float image[4]);
+ float calculateDistance(float key[4], float image[4]) override;
public:
/**
diff --git a/source/blender/compositor/operations/COM_DotproductOperation.h b/source/blender/compositor/operations/COM_DotproductOperation.h
index 63b735ce30f..deff3ae5896 100644
--- a/source/blender/compositor/operations/COM_DotproductOperation.h
+++ b/source/blender/compositor/operations/COM_DotproductOperation.h
@@ -27,8 +27,8 @@ class DotproductOperation : public NodeOperation {
public:
DotproductOperation();
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
- void initExecution();
- void deinitExecution();
+ void initExecution() override;
+ void deinitExecution() override;
};
diff --git a/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.h b/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.h
index 813f5009815..228c8edc53e 100644
--- a/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.h
+++ b/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.h
@@ -38,23 +38,23 @@ class DoubleEdgeMaskOperation : public NodeOperation {
/**
* The inner loop of this operation.
*/
- void executePixel(float output[4], int x, int y, void *data);
+ void executePixel(float output[4], int x, int y, void *data) override;
/**
* Initialize the execution
*/
- void initExecution();
+ void initExecution() override;
/**
* Deinitialize the execution
*/
- void deinitExecution();
+ void deinitExecution() override;
- void *initializeTileData(rcti *rect);
+ void *initializeTileData(rcti *rect) override;
bool determineDependingAreaOfInterest(rcti *input,
ReadBufferOperation *readOperation,
- rcti *output);
+ rcti *output) override;
void setAdjecentOnly(bool adjacentOnly)
{
diff --git a/source/blender/compositor/operations/COM_EllipseMaskOperation.h b/source/blender/compositor/operations/COM_EllipseMaskOperation.h
index 8fce7166900..c7d7336600d 100644
--- a/source/blender/compositor/operations/COM_EllipseMaskOperation.h
+++ b/source/blender/compositor/operations/COM_EllipseMaskOperation.h
@@ -41,17 +41,17 @@ class EllipseMaskOperation : public NodeOperation {
/**
* The inner loop of this operation.
*/
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
/**
* Initialize the execution
*/
- void initExecution();
+ void initExecution() override;
/**
* Deinitialize the execution
*/
- void deinitExecution();
+ void deinitExecution() override;
void setData(NodeEllipseMask *data)
{
diff --git a/source/blender/compositor/operations/COM_FastGaussianBlurOperation.h b/source/blender/compositor/operations/COM_FastGaussianBlurOperation.h
index 6ab6474c20a..c710baaaff8 100644
--- a/source/blender/compositor/operations/COM_FastGaussianBlurOperation.h
+++ b/source/blender/compositor/operations/COM_FastGaussianBlurOperation.h
@@ -31,13 +31,13 @@ class FastGaussianBlurOperation : public BlurBaseOperation {
FastGaussianBlurOperation();
bool determineDependingAreaOfInterest(rcti *input,
ReadBufferOperation *readOperation,
- rcti *output);
- void executePixel(float output[4], int x, int y, void *data);
+ rcti *output) override;
+ void executePixel(float output[4], int x, int y, void *data) override;
static void IIR_gauss(MemoryBuffer *src, float sigma, unsigned int channel, unsigned int xy);
- void *initializeTileData(rcti *rect);
- void deinitExecution();
- void initExecution();
+ void *initializeTileData(rcti *rect) override;
+ void deinitExecution() override;
+ void initExecution() override;
};
enum {
@@ -62,12 +62,12 @@ class FastGaussianBlurValueOperation : public NodeOperation {
FastGaussianBlurValueOperation();
bool determineDependingAreaOfInterest(rcti *input,
ReadBufferOperation *readOperation,
- rcti *output);
- void executePixel(float output[4], int x, int y, void *data);
+ rcti *output) override;
+ void executePixel(float output[4], int x, int y, void *data) override;
- void *initializeTileData(rcti *rect);
- void deinitExecution();
- void initExecution();
+ void *initializeTileData(rcti *rect) override;
+ void deinitExecution() override;
+ void initExecution() override;
void setSigma(float sigma)
{
this->m_sigma = sigma;
diff --git a/source/blender/compositor/operations/COM_FlipOperation.h b/source/blender/compositor/operations/COM_FlipOperation.h
index 711b51261e6..e571e57913f 100644
--- a/source/blender/compositor/operations/COM_FlipOperation.h
+++ b/source/blender/compositor/operations/COM_FlipOperation.h
@@ -30,11 +30,11 @@ class FlipOperation : public NodeOperation {
FlipOperation();
bool determineDependingAreaOfInterest(rcti *input,
ReadBufferOperation *readOperation,
- rcti *output);
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ rcti *output) override;
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
- void initExecution();
- void deinitExecution();
+ void initExecution() override;
+ void deinitExecution() override;
void setFlipX(bool flipX)
{
this->m_flipX = flipX;
diff --git a/source/blender/compositor/operations/COM_GammaCorrectOperation.h b/source/blender/compositor/operations/COM_GammaCorrectOperation.h
index 077493bbd2f..81724581f55 100644
--- a/source/blender/compositor/operations/COM_GammaCorrectOperation.h
+++ b/source/blender/compositor/operations/COM_GammaCorrectOperation.h
@@ -33,17 +33,17 @@ class GammaCorrectOperation : public NodeOperation {
/**
* The inner loop of this operation.
*/
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
/**
* Initialize the execution
*/
- void initExecution();
+ void initExecution() override;
/**
* Deinitialize the execution
*/
- void deinitExecution();
+ void deinitExecution() override;
};
class GammaUncorrectOperation : public NodeOperation {
@@ -59,15 +59,15 @@ class GammaUncorrectOperation : public NodeOperation {
/**
* The inner loop of this operation.
*/
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
/**
* Initialize the execution
*/
- void initExecution();
+ void initExecution() override;
/**
* Deinitialize the execution
*/
- void deinitExecution();
+ void deinitExecution() override;
};
diff --git a/source/blender/compositor/operations/COM_GammaOperation.h b/source/blender/compositor/operations/COM_GammaOperation.h
index 8641f2fde62..c18f3bc3688 100644
--- a/source/blender/compositor/operations/COM_GammaOperation.h
+++ b/source/blender/compositor/operations/COM_GammaOperation.h
@@ -34,15 +34,15 @@ class GammaOperation : public NodeOperation {
/**
* The inner loop of this operation.
*/
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
/**
* Initialize the execution
*/
- void initExecution();
+ void initExecution() override;
/**
* Deinitialize the execution
*/
- void deinitExecution();
+ void deinitExecution() override;
};
diff --git a/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.h b/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.h
index 2d536a98bee..51ca8359067 100644
--- a/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.h
+++ b/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.h
@@ -36,22 +36,22 @@ class GaussianAlphaXBlurOperation : public BlurBaseOperation {
/**
* \brief The inner loop of this operation.
*/
- void executePixel(float output[4], int x, int y, void *data);
+ void executePixel(float output[4], int x, int y, void *data) override;
/**
* \brief initialize the execution
*/
- void initExecution();
+ void initExecution() override;
/**
* \brief Deinitialize the execution
*/
- void deinitExecution();
+ void deinitExecution() override;
- void *initializeTileData(rcti *rect);
+ void *initializeTileData(rcti *rect) override;
bool determineDependingAreaOfInterest(rcti *input,
ReadBufferOperation *readOperation,
- rcti *output);
+ rcti *output) override;
/**
* Set subtract for Dilate/Erode functionality
diff --git a/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.h b/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.h
index 7f1dfd78e7c..edd60acf2fc 100644
--- a/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.h
+++ b/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.h
@@ -36,22 +36,22 @@ class GaussianAlphaYBlurOperation : public BlurBaseOperation {
/**
* The inner loop of this operation.
*/
- void executePixel(float output[4], int x, int y, void *data);
+ void executePixel(float output[4], int x, int y, void *data) override;
/**
* \brief initialize the execution
*/
- void initExecution();
+ void initExecution() override;
/**
* Deinitialize the execution
*/
- void deinitExecution();
+ void deinitExecution() override;
- void *initializeTileData(rcti *rect);
+ void *initializeTileData(rcti *rect) override;
bool determineDependingAreaOfInterest(rcti *input,
ReadBufferOperation *readOperation,
- rcti *output);
+ rcti *output) override;
/**
* Set subtract for Dilate/Erode functionality
diff --git a/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.h b/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.h
index a37a70b4b33..0eb8379dfc8 100644
--- a/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.h
+++ b/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.h
@@ -30,21 +30,21 @@ class GaussianBokehBlurOperation : public BlurBaseOperation {
public:
GaussianBokehBlurOperation();
- void initExecution();
- void *initializeTileData(rcti *rect);
+ void initExecution() override;
+ void *initializeTileData(rcti *rect) override;
/**
* The inner loop of this operation.
*/
- void executePixel(float output[4], int x, int y, void *data);
+ void executePixel(float output[4], int x, int y, void *data) override;
/**
* Deinitialize the execution
*/
- void deinitExecution();
+ void deinitExecution() override;
bool determineDependingAreaOfInterest(rcti *input,
ReadBufferOperation *readOperation,
- rcti *output);
+ rcti *output) override;
};
class GaussianBlurReferenceOperation : public BlurBaseOperation {
@@ -59,19 +59,19 @@ class GaussianBlurReferenceOperation : public BlurBaseOperation {
public:
GaussianBlurReferenceOperation();
- void initExecution();
- void *initializeTileData(rcti *rect);
+ void initExecution() override;
+ void *initializeTileData(rcti *rect) override;
/**
* The inner loop of this operation.
*/
- void executePixel(float output[4], int x, int y, void *data);
+ void executePixel(float output[4], int x, int y, void *data) override;
/**
* Deinitialize the execution
*/
- void deinitExecution();
+ void deinitExecution() override;
bool determineDependingAreaOfInterest(rcti *input,
ReadBufferOperation *readOperation,
- rcti *output);
+ rcti *output) override;
};
diff --git a/source/blender/compositor/operations/COM_GaussianXBlurOperation.h b/source/blender/compositor/operations/COM_GaussianXBlurOperation.h
index 78ea6aa3cc2..44e6044e59b 100644
--- a/source/blender/compositor/operations/COM_GaussianXBlurOperation.h
+++ b/source/blender/compositor/operations/COM_GaussianXBlurOperation.h
@@ -36,29 +36,29 @@ class GaussianXBlurOperation : public BlurBaseOperation {
/**
* \brief The inner loop of this operation.
*/
- void executePixel(float output[4], int x, int y, void *data);
+ void executePixel(float output[4], int x, int y, void *data) override;
void executeOpenCL(OpenCLDevice *device,
MemoryBuffer *outputMemoryBuffer,
cl_mem clOutputBuffer,
MemoryBuffer **inputMemoryBuffers,
std::list<cl_mem> *clMemToCleanUp,
- std::list<cl_kernel> *clKernelsToCleanUp);
+ std::list<cl_kernel> *clKernelsToCleanUp) override;
/**
* \brief initialize the execution
*/
- void initExecution();
+ void initExecution() override;
/**
* \brief Deinitialize the execution
*/
- void deinitExecution();
+ void deinitExecution() override;
- void *initializeTileData(rcti *rect);
+ void *initializeTileData(rcti *rect) override;
bool determineDependingAreaOfInterest(rcti *input,
ReadBufferOperation *readOperation,
- rcti *output);
+ rcti *output) override;
void checkOpenCL()
{
diff --git a/source/blender/compositor/operations/COM_GaussianYBlurOperation.h b/source/blender/compositor/operations/COM_GaussianYBlurOperation.h
index 8e7440b6fe4..a0abb0dd050 100644
--- a/source/blender/compositor/operations/COM_GaussianYBlurOperation.h
+++ b/source/blender/compositor/operations/COM_GaussianYBlurOperation.h
@@ -36,29 +36,29 @@ class GaussianYBlurOperation : public BlurBaseOperation {
/**
* The inner loop of this operation.
*/
- void executePixel(float output[4], int x, int y, void *data);
+ void executePixel(float output[4], int x, int y, void *data) override;
void executeOpenCL(OpenCLDevice *device,
MemoryBuffer *outputMemoryBuffer,
cl_mem clOutputBuffer,
MemoryBuffer **inputMemoryBuffers,
std::list<cl_mem> *clMemToCleanUp,
- std::list<cl_kernel> *clKernelsToCleanUp);
+ std::list<cl_kernel> *clKernelsToCleanUp) override;
/**
* \brief initialize the execution
*/
- void initExecution();
+ void initExecution() override;
/**
* Deinitialize the execution
*/
- void deinitExecution();
+ void deinitExecution() override;
- void *initializeTileData(rcti *rect);
+ void *initializeTileData(rcti *rect) override;
bool determineDependingAreaOfInterest(rcti *input,
ReadBufferOperation *readOperation,
- rcti *output);
+ rcti *output) override;
void checkOpenCL()
{
diff --git a/source/blender/compositor/operations/COM_GlareBaseOperation.h b/source/blender/compositor/operations/COM_GlareBaseOperation.h
index aabb76f5cf0..563877b734c 100644
--- a/source/blender/compositor/operations/COM_GlareBaseOperation.h
+++ b/source/blender/compositor/operations/COM_GlareBaseOperation.h
@@ -51,12 +51,12 @@ class GlareBaseOperation : public SingleThreadedOperation {
/**
* Initialize the execution
*/
- void initExecution();
+ void initExecution() override;
/**
* Deinitialize the execution
*/
- void deinitExecution();
+ void deinitExecution() override;
void setGlareSettings(NodeGlare *settings)
{
@@ -64,12 +64,12 @@ class GlareBaseOperation : public SingleThreadedOperation {
}
bool determineDependingAreaOfInterest(rcti *input,
ReadBufferOperation *readOperation,
- rcti *output);
+ rcti *output) override;
protected:
GlareBaseOperation();
virtual void generateGlare(float *data, MemoryBuffer *inputTile, NodeGlare *settings) = 0;
- MemoryBuffer *createMemoryBuffer(rcti *rect);
+ MemoryBuffer *createMemoryBuffer(rcti *rect) override;
};
diff --git a/source/blender/compositor/operations/COM_GlareFogGlowOperation.h b/source/blender/compositor/operations/COM_GlareFogGlowOperation.h
index 9084f27052e..844600527ee 100644
--- a/source/blender/compositor/operations/COM_GlareFogGlowOperation.h
+++ b/source/blender/compositor/operations/COM_GlareFogGlowOperation.h
@@ -29,5 +29,5 @@ class GlareFogGlowOperation : public GlareBaseOperation {
}
protected:
- void generateGlare(float *data, MemoryBuffer *inputTile, NodeGlare *settings);
+ void generateGlare(float *data, MemoryBuffer *inputTile, NodeGlare *settings) override;
};
diff --git a/source/blender/compositor/operations/COM_GlareGhostOperation.h b/source/blender/compositor/operations/COM_GlareGhostOperation.h
index 8ecf8da3385..1b6bf3b2603 100644
--- a/source/blender/compositor/operations/COM_GlareGhostOperation.h
+++ b/source/blender/compositor/operations/COM_GlareGhostOperation.h
@@ -29,5 +29,5 @@ class GlareGhostOperation : public GlareBaseOperation {
}
protected:
- void generateGlare(float *data, MemoryBuffer *inputTile, NodeGlare *settings);
+ void generateGlare(float *data, MemoryBuffer *inputTile, NodeGlare *settings) override;
};
diff --git a/source/blender/compositor/operations/COM_GlareSimpleStarOperation.h b/source/blender/compositor/operations/COM_GlareSimpleStarOperation.h
index 0f5913fcef9..ab92e0019fa 100644
--- a/source/blender/compositor/operations/COM_GlareSimpleStarOperation.h
+++ b/source/blender/compositor/operations/COM_GlareSimpleStarOperation.h
@@ -29,5 +29,5 @@ class GlareSimpleStarOperation : public GlareBaseOperation {
}
protected:
- void generateGlare(float *data, MemoryBuffer *inputTile, NodeGlare *settings);
+ void generateGlare(float *data, MemoryBuffer *inputTile, NodeGlare *settings) override;
};
diff --git a/source/blender/compositor/operations/COM_GlareStreaksOperation.h b/source/blender/compositor/operations/COM_GlareStreaksOperation.h
index df31981170d..833dbcfbb95 100644
--- a/source/blender/compositor/operations/COM_GlareStreaksOperation.h
+++ b/source/blender/compositor/operations/COM_GlareStreaksOperation.h
@@ -29,5 +29,5 @@ class GlareStreaksOperation : public GlareBaseOperation {
}
protected:
- void generateGlare(float *data, MemoryBuffer *inputTile, NodeGlare *settings);
+ void generateGlare(float *data, MemoryBuffer *inputTile, NodeGlare *settings) override;
};
diff --git a/source/blender/compositor/operations/COM_GlareThresholdOperation.h b/source/blender/compositor/operations/COM_GlareThresholdOperation.h
index 1e55f401ef3..34df10a0f81 100644
--- a/source/blender/compositor/operations/COM_GlareThresholdOperation.h
+++ b/source/blender/compositor/operations/COM_GlareThresholdOperation.h
@@ -39,22 +39,23 @@ class GlareThresholdOperation : public NodeOperation {
/**
* The inner loop of this operation.
*/
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
/**
* Initialize the execution
*/
- void initExecution();
+ void initExecution() override;
/**
* Deinitialize the execution
*/
- void deinitExecution();
+ void deinitExecution() override;
void setGlareSettings(NodeGlare *settings)
{
this->m_settings = settings;
}
- void determineResolution(unsigned int resolution[2], unsigned int preferredResolution[2]);
+ void determineResolution(unsigned int resolution[2],
+ unsigned int preferredResolution[2]) override;
};
diff --git a/source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.h b/source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.h
index dea7eae4a15..79eb40bbf60 100644
--- a/source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.h
+++ b/source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.h
@@ -34,15 +34,15 @@ class HueSaturationValueCorrectOperation : public CurveBaseOperation {
/**
* The inner loop of this operation.
*/
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
/**
* Initialize the execution
*/
- void initExecution();
+ void initExecution() override;
/**
* Deinitialize the execution
*/
- void deinitExecution();
+ void deinitExecution() override;
};
diff --git a/source/blender/compositor/operations/COM_IDMaskOperation.h b/source/blender/compositor/operations/COM_IDMaskOperation.h
index abd2a719371..9a8d553b184 100644
--- a/source/blender/compositor/operations/COM_IDMaskOperation.h
+++ b/source/blender/compositor/operations/COM_IDMaskOperation.h
@@ -27,8 +27,8 @@ class IDMaskOperation : public NodeOperation {
public:
IDMaskOperation();
- void *initializeTileData(rcti *rect);
- void executePixel(float output[4], int x, int y, void *data);
+ void *initializeTileData(rcti *rect) override;
+ void executePixel(float output[4], int x, int y, void *data) override;
void setObjectIndex(float objectIndex)
{
diff --git a/source/blender/compositor/operations/COM_ImageOperation.h b/source/blender/compositor/operations/COM_ImageOperation.h
index bff8dcc1cea..0bb92ce1b7e 100644
--- a/source/blender/compositor/operations/COM_ImageOperation.h
+++ b/source/blender/compositor/operations/COM_ImageOperation.h
@@ -49,13 +49,14 @@ class BaseImageOperation : public NodeOperation {
/**
* Determine the output resolution. The resolution is retrieved from the Renderer
*/
- void determineResolution(unsigned int resolution[2], unsigned int preferredResolution[2]);
+ void determineResolution(unsigned int resolution[2],
+ unsigned int preferredResolution[2]) override;
virtual ImBuf *getImBuf();
public:
- void initExecution();
- void deinitExecution();
+ void initExecution() override;
+ void deinitExecution() override;
void setImage(Image *image)
{
this->m_image = image;
@@ -83,7 +84,7 @@ class ImageOperation : public BaseImageOperation {
* Constructor
*/
ImageOperation();
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};
class ImageAlphaOperation : public BaseImageOperation {
public:
@@ -91,7 +92,7 @@ class ImageAlphaOperation : public BaseImageOperation {
* Constructor
*/
ImageAlphaOperation();
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};
class ImageDepthOperation : public BaseImageOperation {
public:
@@ -99,5 +100,5 @@ class ImageDepthOperation : public BaseImageOperation {
* Constructor
*/
ImageDepthOperation();
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};
diff --git a/source/blender/compositor/operations/COM_InpaintOperation.h b/source/blender/compositor/operations/COM_InpaintOperation.h
index 4c43e433dec..8fefa475b4a 100644
--- a/source/blender/compositor/operations/COM_InpaintOperation.h
+++ b/source/blender/compositor/operations/COM_InpaintOperation.h
@@ -42,18 +42,18 @@ class InpaintSimpleOperation : public NodeOperation {
/**
* The inner loop of this operation.
*/
- void executePixel(float output[4], int x, int y, void *data);
+ void executePixel(float output[4], int x, int y, void *data) override;
/**
* Initialize the execution
*/
- void initExecution();
+ void initExecution() override;
- void *initializeTileData(rcti *rect);
+ void *initializeTileData(rcti *rect) override;
/**
* Deinitialize the execution
*/
- void deinitExecution();
+ void deinitExecution() override;
void setIterations(int iterations)
{
@@ -62,7 +62,7 @@ class InpaintSimpleOperation : public NodeOperation {
bool determineDependingAreaOfInterest(rcti *input,
ReadBufferOperation *readOperation,
- rcti *output);
+ rcti *output) override;
private:
void calc_manhattan_distance();
diff --git a/source/blender/compositor/operations/COM_InvertOperation.h b/source/blender/compositor/operations/COM_InvertOperation.h
index ac0b1c3ab2e..a7b0f823ae2 100644
--- a/source/blender/compositor/operations/COM_InvertOperation.h
+++ b/source/blender/compositor/operations/COM_InvertOperation.h
@@ -37,17 +37,17 @@ class InvertOperation : public NodeOperation {
/**
* The inner loop of this operation.
*/
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
/**
* Initialize the execution
*/
- void initExecution();
+ void initExecution() override;
/**
* Deinitialize the execution
*/
- void deinitExecution();
+ void deinitExecution() override;
void setColor(bool color)
{
diff --git a/source/blender/compositor/operations/COM_KeyingBlurOperation.h b/source/blender/compositor/operations/COM_KeyingBlurOperation.h
index 6a2b43a6cd4..b1ea4229b6d 100644
--- a/source/blender/compositor/operations/COM_KeyingBlurOperation.h
+++ b/source/blender/compositor/operations/COM_KeyingBlurOperation.h
@@ -45,11 +45,11 @@ class KeyingBlurOperation : public NodeOperation {
this->m_axis = value;
}
- void *initializeTileData(rcti *rect);
+ void *initializeTileData(rcti *rect) override;
- void executePixel(float output[4], int x, int y, void *data);
+ void executePixel(float output[4], int x, int y, void *data) override;
bool determineDependingAreaOfInterest(rcti *input,
ReadBufferOperation *readOperation,
- rcti *output);
+ rcti *output) override;
};
diff --git a/source/blender/compositor/operations/COM_KeyingClipOperation.h b/source/blender/compositor/operations/COM_KeyingClipOperation.h
index 9d876966e96..1b2fa886814 100644
--- a/source/blender/compositor/operations/COM_KeyingClipOperation.h
+++ b/source/blender/compositor/operations/COM_KeyingClipOperation.h
@@ -59,11 +59,11 @@ class KeyingClipOperation : public NodeOperation {
this->m_isEdgeMatte = value;
}
- void *initializeTileData(rcti *rect);
+ void *initializeTileData(rcti *rect) override;
- void executePixel(float output[4], int x, int y, void *data);
+ void executePixel(float output[4], int x, int y, void *data) override;
bool determineDependingAreaOfInterest(rcti *input,
ReadBufferOperation *readOperation,
- rcti *output);
+ rcti *output) override;
};
diff --git a/source/blender/compositor/operations/COM_KeyingDespillOperation.h b/source/blender/compositor/operations/COM_KeyingDespillOperation.h
index 32df7939c43..c201388c1c1 100644
--- a/source/blender/compositor/operations/COM_KeyingDespillOperation.h
+++ b/source/blender/compositor/operations/COM_KeyingDespillOperation.h
@@ -33,8 +33,8 @@ class KeyingDespillOperation : public NodeOperation {
public:
KeyingDespillOperation();
- void initExecution();
- void deinitExecution();
+ void initExecution() override;
+ void deinitExecution() override;
void setDespillFactor(float value)
{
@@ -45,5 +45,5 @@ class KeyingDespillOperation : public NodeOperation {
this->m_colorBalance = value;
}
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};
diff --git a/source/blender/compositor/operations/COM_KeyingOperation.h b/source/blender/compositor/operations/COM_KeyingOperation.h
index 946d7bdc1f7..13f4e5e247b 100644
--- a/source/blender/compositor/operations/COM_KeyingOperation.h
+++ b/source/blender/compositor/operations/COM_KeyingOperation.h
@@ -37,13 +37,13 @@ class KeyingOperation : public NodeOperation {
public:
KeyingOperation();
- void initExecution();
- void deinitExecution();
+ void initExecution() override;
+ void deinitExecution() override;
void setScreenBalance(float value)
{
this->m_screenBalance = value;
}
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};
diff --git a/source/blender/compositor/operations/COM_KeyingScreenOperation.h b/source/blender/compositor/operations/COM_KeyingScreenOperation.h
index 595301bb951..86cd94e308d 100644
--- a/source/blender/compositor/operations/COM_KeyingScreenOperation.h
+++ b/source/blender/compositor/operations/COM_KeyingScreenOperation.h
@@ -54,18 +54,19 @@ class KeyingScreenOperation : public NodeOperation {
/**
* Determine the output resolution. The resolution is retrieved from the Renderer
*/
- void determineResolution(unsigned int resolution[2], unsigned int preferredResolution[2]);
+ void determineResolution(unsigned int resolution[2],
+ unsigned int preferredResolution[2]) override;
TriangulationData *buildVoronoiTriangulation();
public:
KeyingScreenOperation();
- void initExecution();
- void deinitExecution();
+ void initExecution() override;
+ void deinitExecution() override;
- void *initializeTileData(rcti *rect);
- void deinitializeTileData(rcti *rect, void *data);
+ void *initializeTileData(rcti *rect) override;
+ void deinitializeTileData(rcti *rect, void *data) override;
void setMovieClip(MovieClip *clip)
{
@@ -80,5 +81,5 @@ class KeyingScreenOperation : public NodeOperation {
this->m_framenumber = framenumber;
}
- void executePixel(float output[4], int x, int y, void *data);
+ void executePixel(float output[4], int x, int y, void *data) override;
};
diff --git a/source/blender/compositor/operations/COM_LuminanceMatteOperation.h b/source/blender/compositor/operations/COM_LuminanceMatteOperation.h
index 2c3a61d8755..4e716468568 100644
--- a/source/blender/compositor/operations/COM_LuminanceMatteOperation.h
+++ b/source/blender/compositor/operations/COM_LuminanceMatteOperation.h
@@ -38,10 +38,10 @@ class LuminanceMatteOperation : public NodeOperation {
/**
* The inner loop of this operation.
*/
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
- void initExecution();
- void deinitExecution();
+ void initExecution() override;
+ void deinitExecution() override;
void setSettings(NodeChroma *nodeChroma)
{
diff --git a/source/blender/compositor/operations/COM_MapRangeOperation.h b/source/blender/compositor/operations/COM_MapRangeOperation.h
index 95268d5699f..27a7cfd90c3 100644
--- a/source/blender/compositor/operations/COM_MapRangeOperation.h
+++ b/source/blender/compositor/operations/COM_MapRangeOperation.h
@@ -47,17 +47,17 @@ class MapRangeOperation : public NodeOperation {
/**
* The inner loop of this operation.
*/
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
/**
* Initialize the execution
*/
- void initExecution();
+ void initExecution() override;
/**
* Deinitialize the execution
*/
- void deinitExecution();
+ void deinitExecution() override;
/**
* Clamp the output
diff --git a/source/blender/compositor/operations/COM_MapUVOperation.h b/source/blender/compositor/operations/COM_MapUVOperation.h
index 66e70a7ab83..e3481b9cae9 100644
--- a/source/blender/compositor/operations/COM_MapUVOperation.h
+++ b/source/blender/compositor/operations/COM_MapUVOperation.h
@@ -38,24 +38,24 @@ class MapUVOperation : public NodeOperation {
*/
bool determineDependingAreaOfInterest(rcti *input,
ReadBufferOperation *readOperation,
- rcti *output);
+ rcti *output) override;
/**
* The inner loop of this operation.
*/
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
void pixelTransform(const float xy[2], float r_uv[2], float r_deriv[2][2], float &r_alpha);
/**
* Initialize the execution
*/
- void initExecution();
+ void initExecution() override;
/**
* Deinitialize the execution
*/
- void deinitExecution();
+ void deinitExecution() override;
void setAlpha(float alpha)
{
diff --git a/source/blender/compositor/operations/COM_MapValueOperation.h b/source/blender/compositor/operations/COM_MapValueOperation.h
index 3de377ed0fc..98417001f4a 100644
--- a/source/blender/compositor/operations/COM_MapValueOperation.h
+++ b/source/blender/compositor/operations/COM_MapValueOperation.h
@@ -42,17 +42,17 @@ class MapValueOperation : public NodeOperation {
/**
* The inner loop of this operation.
*/
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
/**
* Initialize the execution
*/
- void initExecution();
+ void initExecution() override;
/**
* Deinitialize the execution
*/
- void deinitExecution();
+ void deinitExecution() override;
/**
* \brief set the TexMapping settings
diff --git a/source/blender/compositor/operations/COM_MaskOperation.h b/source/blender/compositor/operations/COM_MaskOperation.h
index 67e6b64315c..909af921625 100644
--- a/source/blender/compositor/operations/COM_MaskOperation.h
+++ b/source/blender/compositor/operations/COM_MaskOperation.h
@@ -49,13 +49,14 @@ class MaskOperation : public NodeOperation {
/**
* Determine the output resolution. The resolution is retrieved from the Renderer
*/
- void determineResolution(unsigned int resolution[2], unsigned int preferredResolution[2]);
+ void determineResolution(unsigned int resolution[2],
+ unsigned int preferredResolution[2]) override;
public:
MaskOperation();
- void initExecution();
- void deinitExecution();
+ void initExecution() override;
+ void deinitExecution() override;
void setMask(Mask *mask)
{
@@ -91,5 +92,5 @@ class MaskOperation : public NodeOperation {
this->m_frame_shutter = shutter;
}
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};
diff --git a/source/blender/compositor/operations/COM_MathBaseOperation.h b/source/blender/compositor/operations/COM_MathBaseOperation.h
index 292326caded..27a01667da5 100644
--- a/source/blender/compositor/operations/COM_MathBaseOperation.h
+++ b/source/blender/compositor/operations/COM_MathBaseOperation.h
@@ -45,24 +45,20 @@ class MathBaseOperation : public NodeOperation {
public:
/**
- * The inner loop of this operation.
- */
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) = 0;
-
- /**
* Initialize the execution
*/
- void initExecution();
+ void initExecution() override;
/**
* Deinitialize the execution
*/
- void deinitExecution();
+ void deinitExecution() override;
/**
* Determine resolution
*/
- void determineResolution(unsigned int resolution[2], unsigned int preferredResolution[2]);
+ void determineResolution(unsigned int resolution[2],
+ unsigned int preferredResolution[2]) override;
void setUseClamp(bool value)
{
@@ -75,49 +71,49 @@ class MathAddOperation : public MathBaseOperation {
MathAddOperation() : MathBaseOperation()
{
}
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};
class MathSubtractOperation : public MathBaseOperation {
public:
MathSubtractOperation() : MathBaseOperation()
{
}
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};
class MathMultiplyOperation : public MathBaseOperation {
public:
MathMultiplyOperation() : MathBaseOperation()
{
}
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};
class MathDivideOperation : public MathBaseOperation {
public:
MathDivideOperation() : MathBaseOperation()
{
}
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};
class MathSineOperation : public MathBaseOperation {
public:
MathSineOperation() : MathBaseOperation()
{
}
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};
class MathCosineOperation : public MathBaseOperation {
public:
MathCosineOperation() : MathBaseOperation()
{
}
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};
class MathTangentOperation : public MathBaseOperation {
public:
MathTangentOperation() : MathBaseOperation()
{
}
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};
class MathHyperbolicSineOperation : public MathBaseOperation {
@@ -125,21 +121,21 @@ class MathHyperbolicSineOperation : public MathBaseOperation {
MathHyperbolicSineOperation() : MathBaseOperation()
{
}
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};
class MathHyperbolicCosineOperation : public MathBaseOperation {
public:
MathHyperbolicCosineOperation() : MathBaseOperation()
{
}
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};
class MathHyperbolicTangentOperation : public MathBaseOperation {
public:
MathHyperbolicTangentOperation() : MathBaseOperation()
{
}
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};
class MathArcSineOperation : public MathBaseOperation {
@@ -147,70 +143,70 @@ class MathArcSineOperation : public MathBaseOperation {
MathArcSineOperation() : MathBaseOperation()
{
}
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};
class MathArcCosineOperation : public MathBaseOperation {
public:
MathArcCosineOperation() : MathBaseOperation()
{
}
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};
class MathArcTangentOperation : public MathBaseOperation {
public:
MathArcTangentOperation() : MathBaseOperation()
{
}
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};
class MathPowerOperation : public MathBaseOperation {
public:
MathPowerOperation() : MathBaseOperation()
{
}
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};
class MathLogarithmOperation : public MathBaseOperation {
public:
MathLogarithmOperation() : MathBaseOperation()
{
}
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};
class MathMinimumOperation : public MathBaseOperation {
public:
MathMinimumOperation() : MathBaseOperation()
{
}
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};
class MathMaximumOperation : public MathBaseOperation {
public:
MathMaximumOperation() : MathBaseOperation()
{
}
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};
class MathRoundOperation : public MathBaseOperation {
public:
MathRoundOperation() : MathBaseOperation()
{
}
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};
class MathLessThanOperation : public MathBaseOperation {
public:
MathLessThanOperation() : MathBaseOperation()
{
}
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};
class MathGreaterThanOperation : public MathBaseOperation {
public:
MathGreaterThanOperation() : MathBaseOperation()
{
}
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};
class MathModuloOperation : public MathBaseOperation {
@@ -218,7 +214,7 @@ class MathModuloOperation : public MathBaseOperation {
MathModuloOperation() : MathBaseOperation()
{
}
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};
class MathAbsoluteOperation : public MathBaseOperation {
@@ -226,7 +222,7 @@ class MathAbsoluteOperation : public MathBaseOperation {
MathAbsoluteOperation() : MathBaseOperation()
{
}
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};
class MathRadiansOperation : public MathBaseOperation {
@@ -234,7 +230,7 @@ class MathRadiansOperation : public MathBaseOperation {
MathRadiansOperation() : MathBaseOperation()
{
}
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};
class MathDegreesOperation : public MathBaseOperation {
@@ -242,7 +238,7 @@ class MathDegreesOperation : public MathBaseOperation {
MathDegreesOperation() : MathBaseOperation()
{
}
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};
class MathArcTan2Operation : public MathBaseOperation {
@@ -250,7 +246,7 @@ class MathArcTan2Operation : public MathBaseOperation {
MathArcTan2Operation() : MathBaseOperation()
{
}
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};
class MathFloorOperation : public MathBaseOperation {
@@ -258,7 +254,7 @@ class MathFloorOperation : public MathBaseOperation {
MathFloorOperation() : MathBaseOperation()
{
}
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};
class MathCeilOperation : public MathBaseOperation {
@@ -266,7 +262,7 @@ class MathCeilOperation : public MathBaseOperation {
MathCeilOperation() : MathBaseOperation()
{
}
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};
class MathFractOperation : public MathBaseOperation {
@@ -274,7 +270,7 @@ class MathFractOperation : public MathBaseOperation {
MathFractOperation() : MathBaseOperation()
{
}
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};
class MathSqrtOperation : public MathBaseOperation {
@@ -282,7 +278,7 @@ class MathSqrtOperation : public MathBaseOperation {
MathSqrtOperation() : MathBaseOperation()
{
}
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};
class MathInverseSqrtOperation : public MathBaseOperation {
@@ -290,7 +286,7 @@ class MathInverseSqrtOperation : public MathBaseOperation {
MathInverseSqrtOperation() : MathBaseOperation()
{
}
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};
class MathSignOperation : public MathBaseOperation {
@@ -298,7 +294,7 @@ class MathSignOperation : public MathBaseOperation {
MathSignOperation() : MathBaseOperation()
{
}
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};
class MathExponentOperation : public MathBaseOperation {
@@ -306,7 +302,7 @@ class MathExponentOperation : public MathBaseOperation {
MathExponentOperation() : MathBaseOperation()
{
}
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};
class MathTruncOperation : public MathBaseOperation {
@@ -314,7 +310,7 @@ class MathTruncOperation : public MathBaseOperation {
MathTruncOperation() : MathBaseOperation()
{
}
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};
class MathSnapOperation : public MathBaseOperation {
@@ -322,7 +318,7 @@ class MathSnapOperation : public MathBaseOperation {
MathSnapOperation() : MathBaseOperation()
{
}
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};
class MathWrapOperation : public MathBaseOperation {
@@ -330,7 +326,7 @@ class MathWrapOperation : public MathBaseOperation {
MathWrapOperation() : MathBaseOperation()
{
}
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};
class MathPingpongOperation : public MathBaseOperation {
@@ -338,7 +334,7 @@ class MathPingpongOperation : public MathBaseOperation {
MathPingpongOperation() : MathBaseOperation()
{
}
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};
class MathCompareOperation : public MathBaseOperation {
@@ -346,7 +342,7 @@ class MathCompareOperation : public MathBaseOperation {
MathCompareOperation() : MathBaseOperation()
{
}
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};
class MathMultiplyAddOperation : public MathBaseOperation {
@@ -354,7 +350,7 @@ class MathMultiplyAddOperation : public MathBaseOperation {
MathMultiplyAddOperation() : MathBaseOperation()
{
}
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};
class MathSmoothMinOperation : public MathBaseOperation {
@@ -362,7 +358,7 @@ class MathSmoothMinOperation : public MathBaseOperation {
MathSmoothMinOperation() : MathBaseOperation()
{
}
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};
class MathSmoothMaxOperation : public MathBaseOperation {
@@ -370,5 +366,5 @@ class MathSmoothMaxOperation : public MathBaseOperation {
MathSmoothMaxOperation() : MathBaseOperation()
{
}
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};
diff --git a/source/blender/compositor/operations/COM_MixOperation.h b/source/blender/compositor/operations/COM_MixOperation.h
index 2f6e03ca7a3..dd1f34a5322 100644
--- a/source/blender/compositor/operations/COM_MixOperation.h
+++ b/source/blender/compositor/operations/COM_MixOperation.h
@@ -52,19 +52,20 @@ class MixBaseOperation : public NodeOperation {
/**
* The inner loop of this operation.
*/
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
/**
* Initialize the execution
*/
- void initExecution();
+ void initExecution() override;
/**
* Deinitialize the execution
*/
- void deinitExecution();
+ void deinitExecution() override;
- void determineResolution(unsigned int resolution[2], unsigned int preferredResolution[2]);
+ void determineResolution(unsigned int resolution[2],
+ unsigned int preferredResolution[2]) override;
void setUseValueAlphaMultiply(const bool value)
{
@@ -83,113 +84,113 @@ class MixBaseOperation : public NodeOperation {
class MixAddOperation : public MixBaseOperation {
public:
MixAddOperation();
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};
class MixBlendOperation : public MixBaseOperation {
public:
MixBlendOperation();
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};
class MixColorBurnOperation : public MixBaseOperation {
public:
MixColorBurnOperation();
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};
class MixColorOperation : public MixBaseOperation {
public:
MixColorOperation();
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};
class MixDarkenOperation : public MixBaseOperation {
public:
MixDarkenOperation();
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};
class MixDifferenceOperation : public MixBaseOperation {
public:
MixDifferenceOperation();
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};
class MixDivideOperation : public MixBaseOperation {
public:
MixDivideOperation();
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};
class MixDodgeOperation : public MixBaseOperation {
public:
MixDodgeOperation();
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};
class MixGlareOperation : public MixBaseOperation {
public:
MixGlareOperation();
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};
class MixHueOperation : public MixBaseOperation {
public:
MixHueOperation();
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};
class MixLightenOperation : public MixBaseOperation {
public:
MixLightenOperation();
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};
class MixLinearLightOperation : public MixBaseOperation {
public:
MixLinearLightOperation();
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};
class MixMultiplyOperation : public MixBaseOperation {
public:
MixMultiplyOperation();
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};
class MixOverlayOperation : public MixBaseOperation {
public:
MixOverlayOperation();
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};
class MixSaturationOperation : public MixBaseOperation {
public:
MixSaturationOperation();
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};
class MixScreenOperation : public MixBaseOperation {
public:
MixScreenOperation();
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};
class MixSoftLightOperation : public MixBaseOperation {
public:
MixSoftLightOperation();
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};
class MixSubtractOperation : public MixBaseOperation {
public:
MixSubtractOperation();
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};
class MixValueOperation : public MixBaseOperation {
public:
MixValueOperation();
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};
diff --git a/source/blender/compositor/operations/COM_MovieClipAttributeOperation.h b/source/blender/compositor/operations/COM_MovieClipAttributeOperation.h
index 50ed6cdb69e..6a6920247e6 100644
--- a/source/blender/compositor/operations/COM_MovieClipAttributeOperation.h
+++ b/source/blender/compositor/operations/COM_MovieClipAttributeOperation.h
@@ -45,13 +45,14 @@ class MovieClipAttributeOperation : public NodeOperation {
*/
MovieClipAttributeOperation();
- void initExecution();
+ void initExecution() override;
/**
* The inner loop of this operation.
*/
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
- void determineResolution(unsigned int resolution[2], unsigned int preferredResolution[2]);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
+ void determineResolution(unsigned int resolution[2],
+ unsigned int preferredResolution[2]) override;
void setMovieClip(MovieClip *clip)
{
diff --git a/source/blender/compositor/operations/COM_MovieClipOperation.h b/source/blender/compositor/operations/COM_MovieClipOperation.h
index 8897f85f77c..78cd1cc0c90 100644
--- a/source/blender/compositor/operations/COM_MovieClipOperation.h
+++ b/source/blender/compositor/operations/COM_MovieClipOperation.h
@@ -39,13 +39,14 @@ class MovieClipBaseOperation : public NodeOperation {
/**
* Determine the output resolution. The resolution is retrieved from the Renderer
*/
- void determineResolution(unsigned int resolution[2], unsigned int preferredResolution[2]);
+ void determineResolution(unsigned int resolution[2],
+ unsigned int preferredResolution[2]) override;
public:
MovieClipBaseOperation();
- void initExecution();
- void deinitExecution();
+ void initExecution() override;
+ void deinitExecution() override;
void setMovieClip(MovieClip *image)
{
this->m_movieClip = image;
@@ -63,7 +64,7 @@ class MovieClipBaseOperation : public NodeOperation {
{
this->m_framenumber = framenumber;
}
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};
class MovieClipOperation : public MovieClipBaseOperation {
@@ -74,5 +75,5 @@ class MovieClipOperation : public MovieClipBaseOperation {
class MovieClipAlphaOperation : public MovieClipBaseOperation {
public:
MovieClipAlphaOperation();
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};
diff --git a/source/blender/compositor/operations/COM_MovieDistortionOperation.h b/source/blender/compositor/operations/COM_MovieDistortionOperation.h
index f11ce485f97..ef9d6be697b 100644
--- a/source/blender/compositor/operations/COM_MovieDistortionOperation.h
+++ b/source/blender/compositor/operations/COM_MovieDistortionOperation.h
@@ -40,10 +40,10 @@ class MovieDistortionOperation : public NodeOperation {
public:
MovieDistortionOperation(bool distortion);
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
- void initExecution();
- void deinitExecution();
+ void initExecution() override;
+ void deinitExecution() override;
void setMovieClip(MovieClip *clip)
{
@@ -55,5 +55,5 @@ class MovieDistortionOperation : public NodeOperation {
}
bool determineDependingAreaOfInterest(rcti *input,
ReadBufferOperation *readOperation,
- rcti *output);
+ rcti *output) override;
};
diff --git a/source/blender/compositor/operations/COM_NormalizeOperation.h b/source/blender/compositor/operations/COM_NormalizeOperation.h
index 8090cf4973b..6447aa930f1 100644
--- a/source/blender/compositor/operations/COM_NormalizeOperation.h
+++ b/source/blender/compositor/operations/COM_NormalizeOperation.h
@@ -44,22 +44,22 @@ class NormalizeOperation : public NodeOperation {
/**
* The inner loop of this operation.
*/
- void executePixel(float output[4], int x, int y, void *data);
+ void executePixel(float output[4], int x, int y, void *data) override;
/**
* Initialize the execution
*/
- void initExecution();
+ void initExecution() override;
- void *initializeTileData(rcti *rect);
- void deinitializeTileData(rcti *rect, void *data);
+ void *initializeTileData(rcti *rect) override;
+ void deinitializeTileData(rcti *rect, void *data) override;
/**
* Deinitialize the execution
*/
- void deinitExecution();
+ void deinitExecution() override;
bool determineDependingAreaOfInterest(rcti *input,
ReadBufferOperation *readOperation,
- rcti *output);
+ rcti *output) override;
};
diff --git a/source/blender/compositor/operations/COM_OutputFileMultiViewOperation.h b/source/blender/compositor/operations/COM_OutputFileMultiViewOperation.h
index 258ac1f9e98..90c683a57b5 100644
--- a/source/blender/compositor/operations/COM_OutputFileMultiViewOperation.h
+++ b/source/blender/compositor/operations/COM_OutputFileMultiViewOperation.h
@@ -42,7 +42,7 @@ class OutputOpenExrSingleLayerMultiViewOperation : public OutputSingleLayerOpera
const bool saveAsRender);
void *get_handle(const char *filename);
- void deinitExecution();
+ void deinitExecution() override;
};
/* Writes inputs into OpenEXR multilayer channels. */
@@ -58,7 +58,7 @@ class OutputOpenExrMultiLayerMultiViewOperation : public OutputOpenExrMultiLayer
const char *viewName);
void *get_handle(const char *filename);
- void deinitExecution();
+ void deinitExecution() override;
};
class OutputStereoOperation : public OutputSingleLayerOperation {
@@ -78,5 +78,5 @@ class OutputStereoOperation : public OutputSingleLayerOperation {
const char *viewName,
const bool saveAsRender);
void *get_handle(const char *filename);
- void deinitExecution();
+ void deinitExecution() override;
};
diff --git a/source/blender/compositor/operations/COM_OutputFileOperation.h b/source/blender/compositor/operations/COM_OutputFileOperation.h
index ecc52355824..aa7ba35ddee 100644
--- a/source/blender/compositor/operations/COM_OutputFileOperation.h
+++ b/source/blender/compositor/operations/COM_OutputFileOperation.h
@@ -57,19 +57,19 @@ class OutputSingleLayerOperation : public NodeOperation {
const char *viewName,
const bool saveAsRender);
- void executeRegion(rcti *rect, unsigned int tileNumber);
- bool isOutputOperation(bool /*rendering*/) const
+ void executeRegion(rcti *rect, unsigned int tileNumber) override;
+ bool isOutputOperation(bool /*rendering*/) const override
{
return true;
}
- void initExecution();
- void deinitExecution();
- CompositorPriority getRenderPriority() const
+ void initExecution() override;
+ void deinitExecution() override;
+ CompositorPriority getRenderPriority() const override
{
return CompositorPriority::Low;
}
- bool isFileOutputOperation() const
+ bool isFileOutputOperation() const override
{
return true;
}
@@ -116,19 +116,19 @@ class OutputOpenExrMultiLayerOperation : public NodeOperation {
void add_layer(const char *name, DataType datatype, bool use_layer);
- void executeRegion(rcti *rect, unsigned int tileNumber);
- bool isOutputOperation(bool /*rendering*/) const
+ void executeRegion(rcti *rect, unsigned int tileNumber) override;
+ bool isOutputOperation(bool /*rendering*/) const override
{
return true;
}
- void initExecution();
- void deinitExecution();
- CompositorPriority getRenderPriority() const
+ void initExecution() override;
+ void deinitExecution() override;
+ CompositorPriority getRenderPriority() const override
{
return CompositorPriority::Low;
}
- bool isFileOutputOperation() const
+ bool isFileOutputOperation() const override
{
return true;
}
diff --git a/source/blender/compositor/operations/COM_PixelateOperation.h b/source/blender/compositor/operations/COM_PixelateOperation.h
index c7595756d39..aae54965aa4 100644
--- a/source/blender/compositor/operations/COM_PixelateOperation.h
+++ b/source/blender/compositor/operations/COM_PixelateOperation.h
@@ -44,12 +44,12 @@ class PixelateOperation : public NodeOperation {
/**
* \brief initialization of the execution
*/
- void initExecution();
+ void initExecution() override;
/**
* \brief de-initialization of the execution
*/
- void deinitExecution();
+ void deinitExecution() override;
/**
* \brief executePixel
@@ -58,5 +58,5 @@ class PixelateOperation : public NodeOperation {
* \param y: y-coordinate
* \param sampler: sampler
*/
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};
diff --git a/source/blender/compositor/operations/COM_PlaneCornerPinOperation.h b/source/blender/compositor/operations/COM_PlaneCornerPinOperation.h
index 1e892465db8..6edecff0d54 100644
--- a/source/blender/compositor/operations/COM_PlaneCornerPinOperation.h
+++ b/source/blender/compositor/operations/COM_PlaneCornerPinOperation.h
@@ -34,12 +34,13 @@ class PlaneCornerPinMaskOperation : public PlaneDistortMaskOperation {
public:
PlaneCornerPinMaskOperation();
- void initExecution();
- void deinitExecution();
+ void initExecution() override;
+ void deinitExecution() override;
- void *initializeTileData(rcti *rect);
+ void *initializeTileData(rcti *rect) override;
- void determineResolution(unsigned int resolution[2], unsigned int preferredResolution[2]);
+ void determineResolution(unsigned int resolution[2],
+ unsigned int preferredResolution[2]) override;
};
class PlaneCornerPinWarpImageOperation : public PlaneDistortWarpImageOperation {
@@ -49,12 +50,12 @@ class PlaneCornerPinWarpImageOperation : public PlaneDistortWarpImageOperation {
public:
PlaneCornerPinWarpImageOperation();
- void initExecution();
- void deinitExecution();
+ void initExecution() override;
+ void deinitExecution() override;
- void *initializeTileData(rcti *rect);
+ void *initializeTileData(rcti *rect) override;
bool determineDependingAreaOfInterest(rcti *input,
ReadBufferOperation *readOperation,
- rcti *output);
+ rcti *output) override;
};
diff --git a/source/blender/compositor/operations/COM_PlaneDistortCommonOperation.h b/source/blender/compositor/operations/COM_PlaneDistortCommonOperation.h
index 6cc9456c13f..c17f99a6710 100644
--- a/source/blender/compositor/operations/COM_PlaneDistortCommonOperation.h
+++ b/source/blender/compositor/operations/COM_PlaneDistortCommonOperation.h
@@ -46,14 +46,14 @@ class PlaneDistortWarpImageOperation : public NodeOperation {
void calculateCorners(const float corners[4][2], bool normalized, int sample);
- void initExecution();
- void deinitExecution();
+ void initExecution() override;
+ void deinitExecution() override;
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
bool determineDependingAreaOfInterest(rcti *input,
ReadBufferOperation *readOperation,
- rcti *output);
+ rcti *output) override;
void setMotionBlurSamples(int samples)
{
@@ -82,9 +82,9 @@ class PlaneDistortMaskOperation : public NodeOperation {
void calculateCorners(const float corners[4][2], bool normalized, int sample);
- void initExecution();
+ void initExecution() override;
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
void setMotionBlurSamples(int samples)
{
diff --git a/source/blender/compositor/operations/COM_PlaneTrackOperation.h b/source/blender/compositor/operations/COM_PlaneTrackOperation.h
index fc325c7db7d..6cfb3accaa3 100644
--- a/source/blender/compositor/operations/COM_PlaneTrackOperation.h
+++ b/source/blender/compositor/operations/COM_PlaneTrackOperation.h
@@ -68,9 +68,10 @@ class PlaneTrackMaskOperation : public PlaneDistortMaskOperation, public PlaneTr
{
}
- void initExecution();
+ void initExecution() override;
- void determineResolution(unsigned int resolution[2], unsigned int preferredResolution[2])
+ void determineResolution(unsigned int resolution[2],
+ unsigned int preferredResolution[2]) override
{
PlaneTrackCommon::determineResolution(resolution, preferredResolution);
@@ -86,9 +87,10 @@ class PlaneTrackWarpImageOperation : public PlaneDistortWarpImageOperation,
{
}
- void initExecution();
+ void initExecution() override;
- void determineResolution(unsigned int resolution[2], unsigned int preferredResolution[2])
+ void determineResolution(unsigned int resolution[2],
+ unsigned int preferredResolution[2]) override
{
PlaneTrackCommon::determineResolution(resolution, preferredResolution);
unsigned int temp[2];
diff --git a/source/blender/compositor/operations/COM_PreviewOperation.h b/source/blender/compositor/operations/COM_PreviewOperation.h
index 03ae6a6c42e..36ae5f59bb9 100644
--- a/source/blender/compositor/operations/COM_PreviewOperation.h
+++ b/source/blender/compositor/operations/COM_PreviewOperation.h
@@ -47,20 +47,21 @@ class PreviewOperation : public NodeOperation {
unsigned int defaultHeight);
void verifyPreview(bNodeInstanceHash *previews, bNodeInstanceKey key);
- bool isOutputOperation(bool /*rendering*/) const
+ bool isOutputOperation(bool /*rendering*/) const override
{
return !G.background;
}
- void initExecution();
- void deinitExecution();
- CompositorPriority getRenderPriority() const;
+ void initExecution() override;
+ void deinitExecution() override;
+ CompositorPriority getRenderPriority() const override;
- void executeRegion(rcti *rect, unsigned int tileNumber);
- void determineResolution(unsigned int resolution[2], unsigned int preferredResolution[2]);
+ void executeRegion(rcti *rect, unsigned int tileNumber) override;
+ void determineResolution(unsigned int resolution[2],
+ unsigned int preferredResolution[2]) override;
bool determineDependingAreaOfInterest(rcti *input,
ReadBufferOperation *readOperation,
- rcti *output);
- bool isPreviewOperation() const
+ rcti *output) override;
+ bool isPreviewOperation() const override
{
return true;
}
diff --git a/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.h b/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.h
index 96bede20623..b47d4f37589 100644
--- a/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.h
+++ b/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.h
@@ -39,22 +39,22 @@ class ProjectorLensDistortionOperation : public NodeOperation {
/**
* The inner loop of this operation.
*/
- void executePixel(float output[4], int x, int y, void *data);
+ void executePixel(float output[4], int x, int y, void *data) override;
/**
* Initialize the execution
*/
- void initExecution();
+ void initExecution() override;
- void *initializeTileData(rcti *rect);
+ void *initializeTileData(rcti *rect) override;
/**
* Deinitialize the execution
*/
- void deinitExecution();
+ void deinitExecution() override;
bool determineDependingAreaOfInterest(rcti *input,
ReadBufferOperation *readOperation,
- rcti *output);
+ rcti *output) override;
void updateDispersion();
};
diff --git a/source/blender/compositor/operations/COM_ReadBufferOperation.h b/source/blender/compositor/operations/COM_ReadBufferOperation.h
index 2ada33906ef..21ef716b727 100644
--- a/source/blender/compositor/operations/COM_ReadBufferOperation.h
+++ b/source/blender/compositor/operations/COM_ReadBufferOperation.h
@@ -39,18 +39,19 @@ class ReadBufferOperation : public NodeOperation {
{
return this->m_memoryProxy;
}
- void determineResolution(unsigned int resolution[2], unsigned int preferredResolution[2]);
+ void determineResolution(unsigned int resolution[2],
+ unsigned int preferredResolution[2]) override;
- void *initializeTileData(rcti *rect);
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void *initializeTileData(rcti *rect) override;
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
void executePixelExtend(float output[4],
float x,
float y,
PixelSampler sampler,
MemoryBufferExtend extend_x,
MemoryBufferExtend extend_y);
- void executePixelFiltered(float output[4], float x, float y, float dx[2], float dy[2]);
- bool isReadBufferOperation() const
+ void executePixelFiltered(float output[4], float x, float y, float dx[2], float dy[2]) override;
+ bool isReadBufferOperation() const override
{
return true;
}
@@ -64,8 +65,8 @@ class ReadBufferOperation : public NodeOperation {
}
bool determineDependingAreaOfInterest(rcti *input,
ReadBufferOperation *readOperation,
- rcti *output);
- MemoryBuffer *getInputMemoryBuffer(MemoryBuffer **memoryBuffers)
+ rcti *output) override;
+ MemoryBuffer *getInputMemoryBuffer(MemoryBuffer **memoryBuffers) override
{
return memoryBuffers[this->m_offset];
}
diff --git a/source/blender/compositor/operations/COM_RenderLayersProg.h b/source/blender/compositor/operations/COM_RenderLayersProg.h
index a0d5bc2953b..f3e1c892a83 100644
--- a/source/blender/compositor/operations/COM_RenderLayersProg.h
+++ b/source/blender/compositor/operations/COM_RenderLayersProg.h
@@ -132,7 +132,7 @@ class RenderLayersAOOperation : public RenderLayersProg {
: RenderLayersProg(passName, type, elementsize)
{
}
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};
class RenderLayersAlphaProg : public RenderLayersProg {
@@ -141,7 +141,7 @@ class RenderLayersAlphaProg : public RenderLayersProg {
: RenderLayersProg(passName, type, elementsize)
{
}
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};
class RenderLayersDepthProg : public RenderLayersProg {
@@ -150,5 +150,5 @@ class RenderLayersDepthProg : public RenderLayersProg {
: RenderLayersProg(passName, type, elementsize)
{
}
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};
diff --git a/source/blender/compositor/operations/COM_RotateOperation.h b/source/blender/compositor/operations/COM_RotateOperation.h
index 0ef4466671a..9b9d5987a8e 100644
--- a/source/blender/compositor/operations/COM_RotateOperation.h
+++ b/source/blender/compositor/operations/COM_RotateOperation.h
@@ -35,10 +35,10 @@ class RotateOperation : public NodeOperation {
RotateOperation();
bool determineDependingAreaOfInterest(rcti *input,
ReadBufferOperation *readOperation,
- rcti *output);
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
- void initExecution();
- void deinitExecution();
+ rcti *output) override;
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
+ void initExecution() override;
+ void deinitExecution() override;
void setDoDegree2RadConversion(bool abool)
{
this->m_doDegree2RadConversion = abool;
diff --git a/source/blender/compositor/operations/COM_ScaleOperation.h b/source/blender/compositor/operations/COM_ScaleOperation.h
index f28b8237485..780107910f9 100644
--- a/source/blender/compositor/operations/COM_ScaleOperation.h
+++ b/source/blender/compositor/operations/COM_ScaleOperation.h
@@ -55,11 +55,11 @@ class ScaleOperation : public BaseScaleOperation {
ScaleOperation();
bool determineDependingAreaOfInterest(rcti *input,
ReadBufferOperation *readOperation,
- rcti *output);
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ rcti *output) override;
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
- void initExecution();
- void deinitExecution();
+ void initExecution() override;
+ void deinitExecution() override;
};
class ScaleAbsoluteOperation : public BaseScaleOperation {
@@ -73,11 +73,11 @@ class ScaleAbsoluteOperation : public BaseScaleOperation {
ScaleAbsoluteOperation();
bool determineDependingAreaOfInterest(rcti *input,
ReadBufferOperation *readOperation,
- rcti *output);
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ rcti *output) override;
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
- void initExecution();
- void deinitExecution();
+ void initExecution() override;
+ void deinitExecution() override;
};
class ScaleFixedSizeOperation : public BaseScaleOperation {
@@ -100,12 +100,13 @@ class ScaleFixedSizeOperation : public BaseScaleOperation {
ScaleFixedSizeOperation();
bool determineDependingAreaOfInterest(rcti *input,
ReadBufferOperation *readOperation,
- rcti *output);
- void determineResolution(unsigned int resolution[2], unsigned int preferredResolution[2]);
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ rcti *output) override;
+ void determineResolution(unsigned int resolution[2],
+ unsigned int preferredResolution[2]) override;
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
- void initExecution();
- void deinitExecution();
+ void initExecution() override;
+ void deinitExecution() override;
void setNewWidth(int width)
{
this->m_newWidth = width;
diff --git a/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.h b/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.h
index 35d2bccce68..793fc95dc3d 100644
--- a/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.h
+++ b/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.h
@@ -49,18 +49,18 @@ class ScreenLensDistortionOperation : public NodeOperation {
/**
* The inner loop of this operation.
*/
- void executePixel(float output[4], int x, int y, void *data);
+ void executePixel(float output[4], int x, int y, void *data) override;
/**
* Initialize the execution
*/
- void initExecution();
+ void initExecution() override;
- void *initializeTileData(rcti *rect);
+ void *initializeTileData(rcti *rect) override;
/**
* Deinitialize the execution
*/
- void deinitExecution();
+ void deinitExecution() override;
void setFit(bool fit)
{
@@ -78,7 +78,7 @@ class ScreenLensDistortionOperation : public NodeOperation {
bool determineDependingAreaOfInterest(rcti *input,
ReadBufferOperation *readOperation,
- rcti *output);
+ rcti *output) override;
private:
void determineUV(float result[6], float x, float y) const;
diff --git a/source/blender/compositor/operations/COM_SetAlphaMultiplyOperation.h b/source/blender/compositor/operations/COM_SetAlphaMultiplyOperation.h
index db58b18688a..094da1fd493 100644
--- a/source/blender/compositor/operations/COM_SetAlphaMultiplyOperation.h
+++ b/source/blender/compositor/operations/COM_SetAlphaMultiplyOperation.h
@@ -33,8 +33,8 @@ class SetAlphaMultiplyOperation : public NodeOperation {
public:
SetAlphaMultiplyOperation();
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
- void initExecution();
- void deinitExecution();
+ void initExecution() override;
+ void deinitExecution() override;
};
diff --git a/source/blender/compositor/operations/COM_SetAlphaReplaceOperation.h b/source/blender/compositor/operations/COM_SetAlphaReplaceOperation.h
index b4cab82855b..313d5f581eb 100644
--- a/source/blender/compositor/operations/COM_SetAlphaReplaceOperation.h
+++ b/source/blender/compositor/operations/COM_SetAlphaReplaceOperation.h
@@ -38,8 +38,8 @@ class SetAlphaReplaceOperation : public NodeOperation {
/**
* the inner loop of this program
*/
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
- void initExecution();
- void deinitExecution();
+ void initExecution() override;
+ void deinitExecution() override;
};
diff --git a/source/blender/compositor/operations/COM_SetColorOperation.h b/source/blender/compositor/operations/COM_SetColorOperation.h
index c61a4e10ac0..147e76c433f 100644
--- a/source/blender/compositor/operations/COM_SetColorOperation.h
+++ b/source/blender/compositor/operations/COM_SetColorOperation.h
@@ -74,10 +74,11 @@ class SetColorOperation : public NodeOperation {
/**
* The inner loop of this operation.
*/
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
- void determineResolution(unsigned int resolution[2], unsigned int preferredResolution[2]);
- bool isSetOperation() const
+ void determineResolution(unsigned int resolution[2],
+ unsigned int preferredResolution[2]) override;
+ bool isSetOperation() const override
{
return true;
}
diff --git a/source/blender/compositor/operations/COM_SetSamplerOperation.h b/source/blender/compositor/operations/COM_SetSamplerOperation.h
index 5c1ed9b12d6..4a0bd4563bb 100644
--- a/source/blender/compositor/operations/COM_SetSamplerOperation.h
+++ b/source/blender/compositor/operations/COM_SetSamplerOperation.h
@@ -43,7 +43,7 @@ class SetSamplerOperation : public NodeOperation {
/**
* The inner loop of this operation.
*/
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
- void initExecution();
- void deinitExecution();
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
+ void initExecution() override;
+ void deinitExecution() override;
};
diff --git a/source/blender/compositor/operations/COM_SetValueOperation.h b/source/blender/compositor/operations/COM_SetValueOperation.h
index 72cd70ec1f6..b3edb215010 100644
--- a/source/blender/compositor/operations/COM_SetValueOperation.h
+++ b/source/blender/compositor/operations/COM_SetValueOperation.h
@@ -46,10 +46,11 @@ class SetValueOperation : public NodeOperation {
/**
* The inner loop of this operation.
*/
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
- void determineResolution(unsigned int resolution[2], unsigned int preferredResolution[2]);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
+ void determineResolution(unsigned int resolution[2],
+ unsigned int preferredResolution[2]) override;
- bool isSetOperation() const
+ bool isSetOperation() const override
{
return true;
}
diff --git a/source/blender/compositor/operations/COM_SetVectorOperation.h b/source/blender/compositor/operations/COM_SetVectorOperation.h
index 4bdd03809de..a48584d7ded 100644
--- a/source/blender/compositor/operations/COM_SetVectorOperation.h
+++ b/source/blender/compositor/operations/COM_SetVectorOperation.h
@@ -73,10 +73,11 @@ class SetVectorOperation : public NodeOperation {
/**
* The inner loop of this operation.
*/
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
- void determineResolution(unsigned int resolution[2], unsigned int preferredResolution[2]);
- bool isSetOperation() const
+ void determineResolution(unsigned int resolution[2],
+ unsigned int preferredResolution[2]) override;
+ bool isSetOperation() const override
{
return true;
}
diff --git a/source/blender/compositor/operations/COM_SplitOperation.h b/source/blender/compositor/operations/COM_SplitOperation.h
index 62d41a615ff..ace5fd62eb2 100644
--- a/source/blender/compositor/operations/COM_SplitOperation.h
+++ b/source/blender/compositor/operations/COM_SplitOperation.h
@@ -30,10 +30,11 @@ class SplitOperation : public NodeOperation {
public:
SplitOperation();
- void initExecution();
- void deinitExecution();
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
- void determineResolution(unsigned int resolution[2], unsigned int preferredResolution[2]);
+ void initExecution() override;
+ void deinitExecution() override;
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
+ void determineResolution(unsigned int resolution[2],
+ unsigned int preferredResolution[2]) override;
void setSplitPercentage(float splitPercentage)
{
this->m_splitPercentage = splitPercentage;
diff --git a/source/blender/compositor/operations/COM_SunBeamsOperation.h b/source/blender/compositor/operations/COM_SunBeamsOperation.h
index 09bdb018cc3..7cf5cf9971e 100644
--- a/source/blender/compositor/operations/COM_SunBeamsOperation.h
+++ b/source/blender/compositor/operations/COM_SunBeamsOperation.h
@@ -23,15 +23,15 @@ class SunBeamsOperation : public NodeOperation {
public:
SunBeamsOperation();
- void executePixel(float output[4], int x, int y, void *data);
+ void executePixel(float output[4], int x, int y, void *data) override;
- void initExecution();
+ void initExecution() override;
- void *initializeTileData(rcti *rect);
+ void *initializeTileData(rcti *rect) override;
bool determineDependingAreaOfInterest(rcti *input,
ReadBufferOperation *readOperation,
- rcti *output);
+ rcti *output) override;
void setData(const NodeSunBeams &data)
{
diff --git a/source/blender/compositor/operations/COM_TextureOperation.h b/source/blender/compositor/operations/COM_TextureOperation.h
index a40dafd14cf..1a6e005f752 100644
--- a/source/blender/compositor/operations/COM_TextureOperation.h
+++ b/source/blender/compositor/operations/COM_TextureOperation.h
@@ -44,7 +44,8 @@ class TextureBaseOperation : public NodeOperation {
/**
* Determine the output resolution. The resolution is retrieved from the Renderer
*/
- void determineResolution(unsigned int resolution[2], unsigned int preferredResolution[2]);
+ void determineResolution(unsigned int resolution[2],
+ unsigned int preferredResolution[2]) override;
/**
* Constructor
@@ -52,14 +53,14 @@ class TextureBaseOperation : public NodeOperation {
TextureBaseOperation();
public:
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
void setTexture(Tex *texture)
{
this->m_texture = texture;
}
- void initExecution();
- void deinitExecution();
+ void initExecution() override;
+ void deinitExecution() override;
void setRenderData(const RenderData *rd)
{
this->m_rd = rd;
@@ -77,5 +78,5 @@ class TextureOperation : public TextureBaseOperation {
class TextureAlphaOperation : public TextureBaseOperation {
public:
TextureAlphaOperation();
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};
diff --git a/source/blender/compositor/operations/COM_TonemapOperation.h b/source/blender/compositor/operations/COM_TonemapOperation.h
index cb8816b93b3..e7da983fe61 100644
--- a/source/blender/compositor/operations/COM_TonemapOperation.h
+++ b/source/blender/compositor/operations/COM_TonemapOperation.h
@@ -60,20 +60,20 @@ class TonemapOperation : public NodeOperation {
/**
* The inner loop of this operation.
*/
- void executePixel(float output[4], int x, int y, void *data);
+ void executePixel(float output[4], int x, int y, void *data) override;
/**
* Initialize the execution
*/
- void initExecution();
+ void initExecution() override;
- void *initializeTileData(rcti *rect);
- void deinitializeTileData(rcti *rect, void *data);
+ void *initializeTileData(rcti *rect) override;
+ void deinitializeTileData(rcti *rect, void *data) override;
/**
* Deinitialize the execution
*/
- void deinitExecution();
+ void deinitExecution() override;
void setData(NodeTonemap *data)
{
@@ -82,7 +82,7 @@ class TonemapOperation : public NodeOperation {
bool determineDependingAreaOfInterest(rcti *input,
ReadBufferOperation *readOperation,
- rcti *output);
+ rcti *output) override;
};
/**
@@ -96,5 +96,5 @@ class PhotoreceptorTonemapOperation : public TonemapOperation {
/**
* The inner loop of this operation.
*/
- void executePixel(float output[4], int x, int y, void *data);
+ void executePixel(float output[4], int x, int y, void *data) override;
};
diff --git a/source/blender/compositor/operations/COM_TrackPositionOperation.h b/source/blender/compositor/operations/COM_TrackPositionOperation.h
index 7d831ec5d8d..2e2c1f36c52 100644
--- a/source/blender/compositor/operations/COM_TrackPositionOperation.h
+++ b/source/blender/compositor/operations/COM_TrackPositionOperation.h
@@ -49,7 +49,8 @@ class TrackPositionOperation : public NodeOperation {
/**
* Determine the output resolution. The resolution is retrieved from the Renderer
*/
- void determineResolution(unsigned int resolution[2], unsigned int preferredResolution[2]);
+ void determineResolution(unsigned int resolution[2],
+ unsigned int preferredResolution[2]) override;
public:
TrackPositionOperation();
@@ -87,11 +88,11 @@ class TrackPositionOperation : public NodeOperation {
this->m_speed_output = speed_output;
}
- void initExecution();
+ void initExecution() override;
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
- bool isSetOperation() const
+ bool isSetOperation() const override
{
return true;
}
diff --git a/source/blender/compositor/operations/COM_TranslateOperation.h b/source/blender/compositor/operations/COM_TranslateOperation.h
index 99cfb528858..d55cc9096c0 100644
--- a/source/blender/compositor/operations/COM_TranslateOperation.h
+++ b/source/blender/compositor/operations/COM_TranslateOperation.h
@@ -35,11 +35,11 @@ class TranslateOperation : public NodeOperation {
TranslateOperation();
bool determineDependingAreaOfInterest(rcti *input,
ReadBufferOperation *readOperation,
- rcti *output);
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ rcti *output) override;
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
- void initExecution();
- void deinitExecution();
+ void initExecution() override;
+ void deinitExecution() override;
float getDeltaX()
{
diff --git a/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.h b/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.h
index fe927f791fa..5b859e5a2fd 100644
--- a/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.h
+++ b/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.h
@@ -41,25 +41,25 @@ class VariableSizeBokehBlurOperation : public NodeOperation, public QualityStepH
/**
* The inner loop of this operation.
*/
- void executePixel(float output[4], int x, int y, void *data);
+ void executePixel(float output[4], int x, int y, void *data) override;
/**
* Initialize the execution
*/
- void initExecution();
+ void initExecution() override;
- void *initializeTileData(rcti *rect);
+ void *initializeTileData(rcti *rect) override;
- void deinitializeTileData(rcti *rect, void *data);
+ void deinitializeTileData(rcti *rect, void *data) override;
/**
* Deinitialize the execution
*/
- void deinitExecution();
+ void deinitExecution() override;
bool determineDependingAreaOfInterest(rcti *input,
ReadBufferOperation *readOperation,
- rcti *output);
+ rcti *output) override;
void setMaxBlur(int maxRadius)
{
@@ -81,7 +81,7 @@ class VariableSizeBokehBlurOperation : public NodeOperation, public QualityStepH
cl_mem clOutputBuffer,
MemoryBuffer **inputMemoryBuffers,
std::list<cl_mem> *clMemToCleanUp,
- std::list<cl_kernel> *clKernelsToCleanUp);
+ std::list<cl_kernel> *clKernelsToCleanUp) override;
};
#ifdef COM_DEFOCUS_SEARCH
@@ -103,19 +103,20 @@ class InverseSearchRadiusOperation : public NodeOperation {
/**
* Initialize the execution
*/
- void initExecution();
- void *initializeTileData(rcti *rect);
- void deinitializeTileData(rcti *rect, void *data);
+ void initExecution() override;
+ void *initializeTileData(rcti *rect) override;
+ void deinitializeTileData(rcti *rect, void *data) override;
/**
* Deinitialize the execution
*/
- void deinitExecution();
+ void deinitExecution() override;
bool determineDependingAreaOfInterest(rcti *input,
ReadBufferOperation *readOperation,
- rcti *output);
- void determineResolution(unsigned int resolution[2], unsigned int preferredResolution[2]);
+ rcti *output) override;
+ void determineResolution(unsigned int resolution[2],
+ unsigned int preferredResolution[2]) override;
void setMaxBlur(int maxRadius)
{
diff --git a/source/blender/compositor/operations/COM_VectorBlurOperation.h b/source/blender/compositor/operations/COM_VectorBlurOperation.h
index 222e8b26968..10affb48f20 100644
--- a/source/blender/compositor/operations/COM_VectorBlurOperation.h
+++ b/source/blender/compositor/operations/COM_VectorBlurOperation.h
@@ -44,19 +44,19 @@ class VectorBlurOperation : public NodeOperation, public QualityStepHelper {
/**
* The inner loop of this operation.
*/
- void executePixel(float output[4], int x, int y, void *data);
+ void executePixel(float output[4], int x, int y, void *data) override;
/**
* Initialize the execution
*/
- void initExecution();
+ void initExecution() override;
/**
* Deinitialize the execution
*/
- void deinitExecution();
+ void deinitExecution() override;
- void *initializeTileData(rcti *rect);
+ void *initializeTileData(rcti *rect) override;
void setVectorBlurSettings(NodeBlurData *settings)
{
@@ -64,7 +64,7 @@ class VectorBlurOperation : public NodeOperation, public QualityStepHelper {
}
bool determineDependingAreaOfInterest(rcti *input,
ReadBufferOperation *readOperation,
- rcti *output);
+ rcti *output) override;
protected:
void generateVectorBlur(float *data,
diff --git a/source/blender/compositor/operations/COM_VectorCurveOperation.h b/source/blender/compositor/operations/COM_VectorCurveOperation.h
index cf0d22eca1a..0c164a1f3c8 100644
--- a/source/blender/compositor/operations/COM_VectorCurveOperation.h
+++ b/source/blender/compositor/operations/COM_VectorCurveOperation.h
@@ -34,15 +34,15 @@ class VectorCurveOperation : public CurveBaseOperation {
/**
* The inner loop of this operation.
*/
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
/**
* Initialize the execution
*/
- void initExecution();
+ void initExecution() override;
/**
* Deinitialize the execution
*/
- void deinitExecution();
+ void deinitExecution() override;
};
diff --git a/source/blender/compositor/operations/COM_ViewerOperation.h b/source/blender/compositor/operations/COM_ViewerOperation.h
index 513c6eae487..a3df19d5e90 100644
--- a/source/blender/compositor/operations/COM_ViewerOperation.h
+++ b/source/blender/compositor/operations/COM_ViewerOperation.h
@@ -48,11 +48,12 @@ class ViewerOperation : public NodeOperation {
public:
ViewerOperation();
- void initExecution();
- void deinitExecution();
- void executeRegion(rcti *rect, unsigned int tileNumber);
- void determineResolution(unsigned int resolution[2], unsigned int preferredResolution[2]);
- bool isOutputOperation(bool /*rendering*/) const
+ void initExecution() override;
+ void deinitExecution() override;
+ void executeRegion(rcti *rect, unsigned int tileNumber) override;
+ void determineResolution(unsigned int resolution[2],
+ unsigned int preferredResolution[2]) override;
+ bool isOutputOperation(bool /*rendering*/) const override
{
if (G.background) {
return false;
@@ -67,7 +68,7 @@ class ViewerOperation : public NodeOperation {
{
this->m_imageUser = imageUser;
}
- bool isActiveViewerOutput() const
+ bool isActiveViewerOutput() const override
{
return this->m_active;
}
@@ -99,8 +100,8 @@ class ViewerOperation : public NodeOperation {
{
return this->m_chunkOrder;
}
- CompositorPriority getRenderPriority() const;
- bool isViewerOperation() const
+ CompositorPriority getRenderPriority() const override;
+ bool isViewerOperation() const override
{
return true;
}
diff --git a/source/blender/compositor/operations/COM_WrapOperation.h b/source/blender/compositor/operations/COM_WrapOperation.h
index a72b90e7e94..21123ed490c 100644
--- a/source/blender/compositor/operations/COM_WrapOperation.h
+++ b/source/blender/compositor/operations/COM_WrapOperation.h
@@ -28,8 +28,8 @@ class WrapOperation : public ReadBufferOperation {
WrapOperation(DataType datatype);
bool determineDependingAreaOfInterest(rcti *input,
ReadBufferOperation *readOperation,
- rcti *output);
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ rcti *output) override;
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
void setWrapping(int wrapping_type);
float getWrappedOriginalXPos(float x);
diff --git a/source/blender/compositor/operations/COM_WriteBufferOperation.h b/source/blender/compositor/operations/COM_WriteBufferOperation.h
index a9f90830a92..00d48e38fca 100644
--- a/source/blender/compositor/operations/COM_WriteBufferOperation.h
+++ b/source/blender/compositor/operations/COM_WriteBufferOperation.h
@@ -37,8 +37,8 @@ class WriteBufferOperation : public NodeOperation {
{
return this->m_memoryProxy;
}
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
- bool isWriteBufferOperation() const
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
+ bool isWriteBufferOperation() const override
{
return true;
}
@@ -47,15 +47,16 @@ class WriteBufferOperation : public NodeOperation {
return m_single_value;
}
- void executeRegion(rcti *rect, unsigned int tileNumber);
- void initExecution();
- void deinitExecution();
+ void executeRegion(rcti *rect, unsigned int tileNumber) override;
+ void initExecution() override;
+ void deinitExecution() override;
void executeOpenCLRegion(OpenCLDevice *device,
rcti *rect,
unsigned int chunkNumber,
MemoryBuffer **memoryBuffers,
- MemoryBuffer *outputBuffer);
- void determineResolution(unsigned int resolution[2], unsigned int preferredResolution[2]);
+ MemoryBuffer *outputBuffer) override;
+ void determineResolution(unsigned int resolution[2],
+ unsigned int preferredResolution[2]) override;
void readResolutionFromInputSocket();
inline NodeOperation *getInput()
{
diff --git a/source/blender/compositor/operations/COM_ZCombineOperation.h b/source/blender/compositor/operations/COM_ZCombineOperation.h
index a64e3c5b70f..91044d44985 100644
--- a/source/blender/compositor/operations/COM_ZCombineOperation.h
+++ b/source/blender/compositor/operations/COM_ZCombineOperation.h
@@ -37,17 +37,17 @@ class ZCombineOperation : public NodeOperation {
*/
ZCombineOperation();
- void initExecution();
- void deinitExecution();
+ void initExecution() override;
+ void deinitExecution() override;
/**
* The inner loop of this operation.
*/
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};
class ZCombineAlphaOperation : public ZCombineOperation {
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};
class ZCombineMaskOperation : public NodeOperation {
@@ -59,10 +59,10 @@ class ZCombineMaskOperation : public NodeOperation {
public:
ZCombineMaskOperation();
- void initExecution();
- void deinitExecution();
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void initExecution() override;
+ void deinitExecution() override;
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};
class ZCombineMaskAlphaOperation : public ZCombineMaskOperation {
- void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
+ void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
};