diff options
| author | Léo Lam <leo@leolam.fr> | 2020-11-22 02:04:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-22 02:04:53 +0100 |
| commit | 5d9eb8f6ce127f715db6bf99c656b0c13041e23e (patch) | |
| tree | e54e593c50629e35927e7e956bba762f00b61f90 /Source/Core/InputCommon | |
| parent | d3537e68d10d4871be1cd4ddd58274f70485c374 (diff) | |
| parent | 9efc81ae98076ce55898ef5634e206d32da713a8 (diff) | |
Merge pull request #9271 from leoetlino/warnings
Fix several warnings and only enable extra warnings for our own code
Diffstat (limited to 'Source/Core/InputCommon')
| -rw-r--r-- | Source/Core/InputCommon/ImageOperations.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/Core/InputCommon/ImageOperations.h b/Source/Core/InputCommon/ImageOperations.h index 28d3859ff5..87a4b37d6d 100644 --- a/Source/Core/InputCommon/ImageOperations.h +++ b/Source/Core/InputCommon/ImageOperations.h @@ -32,13 +32,13 @@ struct ImagePixelData { ImagePixelData() = default; - explicit ImagePixelData(std::vector<Pixel> image_pixels, u32 width, u32 height) - : pixels(std::move(image_pixels)), width(width), height(height) + explicit ImagePixelData(std::vector<Pixel> image_pixels, u32 width_, u32 height_) + : pixels(std::move(image_pixels)), width(width_), height(height_) { } - explicit ImagePixelData(u32 width, u32 height, const Pixel& default_color = Pixel{0, 0, 0, 0}) - : pixels(width * height, default_color), width(width), height(height) + explicit ImagePixelData(u32 width_, u32 height_, const Pixel& default_color = Pixel{0, 0, 0, 0}) + : pixels(width_ * height_, default_color), width(width_), height(height_) { } std::vector<Pixel> pixels; |
