piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 22:29:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix variable shadowing warnings

Browse Source
This commit is contained in:
Léo Lam
2020-11-21 01:58:22 +01:00
parent 7840f61524
commit 9efc81ae98
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/InputCommon/ImageOperations.h
View File

@ -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;