[Bf-blender-cvs] [cdb0b3cedc9] master: Compositor: Silence -Wself-assign
Ankit Meel
noreply at git.blender.org
Tue Mar 9 14:49:53 CET 2021
Commit: cdb0b3cedc9b242b75affadf0a0a33959320ab77
Author: Ankit Meel
Date: Tue Mar 9 19:19:21 2021 +0530
Branches: master
https://developer.blender.org/rBcdb0b3cedc9b242b75affadf0a0a33959320ab77
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
===================================================================
M source/blender/compositor/intern/COM_ChunkOrderHotspot.cc
M source/blender/compositor/intern/COM_ChunkOrderHotspot.h
===================================================================
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);
More information about the Bf-blender-cvs
mailing list