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:
authorCampbell Barton <campbell@blender.org>2022-01-07 03:38:08 +0300
committerCampbell Barton <campbell@blender.org>2022-01-07 06:16:26 +0300
commit3d3bc748849834ef74563deb603ab43859cffeeb (patch)
treede74ce4722b2cb032c22dbc090a15dd2e172c29b /source/blender/compositor
parentbb69c19f08ac681d4386325e4318ebfbef2e9531 (diff)
Cleanup: remove redundant const qualifiers for POD types
MSVC used to warn about const mismatch for arguments passed by value. Remove these as newer versions of MSVC no longer show this warning.
Diffstat (limited to 'source/blender/compositor')
-rw-r--r--source/blender/compositor/intern/COM_ExecutionGroup.h8
-rw-r--r--source/blender/compositor/intern/COM_FullFrameExecutionModel.h6
-rw-r--r--source/blender/compositor/intern/COM_MemoryBuffer.h20
-rw-r--r--source/blender/compositor/intern/COM_Node.h4
-rw-r--r--source/blender/compositor/operations/COM_GaussianAlphaBlurBaseOperation.h4
-rw-r--r--source/blender/compositor/operations/COM_GaussianBlurBaseOperation.h4
-rw-r--r--source/blender/compositor/operations/COM_GaussianBokehBlurOperation.h8
-rw-r--r--source/blender/compositor/operations/COM_GlareBaseOperation.h4
-rw-r--r--source/blender/compositor/operations/COM_InpaintOperation.h4
-rw-r--r--source/blender/compositor/operations/COM_KeyingBlurOperation.h4
-rw-r--r--source/blender/compositor/operations/COM_KeyingClipOperation.h4
-rw-r--r--source/blender/compositor/operations/COM_OutputFileMultiViewOperation.h4
-rw-r--r--source/blender/compositor/operations/COM_OutputFileOperation.h2
-rw-r--r--source/blender/compositor/operations/COM_RotateOperation.h24
-rw-r--r--source/blender/compositor/operations/COM_ScaleOperation.h4
-rw-r--r--source/blender/compositor/operations/COM_VectorBlurOperation.h4
16 files changed, 37 insertions, 71 deletions
diff --git a/source/blender/compositor/intern/COM_ExecutionGroup.h b/source/blender/compositor/intern/COM_ExecutionGroup.h
index 430cde89a3b..d37bfe29306 100644
--- a/source/blender/compositor/intern/COM_ExecutionGroup.h
+++ b/source/blender/compositor/intern/COM_ExecutionGroup.h
@@ -175,9 +175,7 @@ class ExecutionGroup {
/**
* \brief Determine the rect (minx, maxx, miny, maxy) of a chunk at a position.
*/
- void determine_chunk_rect(rcti *r_rect,
- const unsigned int x_chunk,
- const unsigned int y_chunk) const;
+ void determine_chunk_rect(rcti *r_rect, unsigned int x_chunk, unsigned int y_chunk) const;
/**
* \brief determine the number of chunks, based on the chunk_size, width and height.
@@ -197,7 +195,7 @@ class ExecutionGroup {
* true: package(s) are scheduled
* false: scheduling is deferred (depending workpackages are scheduled)
*/
- bool schedule_chunk_when_possible(ExecutionSystem *graph, const int chunk_x, const int chunk_y);
+ bool schedule_chunk_when_possible(ExecutionSystem *graph, int chunk_x, int chunk_y);
/**
* \brief try to schedule a specific area.
@@ -374,7 +372,7 @@ class ExecutionGroup {
/**
* \brief Determine the rect (minx, maxx, miny, maxy) of a chunk.
*/
- void determine_chunk_rect(rcti *r_rect, const unsigned int chunk_number) const;
+ void determine_chunk_rect(rcti *r_rect, unsigned int chunk_number) const;
void set_chunksize(int chunksize)
{
diff --git a/source/blender/compositor/intern/COM_FullFrameExecutionModel.h b/source/blender/compositor/intern/COM_FullFrameExecutionModel.h
index ce724a6b934..6d3a5fba53a 100644
--- a/source/blender/compositor/intern/COM_FullFrameExecutionModel.h
+++ b/source/blender/compositor/intern/COM_FullFrameExecutionModel.h
@@ -75,10 +75,8 @@ class FullFrameExecutionModel : public ExecutionModel {
* Returns input buffers with an offset relative to given output coordinates.
* Returned memory buffers must be deleted.
*/
- Vector<MemoryBuffer *> get_input_buffers(NodeOperation *op,
- const int output_x,
- const int output_y);
- MemoryBuffer *create_operation_buffer(NodeOperation *op, const int output_x, const int output_y);
+ Vector<MemoryBuffer *> get_input_buffers(NodeOperation *op, int output_x, int output_y);
+ MemoryBuffer *create_operation_buffer(NodeOperation *op, int output_x, int output_y);
void render_operation(NodeOperation *op);
void operation_finished(NodeOperation *operation);
diff --git a/source/blender/compositor/intern/COM_MemoryBuffer.h b/source/blender/compositor/intern/COM_MemoryBuffer.h
index 1af047e9ce1..dd18a7403da 100644
--- a/source/blender/compositor/intern/COM_MemoryBuffer.h
+++ b/source/blender/compositor/intern/COM_MemoryBuffer.h
@@ -286,8 +286,7 @@ class MemoryBuffer {
}
}
- void read_elem_filtered(
- const float x, const float y, float dx[2], float dy[2], float *out) const;
+ void read_elem_filtered(float x, float y, float dx[2], float dy[2], float *out) const;
/**
* Get channel value at given coordinates.
@@ -722,18 +721,15 @@ class MemoryBuffer {
void copy_single_elem_from(const MemoryBuffer *src,
int channel_offset,
int elem_size,
- const int to_channel_offset);
- void copy_rows_from(const MemoryBuffer *src,
- const rcti &src_area,
- const int to_x,
- const int to_y);
+ int to_channel_offset);
+ void copy_rows_from(const MemoryBuffer *src, const rcti &src_area, int to_x, int to_y);
void copy_elems_from(const MemoryBuffer *src,
const rcti &area,
- const int channel_offset,
- const int elem_size,
- const int to_x,
- const int to_y,
- const int to_channel_offset);
+ int channel_offset,
+ int elem_size,
+ int to_x,
+ int to_y,
+ int to_channel_offset);
#ifdef WITH_CXX_GUARDEDALLOC
MEM_CXX_CLASS_ALLOC_FUNCS("COM:MemoryBuffer")
diff --git a/source/blender/compositor/intern/COM_Node.h b/source/blender/compositor/intern/COM_Node.h
index dd126770303..37fa71f9b97 100644
--- a/source/blender/compositor/intern/COM_Node.h
+++ b/source/blender/compositor/intern/COM_Node.h
@@ -129,13 +129,13 @@ class Node {
* Get the reference to a certain output-socket.
* \param index: The index of the needed output-socket.
*/
- NodeOutput *get_output_socket(const unsigned int index = 0) const;
+ NodeOutput *get_output_socket(unsigned int index = 0) const;
/**
* get the reference to a certain input-socket.
* \param index: The index of the needed input-socket.
*/
- NodeInput *get_input_socket(const unsigned int index) const;
+ NodeInput *get_input_socket(unsigned int index) const;
/**
* \brief Is this node in the active group (the group that is being edited)
diff --git a/source/blender/compositor/operations/COM_GaussianAlphaBlurBaseOperation.h b/source/blender/compositor/operations/COM_GaussianAlphaBlurBaseOperation.h
index 0f83a67cef7..4f374d446cf 100644
--- a/source/blender/compositor/operations/COM_GaussianAlphaBlurBaseOperation.h
+++ b/source/blender/compositor/operations/COM_GaussianAlphaBlurBaseOperation.h
@@ -39,9 +39,7 @@ class GaussianAlphaBlurBaseOperation : public BlurBaseOperation {
virtual void init_execution() override;
virtual void deinit_execution() override;
- void get_area_of_interest(const int input_idx,
- const rcti &output_area,
- rcti &r_input_area) final;
+ void get_area_of_interest(int input_idx, const rcti &output_area, rcti &r_input_area) final;
void update_memory_buffer_partial(MemoryBuffer *output,
const rcti &area,
Span<MemoryBuffer *> inputs) final;
diff --git a/source/blender/compositor/operations/COM_GaussianBlurBaseOperation.h b/source/blender/compositor/operations/COM_GaussianBlurBaseOperation.h
index 31b045241f8..55099c2d9be 100644
--- a/source/blender/compositor/operations/COM_GaussianBlurBaseOperation.h
+++ b/source/blender/compositor/operations/COM_GaussianBlurBaseOperation.h
@@ -39,9 +39,7 @@ class GaussianBlurBaseOperation : public BlurBaseOperation {
virtual void init_execution() override;
virtual void deinit_execution() override;
- void get_area_of_interest(const int input_idx,
- const rcti &output_area,
- rcti &r_input_area) override;
+ void get_area_of_interest(int input_idx, const rcti &output_area, rcti &r_input_area) override;
virtual void update_memory_buffer_partial(MemoryBuffer *output,
const rcti &area,
Span<MemoryBuffer *> inputs) override;
diff --git a/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.h b/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.h
index 923daf7a447..06d7d85894c 100644
--- a/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.h
+++ b/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.h
@@ -51,9 +51,7 @@ class GaussianBokehBlurOperation : public BlurBaseOperation {
ReadBufferOperation *read_operation,
rcti *output) override;
- void get_area_of_interest(const int input_idx,
- const rcti &output_area,
- rcti &r_input_area) override;
+ void get_area_of_interest(int input_idx, const rcti &output_area, rcti &r_input_area) override;
void update_memory_buffer_partial(MemoryBuffer *output,
const rcti &area,
Span<MemoryBuffer *> inputs) override;
@@ -88,9 +86,7 @@ class GaussianBlurReferenceOperation : public BlurBaseOperation {
ReadBufferOperation *read_operation,
rcti *output) override;
- void get_area_of_interest(const int input_idx,
- const rcti &output_area,
- rcti &r_input_area) override;
+ void get_area_of_interest(int input_idx, const rcti &output_area, rcti &r_input_area) override;
void update_memory_buffer_partial(MemoryBuffer *output,
const rcti &area,
Span<MemoryBuffer *> inputs) override;
diff --git a/source/blender/compositor/operations/COM_GlareBaseOperation.h b/source/blender/compositor/operations/COM_GlareBaseOperation.h
index 09db5efcec9..c29587839b1 100644
--- a/source/blender/compositor/operations/COM_GlareBaseOperation.h
+++ b/source/blender/compositor/operations/COM_GlareBaseOperation.h
@@ -70,9 +70,7 @@ class GlareBaseOperation : public SingleThreadedOperation {
ReadBufferOperation *read_operation,
rcti *output) override;
- void get_area_of_interest(const int input_idx,
- const rcti &output_area,
- rcti &r_input_area) final;
+ void get_area_of_interest(int input_idx, const rcti &output_area, rcti &r_input_area) final;
void update_memory_buffer(MemoryBuffer *output,
const rcti &area,
diff --git a/source/blender/compositor/operations/COM_InpaintOperation.h b/source/blender/compositor/operations/COM_InpaintOperation.h
index 989d154dab5..0e52aa82b92 100644
--- a/source/blender/compositor/operations/COM_InpaintOperation.h
+++ b/source/blender/compositor/operations/COM_InpaintOperation.h
@@ -67,9 +67,7 @@ class InpaintSimpleOperation : public NodeOperation {
ReadBufferOperation *read_operation,
rcti *output) override;
- void get_area_of_interest(const int input_idx,
- const rcti &output_area,
- rcti &r_input_area) override;
+ void get_area_of_interest(int input_idx, const rcti &output_area, rcti &r_input_area) override;
void update_memory_buffer(MemoryBuffer *output,
const rcti &area,
Span<MemoryBuffer *> inputs) override;
diff --git a/source/blender/compositor/operations/COM_KeyingBlurOperation.h b/source/blender/compositor/operations/COM_KeyingBlurOperation.h
index 11fde5f5436..cc4a98767d8 100644
--- a/source/blender/compositor/operations/COM_KeyingBlurOperation.h
+++ b/source/blender/compositor/operations/COM_KeyingBlurOperation.h
@@ -55,9 +55,7 @@ class KeyingBlurOperation : public MultiThreadedOperation {
ReadBufferOperation *read_operation,
rcti *output) override;
- void get_area_of_interest(const int input_idx,
- const rcti &output_area,
- rcti &r_input_area) override;
+ void get_area_of_interest(int input_idx, const rcti &output_area, rcti &r_input_area) override;
void update_memory_buffer_partial(MemoryBuffer *output,
const rcti &area,
Span<MemoryBuffer *> inputs) override;
diff --git a/source/blender/compositor/operations/COM_KeyingClipOperation.h b/source/blender/compositor/operations/COM_KeyingClipOperation.h
index 3bdc7281683..b945d4264af 100644
--- a/source/blender/compositor/operations/COM_KeyingClipOperation.h
+++ b/source/blender/compositor/operations/COM_KeyingClipOperation.h
@@ -69,9 +69,7 @@ class KeyingClipOperation : public MultiThreadedOperation {
ReadBufferOperation *read_operation,
rcti *output) override;
- void get_area_of_interest(const int input_idx,
- const rcti &output_area,
- rcti &r_input_area) override;
+ void get_area_of_interest(int input_idx, const rcti &output_area, rcti &r_input_area) override;
void update_memory_buffer_partial(MemoryBuffer *output,
const rcti &area,
Span<MemoryBuffer *> inputs) override;
diff --git a/source/blender/compositor/operations/COM_OutputFileMultiViewOperation.h b/source/blender/compositor/operations/COM_OutputFileMultiViewOperation.h
index 9f8bf2ed127..864eb68ac24 100644
--- a/source/blender/compositor/operations/COM_OutputFileMultiViewOperation.h
+++ b/source/blender/compositor/operations/COM_OutputFileMultiViewOperation.h
@@ -41,7 +41,7 @@ class OutputOpenExrSingleLayerMultiViewOperation : public OutputSingleLayerOpera
const ColorManagedViewSettings *view_settings,
const ColorManagedDisplaySettings *display_settings,
const char *view_name,
- const bool save_as_render);
+ bool save_as_render);
void *get_handle(const char *filename);
void deinit_execution() override;
@@ -78,7 +78,7 @@ class OutputStereoOperation : public OutputSingleLayerOperation {
const ColorManagedViewSettings *view_settings,
const ColorManagedDisplaySettings *display_settings,
const char *view_name,
- const bool save_as_render);
+ bool save_as_render);
void *get_handle(const char *filename);
void deinit_execution() override;
};
diff --git a/source/blender/compositor/operations/COM_OutputFileOperation.h b/source/blender/compositor/operations/COM_OutputFileOperation.h
index 2a18b056c12..0e871f47b87 100644
--- a/source/blender/compositor/operations/COM_OutputFileOperation.h
+++ b/source/blender/compositor/operations/COM_OutputFileOperation.h
@@ -57,7 +57,7 @@ class OutputSingleLayerOperation : public MultiThreadedOperation {
const ColorManagedViewSettings *view_settings,
const ColorManagedDisplaySettings *display_settings,
const char *view_name,
- const bool save_as_render);
+ bool save_as_render);
void execute_region(rcti *rect, unsigned int tile_number) override;
bool is_output_operation(bool /*rendering*/) const override
diff --git a/source/blender/compositor/operations/COM_RotateOperation.h b/source/blender/compositor/operations/COM_RotateOperation.h
index 3970d3a2776..f53fb3a4932 100644
--- a/source/blender/compositor/operations/COM_RotateOperation.h
+++ b/source/blender/compositor/operations/COM_RotateOperation.h
@@ -56,27 +56,19 @@ class RotateOperation : public MultiThreadedOperation {
const rcti &rotate_canvas,
float &r_offset_x,
float &r_offset_y);
- static void get_area_rotation_bounds(const rcti &area,
- const float center_x,
- const float center_y,
- const float sine,
- const float cosine,
- rcti &r_bounds);
- static void get_area_rotation_bounds_inverted(const rcti &area,
- const float center_x,
- const float center_y,
- const float sine,
- const float cosine,
- rcti &r_bounds);
+ static void get_area_rotation_bounds(
+ const rcti &area, float center_x, float center_y, float sine, float cosine, rcti &r_bounds);
+ static void get_area_rotation_bounds_inverted(
+ const rcti &area, float center_x, float center_y, float sine, float cosine, rcti &r_bounds);
static void get_rotation_area_of_interest(const rcti &input_canvas,
const rcti &rotate_canvas,
- const float sine,
- const float cosine,
+ float sine,
+ float cosine,
const rcti &output_area,
rcti &r_input_area);
static void get_rotation_canvas(const rcti &input_canvas,
- const float sine,
- const float cosine,
+ float sine,
+ float cosine,
rcti &r_canvas);
bool determine_depending_area_of_interest(rcti *input,
diff --git a/source/blender/compositor/operations/COM_ScaleOperation.h b/source/blender/compositor/operations/COM_ScaleOperation.h
index cac865b41aa..132e9c8fed0 100644
--- a/source/blender/compositor/operations/COM_ScaleOperation.h
+++ b/source/blender/compositor/operations/COM_ScaleOperation.h
@@ -90,8 +90,8 @@ class ScaleOperation : public BaseScaleOperation {
static void scale_area(rcti &area, float relative_scale_x, float relative_scale_y);
static void get_scale_area_of_interest(const rcti &input_canvas,
const rcti &scale_canvas,
- const float relative_scale_x,
- const float relative_scale_y,
+ float relative_scale_x,
+ float relative_scale_y,
const rcti &output_area,
rcti &r_input_area);
static void clamp_area_size_max(rcti &area, Size2f max_size);
diff --git a/source/blender/compositor/operations/COM_VectorBlurOperation.h b/source/blender/compositor/operations/COM_VectorBlurOperation.h
index efcb5001fd4..75df9d9e024 100644
--- a/source/blender/compositor/operations/COM_VectorBlurOperation.h
+++ b/source/blender/compositor/operations/COM_VectorBlurOperation.h
@@ -72,9 +72,7 @@ class VectorBlurOperation : public NodeOperation, public QualityStepHelper {
ReadBufferOperation *read_operation,
rcti *output) override;
- void get_area_of_interest(const int input_idx,
- const rcti &output_area,
- rcti &r_input_area) override;
+ void get_area_of_interest(int input_idx, const rcti &output_area, rcti &r_input_area) override;
void update_memory_buffer(MemoryBuffer *output,
const rcti &area,
Span<MemoryBuffer *> inputs) override;