Unused =operator: copy function instead

This commit is contained in:
Bruno
2021-04-18 10:58:03 +02:00
parent 7cafbc032b
commit 31eb13e16d
6 changed files with 8 additions and 19 deletions

View File

@@ -58,7 +58,7 @@ void ImageProcessingShader::reset()
}
void ImageProcessingShader::copy(const ImageProcessingShader &S)
void ImageProcessingShader::copy(ImageProcessingShader const& S)
{
brightness = S.brightness;
contrast = S.contrast;
@@ -75,11 +75,6 @@ void ImageProcessingShader::copy(const ImageProcessingShader &S)
chromadelta = S.chromadelta;
}
void ImageProcessingShader::operator = (const ImageProcessingShader &S )
{
copy(S);
}
void ImageProcessingShader::accept(Visitor& v)
{

View File

@@ -16,8 +16,7 @@ public:
void reset() override;
void accept(Visitor& v) override;
void operator = (const ImageProcessingShader &S);
void copy(const ImageProcessingShader &S);
void copy(ImageProcessingShader const& S);
// color effects
float brightness; // [-1 1]

View File

@@ -58,10 +58,8 @@ void ImageShader::reset()
stipple = 0.f;
}
void ImageShader::operator = (const ImageShader &S)
void ImageShader::copy(ImageShader const& S)
{
Shader::operator =(S);
mask_texture = S.mask_texture;
stipple = S.stipple;
}
@@ -133,10 +131,8 @@ void MaskShader::reset()
effect = 0;
}
void MaskShader::operator = (const MaskShader &S)
void MaskShader::copy(MaskShader const& S)
{
Shader::operator =(S);
mode = S.mode;
shape = S.shape;
blur = S.blur;

View File

@@ -19,7 +19,7 @@ public:
void use() override;
void reset() override;
void accept(Visitor& v) override;
void operator = (const ImageShader &S);
void copy(ImageShader const& S);
uint mask_texture;
@@ -45,7 +45,7 @@ public:
void use() override;
void reset() override;
void accept(Visitor& v) override;
void operator = (const MaskShader &S);
void copy(MaskShader const& S);
enum Modes {
NONE = 0,

View File

@@ -210,7 +210,7 @@ Shader::Shader() : blending(BLEND_OPACITY)
}
void Shader::operator = (const Shader &S )
void Shader::copy(Shader const& S)
{
color = S.color;
blending = S.blending;

View File

@@ -50,8 +50,7 @@ public:
virtual void use();
virtual void reset();
virtual void accept(Visitor& v);
void operator = (const Shader &D );
void copy(Shader const& S);
glm::mat4 projection;
glm::mat4 modelview;