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
path: root/source
diff options
context:
space:
mode:
authorAnkit Meel <ankitjmeel@gmail.com>2021-03-09 16:49:21 +0300
committerAnkit Meel <ankitjmeel@gmail.com>2021-03-09 16:49:21 +0300
commitcdb0b3cedc9b242b75affadf0a0a33959320ab77 (patch)
tree5eae72a122e02b2521a0e79d3f43899b0aff62b5 /source
parentbe6b3923f5732e3da9d1ef432c092d90f9343fdf (diff)
Compositor: Silence -Wself-assign
Use member initializer list for constructor. Use `this->` for member function. Introduced in rBef53859d24a9720882e3ca6c5415faefec6fb82c Reviewed By: jbakker Differential Revision: https://developer.blender.org/D10653
Diffstat (limited to 'source')
-rw-r--r--source/blender/compositor/intern/COM_ChunkOrderHotspot.cc13
-rw-r--r--source/blender/compositor/intern/COM_ChunkOrderHotspot.h5
2 files changed, 6 insertions, 12 deletions
diff --git a/source/blender/compositor/intern/COM_ChunkOrderHotspot.cc b/source/blender/compositor/intern/COM_ChunkOrderHotspot.cc
index bbc98d086a6..d31ff518ecd 100644
--- a/source/blender/compositor/intern/COM_ChunkOrderHotspot.cc
+++ b/source/blender/compositor/intern/COM_ChunkOrderHotspot.cc
@@ -19,18 +19,11 @@
#include "COM_ChunkOrderHotspot.h"
#include <cmath>
-ChunkOrderHotspot::ChunkOrderHotspot(int x, int y, float addition)
-{
- x = x;
- y = y;
- addition = addition;
-}
-
double ChunkOrderHotspot::calc_distance(int x, int y)
{
- int dx = x - x;
- int dy = y - y;
+ int dx = this->x - x;
+ int dy = this->y - y;
double result = sqrt((double)(dx * dx + dy * dy));
- result += (double)addition;
+ result += (double)this->addition;
return result;
}
diff --git a/source/blender/compositor/intern/COM_ChunkOrderHotspot.h b/source/blender/compositor/intern/COM_ChunkOrderHotspot.h
index af0cf897673..d7f40921836 100644
--- a/source/blender/compositor/intern/COM_ChunkOrderHotspot.h
+++ b/source/blender/compositor/intern/COM_ChunkOrderHotspot.h
@@ -27,8 +27,9 @@ struct ChunkOrderHotspot {
int y;
float addition;
- public:
- ChunkOrderHotspot(int x, int y, float addition);
+ ChunkOrderHotspot(int x, int y, float addition) : x(x), y(y), addition(addition)
+ {
+ }
double calc_distance(int x, int y);