mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-02-05 18:40:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename scale_xxbits_to_8bits() -> scale_xbits_to_8bits()

Browse Source
This commit is contained in:
David Capello 2023-10-25 09:47:17 -03:00
parent ae3b2dd144
commit dbb89b02a9
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/app/file/bmp_format.cpp
View File

@ -937,10 +937,10 @@ static int read_bitfields_image(FILE *f, Image *image, BITMAPINFOHEADER *infohea
b = (buffer & bmask) >> bshift; b = (buffer & bmask) >> bshift;
a = (buffer & amask) >> ashift; a = (buffer & amask) >> ashift;
r = (rbits == 8 ? r : scale_xxbits_to_8bits(rbits, r) ); r = (rbits == 8 ? r: scale_xbits_to_8bits(rbits, r));
g = (gbits == 8 ? g : scale_xxbits_to_8bits(gbits, g) ); g = (gbits == 8 ? g: scale_xbits_to_8bits(gbits, g));
b = (bbits == 8 ? b : scale_xxbits_to_8bits(bbits, b) ); b = (bbits == 8 ? b: scale_xbits_to_8bits(bbits, b));
a = (abits == 8 ? a : scale_xxbits_to_8bits(abits, a) ); a = (abits == 8 ? a: scale_xbits_to_8bits(abits, a));
if (a) if (a)
withAlpha = true; withAlpha = true;

6
src/doc/color_scales.h
View File

@ -28,8 +28,8 @@ namespace doc {
return (v << 2) | (v >> 4); return (v << 2) | (v >> 4);
} }
inline int scale_xxbits_to_8bits(const int xx, const int v) { inline int scale_xbits_to_8bits(const int x, const int v) {
switch (xx) { switch (x) {
case 3: case 3:
return scale_3bits_to_8bits(v); return scale_3bits_to_8bits(v);
case 5: case 5:
@ -37,7 +37,7 @@ namespace doc {
case 6: case 6:
return scale_6bits_to_8bits(v); return scale_6bits_to_8bits(v);
} }
return (int)(255.0 / (double(1<<xx) - 1.0) * (double)v); return (int)(255.0 / (double(1<<x) - 1.0) * (double)v);
} }
} // namespace doc } // namespace doc

8
src/doc/color_scales_tests.cpp
View File

@ -23,19 +23,19 @@ TEST(Scale, MatchValues)
switch (x) { switch (x) {
case 3: case 3:
for (int v=0; v<8; ++v) for (int v=0; v<8; ++v)
EXPECT_EQ(scale_3bits_to_8bits(v), scale_xxbits_to_8bits(3, v)); EXPECT_EQ(scale_3bits_to_8bits(v), scale_xbits_to_8bits(3, v));
break; break;
case 5: case 5:
for (int v=0; v<32; ++v) for (int v=0; v<32; ++v)
EXPECT_EQ(scale_5bits_to_8bits(v), scale_xxbits_to_8bits(5, v)); EXPECT_EQ(scale_5bits_to_8bits(v), scale_xbits_to_8bits(5, v));
break; break;
case 6: case 6:
for (int v=0; v<64; ++v) for (int v=0; v<64; ++v)
EXPECT_EQ(scale_6bits_to_8bits(v), scale_xxbits_to_8bits(6, v)); EXPECT_EQ(scale_6bits_to_8bits(v), scale_xbits_to_8bits(6, v));
break; break;
} }
for (int v=0; v<(1<<x); ++v) for (int v=0; v<(1<<x); ++v)
EXPECT_LE(std::abs((255 * v / ((1<<x)-1)) - scale_xxbits_to_8bits(x, v)), 1); EXPECT_LE(std::abs((255 * v / ((1<<x)-1)) - scale_xbits_to_8bits(x, v)), 1);
} }
} }