From dbb89b02a9cb56f03e5fc9e8f9c5066c7c400a8f Mon Sep 17 00:00:00 2001
From: David Capello <david@igara.com>
Date: Wed, 25 Oct 2023 09:47:17 -0300
Subject: [PATCH] Rename scale_xxbits_to_8bits() -> scale_xbits_to_8bits()

---
 src/app/file/bmp_format.cpp    | 8 ++++----
 src/doc/color_scales.h         | 6 +++---
 src/doc/color_scales_tests.cpp | 8 ++++----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/app/file/bmp_format.cpp b/src/app/file/bmp_format.cpp
index a3af322d7..908ef31af 100644
--- a/src/app/file/bmp_format.cpp
+++ b/src/app/file/bmp_format.cpp
@@ -937,10 +937,10 @@ static int read_bitfields_image(FILE *f, Image *image, BITMAPINFOHEADER *infohea
       b = (buffer & bmask) >> bshift;
       a = (buffer & amask) >> ashift;
 
-      r = (rbits == 8 ? r : scale_xxbits_to_8bits(rbits, r) );
-      g = (gbits == 8 ? g : scale_xxbits_to_8bits(gbits, g) );
-      b = (bbits == 8 ? b : scale_xxbits_to_8bits(bbits, b) );
-      a = (abits == 8 ? a : scale_xxbits_to_8bits(abits, a) );
+      r = (rbits == 8 ? r: scale_xbits_to_8bits(rbits, r));
+      g = (gbits == 8 ? g: scale_xbits_to_8bits(gbits, g));
+      b = (bbits == 8 ? b: scale_xbits_to_8bits(bbits, b));
+      a = (abits == 8 ? a: scale_xbits_to_8bits(abits, a));
 
       if (a)
         withAlpha = true;
diff --git a/src/doc/color_scales.h b/src/doc/color_scales.h
index 43550fd4e..419364b30 100644
--- a/src/doc/color_scales.h
+++ b/src/doc/color_scales.h
@@ -28,8 +28,8 @@ namespace doc {
     return (v << 2) | (v >> 4);
   }
 
-  inline int scale_xxbits_to_8bits(const int xx, const int v) {
-    switch (xx) {
+  inline int scale_xbits_to_8bits(const int x, const int v) {
+    switch (x) {
       case 3:
         return scale_3bits_to_8bits(v);
       case 5:
@@ -37,7 +37,7 @@ namespace doc {
       case 6:
         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
diff --git a/src/doc/color_scales_tests.cpp b/src/doc/color_scales_tests.cpp
index c0f0cc65d..5c25934f1 100644
--- a/src/doc/color_scales_tests.cpp
+++ b/src/doc/color_scales_tests.cpp
@@ -23,19 +23,19 @@ TEST(Scale, MatchValues)
     switch (x) {
       case 3:
         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;
       case 5:
         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;
       case 6:
         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;
     }
     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);
   }
 }