[Bf-blender-cvs] [2ada351] master: Compositor: Code cleanup, prepare for strict C++ flags
Sergey Sharybin
noreply at git.blender.org
Fri Mar 27 14:23:57 CET 2015
Commit: 2ada3512a27eb66d05da669268dc3bb2cd0a1e16
Author: Sergey Sharybin
Date: Fri Mar 27 15:49:07 2015 +0500
Branches: master
https://developer.blender.org/rB2ada3512a27eb66d05da669268dc3bb2cd0a1e16
Compositor: Code cleanup, prepare for strict C++ flags
===================================================================
M source/blender/compositor/intern/COM_ExecutionGroup.cpp
M source/blender/compositor/intern/COM_NodeOperation.h
M source/blender/compositor/intern/COM_NodeOperationBuilder.cpp
M source/blender/compositor/intern/COM_SingleThreadedOperation.cpp
M source/blender/compositor/intern/COM_SocketReader.h
M source/blender/compositor/intern/COM_WorkScheduler.cpp
M source/blender/compositor/nodes/COM_AlphaOverNode.cpp
M source/blender/compositor/nodes/COM_BokehImageNode.cpp
M source/blender/compositor/nodes/COM_BrightnessNode.cpp
M source/blender/compositor/nodes/COM_ChannelMatteNode.cpp
M source/blender/compositor/nodes/COM_ChromaMatteNode.cpp
M source/blender/compositor/nodes/COM_ColorBalanceNode.cpp
M source/blender/compositor/nodes/COM_ColorCorrectionNode.cpp
M source/blender/compositor/nodes/COM_ColorCurveNode.cpp
M source/blender/compositor/nodes/COM_ColorMatteNode.cpp
M source/blender/compositor/nodes/COM_ColorNode.cpp
M source/blender/compositor/nodes/COM_ColorRampNode.cpp
M source/blender/compositor/nodes/COM_ColorSpillNode.cpp
M source/blender/compositor/nodes/COM_ColorToBWNode.cpp
M source/blender/compositor/nodes/COM_CombineColorNode.cpp
M source/blender/compositor/nodes/COM_ConvertAlphaNode.cpp
M source/blender/compositor/nodes/COM_CornerPinNode.cpp
M source/blender/compositor/nodes/COM_CropNode.cpp
M source/blender/compositor/nodes/COM_DespeckleNode.cpp
M source/blender/compositor/nodes/COM_DifferenceMatteNode.cpp
M source/blender/compositor/nodes/COM_DistanceMatteNode.cpp
M source/blender/compositor/nodes/COM_DoubleEdgeMaskNode.cpp
M source/blender/compositor/nodes/COM_FilterNode.cpp
M source/blender/compositor/nodes/COM_FlipNode.cpp
M source/blender/compositor/nodes/COM_GammaNode.cpp
M source/blender/compositor/nodes/COM_GlareNode.cpp
M source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.cpp
M source/blender/compositor/nodes/COM_HueSaturationValueNode.cpp
M source/blender/compositor/nodes/COM_InpaintNode.cpp
M source/blender/compositor/nodes/COM_InvertNode.cpp
M source/blender/compositor/nodes/COM_LensDistortionNode.cpp
M source/blender/compositor/nodes/COM_LuminanceMatteNode.cpp
M source/blender/compositor/nodes/COM_MapRangeNode.cpp
M source/blender/compositor/nodes/COM_MapUVNode.cpp
M source/blender/compositor/nodes/COM_MapValueNode.cpp
M source/blender/compositor/nodes/COM_MathNode.cpp
M source/blender/compositor/nodes/COM_MixNode.cpp
M source/blender/compositor/nodes/COM_NormalNode.cpp
M source/blender/compositor/nodes/COM_NormalizeNode.cpp
M source/blender/compositor/nodes/COM_PixelateNode.cpp
M source/blender/compositor/nodes/COM_RotateNode.cpp
M source/blender/compositor/nodes/COM_SeparateColorNode.cpp
M source/blender/compositor/nodes/COM_SetAlphaNode.cpp
M source/blender/compositor/nodes/COM_SocketProxyNode.cpp
M source/blender/compositor/nodes/COM_SunBeamsNode.cpp
M source/blender/compositor/nodes/COM_SwitchNode.cpp
M source/blender/compositor/nodes/COM_TonemapNode.cpp
M source/blender/compositor/nodes/COM_TransformNode.cpp
M source/blender/compositor/nodes/COM_ValueNode.cpp
M source/blender/compositor/nodes/COM_VectorCurveNode.cpp
M source/blender/compositor/nodes/COM_ViewLevelsNode.cpp
M source/blender/compositor/operations/COM_AntiAliasOperation.cpp
M source/blender/compositor/operations/COM_BlurBaseOperation.cpp
M source/blender/compositor/operations/COM_BlurBaseOperation.h
M source/blender/compositor/operations/COM_BokehBlurOperation.cpp
M source/blender/compositor/operations/COM_BokehImageOperation.cpp
M source/blender/compositor/operations/COM_CalculateMeanOperation.cpp
M source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.cpp
M source/blender/compositor/operations/COM_CompositorOperation.cpp
M source/blender/compositor/operations/COM_CompositorOperation.h
M source/blender/compositor/operations/COM_ConvolutionEdgeFilterOperation.cpp
M source/blender/compositor/operations/COM_ConvolutionFilterOperation.cpp
M source/blender/compositor/operations/COM_DespeckleOperation.cpp
M source/blender/compositor/operations/COM_DilateErodeOperation.cpp
M source/blender/compositor/operations/COM_DirectionalBlurOperation.cpp
M source/blender/compositor/operations/COM_DisplaceOperation.cpp
M source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp
M source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp
M source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cpp
M source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cpp
M source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp
M source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp
M source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp
M source/blender/compositor/operations/COM_GlareBaseOperation.cpp
M source/blender/compositor/operations/COM_ImageOperation.cpp
M source/blender/compositor/operations/COM_InpaintOperation.cpp
M source/blender/compositor/operations/COM_KeyingScreenOperation.cpp
M source/blender/compositor/operations/COM_MapUVOperation.cpp
M source/blender/compositor/operations/COM_MaskOperation.cpp
M source/blender/compositor/operations/COM_MovieClipAttributeOperation.cpp
M source/blender/compositor/operations/COM_MovieClipOperation.cpp
M source/blender/compositor/operations/COM_MovieDistortionOperation.cpp
M source/blender/compositor/operations/COM_MultilayerImageOperation.cpp
M source/blender/compositor/operations/COM_NormalizeOperation.cpp
M source/blender/compositor/operations/COM_OutputFileOperation.cpp
M source/blender/compositor/operations/COM_OutputFileOperation.h
M source/blender/compositor/operations/COM_PlaneDistortCommonOperation.cpp
M source/blender/compositor/operations/COM_PlaneTrackOperation.cpp
M source/blender/compositor/operations/COM_PreviewOperation.cpp
M source/blender/compositor/operations/COM_PreviewOperation.h
M source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.cpp
M source/blender/compositor/operations/COM_ReadBufferOperation.cpp
M source/blender/compositor/operations/COM_RenderLayersProg.cpp
M source/blender/compositor/operations/COM_ScaleOperation.cpp
M source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cpp
M source/blender/compositor/operations/COM_SetColorOperation.cpp
M source/blender/compositor/operations/COM_SetSamplerOperation.cpp
M source/blender/compositor/operations/COM_SetValueOperation.cpp
M source/blender/compositor/operations/COM_SetVectorOperation.cpp
M source/blender/compositor/operations/COM_SplitOperation.cpp
M source/blender/compositor/operations/COM_SunBeamsOperation.cpp
M source/blender/compositor/operations/COM_TextureOperation.cpp
M source/blender/compositor/operations/COM_TonemapOperation.cpp
M source/blender/compositor/operations/COM_TrackPositionOperation.cpp
M source/blender/compositor/operations/COM_TranslateOperation.cpp
M source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp
M source/blender/compositor/operations/COM_VectorBlurOperation.cpp
M source/blender/compositor/operations/COM_ViewerOperation.cpp
M source/blender/compositor/operations/COM_ViewerOperation.h
M source/blender/compositor/operations/COM_WriteBufferOperation.cpp
===================================================================
diff --git a/source/blender/compositor/intern/COM_ExecutionGroup.cpp b/source/blender/compositor/intern/COM_ExecutionGroup.cpp
index 4676f68..ca4f5c3 100644
--- a/source/blender/compositor/intern/COM_ExecutionGroup.cpp
+++ b/source/blender/compositor/intern/COM_ExecutionGroup.cpp
@@ -433,7 +433,8 @@ void ExecutionGroup::determineChunkRect(rcti *rect, const unsigned int chunkNumb
determineChunkRect(rect, xChunk, yChunk);
}
-MemoryBuffer *ExecutionGroup::allocateOutputBuffer(int chunkNumber, rcti *rect)
+MemoryBuffer *ExecutionGroup::allocateOutputBuffer(int /*chunkNumber*/,
+ rcti *rect)
{
// we asume that this method is only called from complex execution groups.
NodeOperation *operation = this->getOutputOperation();
diff --git a/source/blender/compositor/intern/COM_NodeOperation.h b/source/blender/compositor/intern/COM_NodeOperation.h
index d9c1661..7c87524 100644
--- a/source/blender/compositor/intern/COM_NodeOperation.h
+++ b/source/blender/compositor/intern/COM_NodeOperation.h
@@ -161,7 +161,7 @@ public:
*
* @return bool the result of this method
*/
- virtual bool isOutputOperation(bool rendering) const { return false; }
+ virtual bool isOutputOperation(bool /*rendering*/) const { return false; }
virtual int isSingleThreaded() { return false; }
@@ -175,7 +175,8 @@ public:
* @param chunkNumber the chunkNumber to be calculated
* @param memoryBuffers all input MemoryBuffer's needed
*/
- virtual void executeRegion(rcti *rect, unsigned int chunkNumber) {}
+ virtual void executeRegion(rcti * /*rect*/,
+ unsigned int /*chunkNumber*/) {}
/**
* @brief when a chunk is executed by an OpenCLDevice, this method is called
@@ -189,8 +190,11 @@ public:
* @param memoryBuffers all input MemoryBuffer's needed
* @param outputBuffer the outputbuffer to write to
*/
- virtual void executeOpenCLRegion(OpenCLDevice *device, rcti *rect,
- unsigned int chunkNumber, MemoryBuffer **memoryBuffers, MemoryBuffer *outputBuffer) {}
+ virtual void executeOpenCLRegion(OpenCLDevice * /*device*/,
+ rcti * /*rect*/,
+ unsigned int /*chunkNumber*/,
+ MemoryBuffer ** /*memoryBuffers*/,
+ MemoryBuffer * /*outputBuffer*/) {}
/**
* @brief custom handle to add new tasks to the OpenCL command queue in order to execute a chunk on an GPUDevice
@@ -204,10 +208,12 @@ public:
* @param clMemToCleanUp all created cl_mem references must be added to this list. Framework will clean this after execution
* @param clKernelsToCleanUp all created cl_kernel references must be added to this list. Framework will clean this after execution
*/
- virtual void executeOpenCL(OpenCLDevice *device,
- MemoryBuffer *outputMemoryBuffer, cl_mem clOutputBuffer,
- MemoryBuffer **inputMemoryBuffers, list<cl_mem> *clMemToCleanUp,
- list<cl_kernel> *clKernelsToCleanUp) {}
+ virtual void executeOpenCL(OpenCLDevice * /*device*/,
+ MemoryBuffer * /*outputMemoryBuffer*/,
+ cl_mem /*clOutputBuffer*/,
+ MemoryBuffer ** /*inputMemoryBuffers*/,
+ list<cl_mem> * /*clMemToCleanUp*/,
+ list<cl_kernel> * /*clKernelsToCleanUp*/) {}
virtual void deinitExecution();
bool isResolutionSet() {
diff --git a/source/blender/compositor/intern/COM_NodeOperationBuilder.cpp b/source/blender/compositor/intern/COM_NodeOperationBuilder.cpp
index 45105ba..aed60f5 100644
--- a/source/blender/compositor/intern/COM_NodeOperationBuilder.cpp
+++ b/source/blender/compositor/intern/COM_NodeOperationBuilder.cpp
@@ -459,7 +459,8 @@ WriteBufferOperation *NodeOperationBuilder::find_attached_write_buffer_operation
return NULL;
}
-void NodeOperationBuilder::add_input_buffers(NodeOperation *operation, NodeOperationInput *input)
+void NodeOperationBuilder::add_input_buffers(NodeOperation * /*operation*/,
+ NodeOperationInput *input)
{
if (!input->isConnected())
return;
diff --git a/source/blender/compositor/intern/COM_SingleThreadedOperation.cpp b/source/blender/compositor/intern/COM_SingleThreadedOperation.cpp
index c300a85..b17f5d6 100644
--- a/source/blender/compositor/intern/COM_SingleThreadedOperation.cpp
+++ b/source/blender/compositor/intern/COM_SingleThreadedOperation.cpp
@@ -33,7 +33,7 @@ void SingleThreadedOperation::initExecution()
initMutex();
}
-void SingleThreadedOperation::executePixel(float output[4], int x, int y, void *data)
+void SingleThreadedOperation::executePixel(float output[4], int x, int y, void * /*data*/)
{
this->m_cachedInstance->readNoCheck(output, x, y);
}
diff --git a/source/blender/compositor/intern/COM_SocketReader.h b/source/blender/compositor/intern/COM_SocketReader.h
index c996ef5..7ba208e 100644
--- a/source/blender/compositor/intern/COM_SocketReader.h
+++ b/source/blender/compositor/intern/COM_SocketReader.h
@@ -63,7 +63,10 @@ protected:
* @param y the y-coordinate of the pixel to calculate in image space
* @param inputBuffers chunks that can be read by their ReadBufferOperation.
*/
- virtual void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) {}
+ virtual void executePixelSampled(float /*output*/[4],
+ float /*x*/,
+ float /*y*/,
+ PixelSampler /*sampler*/) { }
/**
* @brief calculate a single pixel
@@ -74,7 +77,7 @@ protected:
* @param inputBuffers chunks that can be read by their ReadBufferOperation.
* @param chunkData chunk specific data a during execution time.
*/
- virtual void executePixel(float output[4], int x, int y, void *chunkData) {
+ virtual void executePixel(float output[4], int x, int y, void * /*chunkData*/) {
executePixelSampled(output, x, y, COM_PS_NEAREST);
}
@@ -88,7 +91,10 @@ protected:
* @param dy
* @param inputBuffers chunks that can be read by their ReadBufferOperation.
*/
- virtual void executePixelFiltered(float output[4], float x, float y, float dx[2], float dy[2], PixelSampler sampler) {}
+ virtual void executePixelFiltered(float /*output*/[4],
+ float /*x*/, float /*y*/,
+ float /*dx*/[2], float /*dy*/[2],
+ PixelSampler /*sampler*/) {}
public:
inline void readSampled(float result[4], float x, float y, PixelSampler sampler) {
@@ -101,12 +107,12 @@ public:
executePixelFiltered(result, x, y, dx, dy, sampler);
}
- virtual void *initializeTileData(rcti *rect) { return 0; }
- virtual void deinitializeTileData(rcti *rect, void *data) {}
+ virtual void *initializeTileData(rcti * /*rect*/) { return 0; }
+ virtual void deinitializeTileData(rcti * /*rect*/, void * /*data*/) {}
virtual ~SocketReader() {}
- virtual MemoryBuffer *getInputMemoryBuffer(MemoryBuffer **memoryBuffers) { return 0; }
+ virtual MemoryBuffer *getInputMemoryBuffer(MemoryBuffer ** /*memoryBuffers*/) { return 0; }
inline const unsigned int getWidth() const { return this->m_width; }
inline const unsigned int getHeight() const { return this->m_height; }
diff --git a/source/blender/compositor/intern/COM_WorkScheduler.cpp b/source/blender/compositor/intern/COM_WorkScheduler.cpp
index 673920e..fc6ea12 100644
--- a/source/blender/compositor/intern/COM_WorkScheduler.cpp
+++ b/source/blender/compositor/intern/COM_WorkScheduler.cpp
@@ -276,7 +276,10 @@ bool WorkScheduler::hasGPUDevices()
#endif
}
-static void CL_CALLBACK clContextError(const char *errinfo, const void *private_info, size_t cb, void *user_data)
+static void CL_CALLBACK clContextError(const char *errinfo,
+ const void * /*private_info*/,
+ size_t /*cb*/,
+ void * /*user_data*/)
{
printf("OPENCL error: %s\n", errinfo);
}
diff --git a/source/blender/compositor/nodes/COM_AlphaOverNode.cpp b/source/blender/compositor/nodes/COM_AlphaOverNode.cpp
index 0306d63..e9b99b6 100644
--- a/source/blender/compositor/nodes/COM_AlphaOverNode.cpp
+++ b/source/blender/compositor/nodes/COM_AlphaOverNode.cpp
@@ -30,7 +30,7 @@
#include "COM_SetValueOperation.h"
#include "DNA_material_types.h" // the ramp types
-void AlphaOverNode::convertToOperations(NodeConverter &converter, const CompositorContext &context) const
+void AlphaOverNode::convertToOperations(NodeConverter &converter, const CompositorContext &/*context*/) const
{
NodeInput *color1Socket = this->getInputSocket(1);
NodeInput *color2Socket = this->getInputSocket(2);
diff --git a/source/blender/compositor/nodes/COM_BokehImageNode.cpp b/source/blender/compositor/nodes/COM_BokehImageNode.cpp
index c75e9b1..7b7cfc8 100644
--- a/source/blender/compositor/nodes/COM_BokehImageNode.cpp
+++ b/source/blender/compositor/nodes/COM_BokehImageNode.cpp
@@ -29,7 +29,7 @@ BokehImageNode::BokehImageNode(bNode *editorNode) : Node(editorNode)
/* pass */
}
-void BokehImageNode::convertToOperations(NodeConverter &converter, const CompositorContext &context) const
+void BokehImageNode::convertToOperations(NodeConverter &converter, const CompositorContext &/*context*/) const
{
BokehImageOperation *operation = new BokehImageOperation();
operation->setData((NodeBokehImage *)this->getbNode()->storage);
diff --git a/source/blender/compositor/nodes/COM_BrightnessNode.cpp b/source/blender/compositor/nodes/COM_BrightnessNode.cpp
index e684b56..053f286 100644
--- a/source/blender/compositor/nodes/COM_BrightnessNode.cpp
+++ b/source/blender/compositor/nodes/COM_BrightnessNode.cpp
@@ -29,7 +29,7 @@ BrightnessNode::BrightnessNode(bNode *editorNode) : Node(editorNode)
/* pass */
}
-void BrightnessNode::convertToOperations(NodeConverter &converter, const CompositorContext &context) const
+void BrightnessNode::convertToOperations(NodeConverter &converter, const Compo
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list