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/operations/COM_MultilayerImageOperation.cc')
-rw-r--r--source/blender/compositor/operations/COM_MultilayerImageOperation.cc11
1 files changed, 4 insertions, 7 deletions
diff --git a/source/blender/compositor/operations/COM_MultilayerImageOperation.cc b/source/blender/compositor/operations/COM_MultilayerImageOperation.cc
index 11f80c16c2f..9a825939deb 100644
--- a/source/blender/compositor/operations/COM_MultilayerImageOperation.cc
+++ b/source/blender/compositor/operations/COM_MultilayerImageOperation.cc
@@ -37,7 +37,7 @@ ImBuf *MultilayerBaseOperation::get_im_buf()
void MultilayerBaseOperation::update_memory_buffer_partial(MemoryBuffer *output,
const rcti &area,
- Span<MemoryBuffer *> UNUSED(inputs))
+ Span<MemoryBuffer *> /*inputs*/)
{
output->copy_from(buffer_, area);
}
@@ -93,8 +93,7 @@ void MultilayerColorOperation::execute_pixel_sampled(float output[4],
else {
int yi = y;
int xi = x;
- if (xi < 0 || yi < 0 || (unsigned int)xi >= this->get_width() ||
- (unsigned int)yi >= this->get_height()) {
+ if (xi < 0 || yi < 0 || uint(xi) >= this->get_width() || uint(yi) >= this->get_height()) {
zero_v4(output);
}
else {
@@ -116,8 +115,7 @@ void MultilayerValueOperation::execute_pixel_sampled(float output[4],
else {
int yi = y;
int xi = x;
- if (xi < 0 || yi < 0 || (unsigned int)xi >= this->get_width() ||
- (unsigned int)yi >= this->get_height()) {
+ if (xi < 0 || yi < 0 || uint(xi) >= this->get_width() || uint(yi) >= this->get_height()) {
output[0] = 0.0f;
}
else {
@@ -138,8 +136,7 @@ void MultilayerVectorOperation::execute_pixel_sampled(float output[4],
else {
int yi = y;
int xi = x;
- if (xi < 0 || yi < 0 || (unsigned int)xi >= this->get_width() ||
- (unsigned int)yi >= this->get_height()) {
+ if (xi < 0 || yi < 0 || uint(xi) >= this->get_width() || uint(yi) >= this->get_height()) {
output[0] = 0.0f;
}
else {