mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2024-10-02 21:12:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

[msvc] Use a workaround to fix compiler bug (fix #4526)

Browse Source 
Reported in https://developercommunity.visualstudio.com/t/Invalid-optimized-x64-codegen-with-inlin/10678815
possible duplicated of https://developercommunity.visualstudio.com/t/Optimisation-of-right-bit-shift-switches/10453852
not yet available in official VS release.

Here we changed signed ints to unsigned ints to avoid this bug.
This commit is contained in:
David Capello 2024-06-10 08:57:47 -03:00
parent a41644f6b5
commit 2ed584541b
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/doc/rgbmap_rgb5a3.h
View File

@ -1,5 +1,5 @@
// Aseprite Document Library // Aseprite Document Library
// Copyright (c) 2020-2022 Igara Studio S.A. // Copyright (c) 2020-2024 Igara Studio S.A.
// Copyright (c) 2001-2016 David Capello // Copyright (c) 2001-2016 David Capello
// //
// This file is released under the terms of the MIT license. // This file is released under the terms of the MIT license.
@ -11,6 +11,7 @@
#include "base/debug.h" #include "base/debug.h"
#include "base/disable_copying.h" #include "base/disable_copying.h"
#include "base/ints.h"
#include "doc/object.h" #include "doc/object.h"
#include "doc/rgbmap.h" #include "doc/rgbmap.h"
@ -23,7 +24,7 @@ namespace doc {
// It acts like a cache for Palette:findBestfit() calls. // It acts like a cache for Palette:findBestfit() calls.
class RgbMapRGB5A3 : public RgbMap { class RgbMapRGB5A3 : public RgbMap {
// Bit activated on m_map entries that aren't yet calculated. // Bit activated on m_map entries that aren't yet calculated.
const int INVALID = 256; const uint16_t INVALID = 256;
public: public:
RgbMapRGB5A3(); RgbMapRGB5A3();
@ -31,13 +32,13 @@ namespace doc {
// RgbMap impl // RgbMap impl
void regenerateMap(const Palette* palette, int maskIndex) override; void regenerateMap(const Palette* palette, int maskIndex) override;
int mapColor(const color_t rgba) const override { int mapColor(const color_t rgba) const override {
const int r = rgba_getr(rgba); const uint8_t r = rgba_getr(rgba);
const int g = rgba_getg(rgba); const uint8_t g = rgba_getg(rgba);
const int b = rgba_getb(rgba); const uint8_t b = rgba_getb(rgba);
const int a = rgba_geta(rgba); const uint8_t a = rgba_geta(rgba);
// bits -> bbbbbgggggrrrrraaa // bits -> bbbbbgggggrrrrraaa
const int i = (a>>5) | ((b>>3) << 3) | ((g>>3) << 8) | ((r>>3) << 13); const uint32_t i = (a>>5) | ((b>>3) << 3) | ((g>>3) << 8) | ((r>>3) << 13);
const int v = m_map[i]; const uint16_t v = m_map[i];
return (v & INVALID) ? generateEntry(i, r, g, b, a): v; return (v & INVALID) ? generateEntry(i, r, g, b, a): v;
} }