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:
Diffstat (limited to 'source/blender/compositor/intern')
-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
4 files changed, 15 insertions, 23 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)