diff options
| author | 2015-01-05 22:10:56 -0500 | |
|---|---|---|
| committer | 2015-01-05 22:10:56 -0500 | |
| commit | 9b83f0e15859ed56a8e25f204484d2cd34b74f16 (patch) | |
| tree | 5c04821a59dfbb0ae16d18aa8c1f014a51b44bec /src/citra_qt/debugger/graphics_framebuffer.cpp | |
| parent | Merge pull request #422 from lioncash/bxj (diff) | |
| parent | Silence some -Wsign-compare warnings. (diff) | |
| download | yuzu-9b83f0e15859ed56a8e25f204484d2cd34b74f16.tar.gz yuzu-9b83f0e15859ed56a8e25f204484d2cd34b74f16.tar.xz yuzu-9b83f0e15859ed56a8e25f204484d2cd34b74f16.zip | |
Merge pull request #272 from rohit-n/sign-compare
Silence some -Wsign-compare warnings.
Diffstat (limited to 'src/citra_qt/debugger/graphics_framebuffer.cpp')
| -rw-r--r-- | src/citra_qt/debugger/graphics_framebuffer.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/citra_qt/debugger/graphics_framebuffer.cpp b/src/citra_qt/debugger/graphics_framebuffer.cpp index a9e9de652..7ef699f37 100644 --- a/src/citra_qt/debugger/graphics_framebuffer.cpp +++ b/src/citra_qt/debugger/graphics_framebuffer.cpp | |||
| @@ -158,7 +158,7 @@ void GraphicsFramebufferWidget::OnFramebufferAddressChanged(qint64 new_value) | |||
| 158 | } | 158 | } |
| 159 | } | 159 | } |
| 160 | 160 | ||
| 161 | void GraphicsFramebufferWidget::OnFramebufferWidthChanged(int new_value) | 161 | void GraphicsFramebufferWidget::OnFramebufferWidthChanged(unsigned int new_value) |
| 162 | { | 162 | { |
| 163 | if (framebuffer_width != new_value) { | 163 | if (framebuffer_width != new_value) { |
| 164 | framebuffer_width = new_value; | 164 | framebuffer_width = new_value; |
| @@ -168,7 +168,7 @@ void GraphicsFramebufferWidget::OnFramebufferWidthChanged(int new_value) | |||
| 168 | } | 168 | } |
| 169 | } | 169 | } |
| 170 | 170 | ||
| 171 | void GraphicsFramebufferWidget::OnFramebufferHeightChanged(int new_value) | 171 | void GraphicsFramebufferWidget::OnFramebufferHeightChanged(unsigned int new_value) |
| 172 | { | 172 | { |
| 173 | if (framebuffer_height != new_value) { | 173 | if (framebuffer_height != new_value) { |
| 174 | framebuffer_height = new_value; | 174 | framebuffer_height = new_value; |
| @@ -227,8 +227,8 @@ void GraphicsFramebufferWidget::OnUpdate() | |||
| 227 | { | 227 | { |
| 228 | QImage decoded_image(framebuffer_width, framebuffer_height, QImage::Format_ARGB32); | 228 | QImage decoded_image(framebuffer_width, framebuffer_height, QImage::Format_ARGB32); |
| 229 | u32* color_buffer = (u32*)Memory::GetPointer(Pica::PAddrToVAddr(framebuffer_address)); | 229 | u32* color_buffer = (u32*)Memory::GetPointer(Pica::PAddrToVAddr(framebuffer_address)); |
| 230 | for (unsigned y = 0; y < framebuffer_height; ++y) { | 230 | for (unsigned int y = 0; y < framebuffer_height; ++y) { |
| 231 | for (unsigned x = 0; x < framebuffer_width; ++x) { | 231 | for (unsigned int x = 0; x < framebuffer_width; ++x) { |
| 232 | u32 value = *(color_buffer + x + y * framebuffer_width); | 232 | u32 value = *(color_buffer + x + y * framebuffer_width); |
| 233 | 233 | ||
| 234 | decoded_image.setPixel(x, y, qRgba((value >> 16) & 0xFF, (value >> 8) & 0xFF, value & 0xFF, 255/*value >> 24*/)); | 234 | decoded_image.setPixel(x, y, qRgba((value >> 16) & 0xFF, (value >> 8) & 0xFF, value & 0xFF, 255/*value >> 24*/)); |
| @@ -242,8 +242,8 @@ void GraphicsFramebufferWidget::OnUpdate() | |||
| 242 | { | 242 | { |
| 243 | QImage decoded_image(framebuffer_width, framebuffer_height, QImage::Format_ARGB32); | 243 | QImage decoded_image(framebuffer_width, framebuffer_height, QImage::Format_ARGB32); |
| 244 | u8* color_buffer = Memory::GetPointer(Pica::PAddrToVAddr(framebuffer_address)); | 244 | u8* color_buffer = Memory::GetPointer(Pica::PAddrToVAddr(framebuffer_address)); |
| 245 | for (unsigned y = 0; y < framebuffer_height; ++y) { | 245 | for (unsigned int y = 0; y < framebuffer_height; ++y) { |
| 246 | for (unsigned x = 0; x < framebuffer_width; ++x) { | 246 | for (unsigned int x = 0; x < framebuffer_width; ++x) { |
| 247 | u8* pixel_pointer = color_buffer + x * 3 + y * 3 * framebuffer_width; | 247 | u8* pixel_pointer = color_buffer + x * 3 + y * 3 * framebuffer_width; |
| 248 | 248 | ||
| 249 | decoded_image.setPixel(x, y, qRgba(pixel_pointer[0], pixel_pointer[1], pixel_pointer[2], 255/*value >> 24*/)); | 249 | decoded_image.setPixel(x, y, qRgba(pixel_pointer[0], pixel_pointer[1], pixel_pointer[2], 255/*value >> 24*/)); |
| @@ -257,8 +257,8 @@ void GraphicsFramebufferWidget::OnUpdate() | |||
| 257 | { | 257 | { |
| 258 | QImage decoded_image(framebuffer_width, framebuffer_height, QImage::Format_ARGB32); | 258 | QImage decoded_image(framebuffer_width, framebuffer_height, QImage::Format_ARGB32); |
| 259 | u32* color_buffer = (u32*)Memory::GetPointer(Pica::PAddrToVAddr(framebuffer_address)); | 259 | u32* color_buffer = (u32*)Memory::GetPointer(Pica::PAddrToVAddr(framebuffer_address)); |
| 260 | for (unsigned y = 0; y < framebuffer_height; ++y) { | 260 | for (unsigned int y = 0; y < framebuffer_height; ++y) { |
| 261 | for (unsigned x = 0; x < framebuffer_width; ++x) { | 261 | for (unsigned int x = 0; x < framebuffer_width; ++x) { |
| 262 | u16 value = *(u16*)(((u8*)color_buffer) + x * 2 + y * framebuffer_width * 2); | 262 | u16 value = *(u16*)(((u8*)color_buffer) + x * 2 + y * framebuffer_width * 2); |
| 263 | u8 r = Color::Convert5To8((value >> 11) & 0x1F); | 263 | u8 r = Color::Convert5To8((value >> 11) & 0x1F); |
| 264 | u8 g = Color::Convert5To8((value >> 6) & 0x1F); | 264 | u8 g = Color::Convert5To8((value >> 6) & 0x1F); |