Change QuanizerResult::color_to_count to match RankedSuggestion signa…

…ture PiperOrigin-RevId: 588900384
material-foundation · Dec 7, 2023 · 1217346 · 1217346
1 parent f5d03da
commit 1217346
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/cpp/quantize/celebi_test.cc b/cpp/quantize/celebi_test.cc
@@ -50,23 +50,23 @@ TEST(CelebiTest, OneRed) {
   pixels.push_back(0xffff0000);
   QuantizerResult result = QuantizeCelebi(pixels, 256);
   EXPECT_EQ(result.color_to_count.size(), 1u);
-  EXPECT_EQ(result.color_to_count[0xffff0000], 1);
+  EXPECT_EQ(result.color_to_count[0xffff0000], 1u);
 }
 
 TEST(CelebiTest, OneGreen) {
   std::vector<Argb> pixels;
   pixels.push_back(0xff00ff00);
   QuantizerResult result = QuantizeCelebi(pixels, 256);
   EXPECT_EQ(result.color_to_count.size(), 1u);
-  EXPECT_EQ(result.color_to_count[0xff00ff00], 1);
+  EXPECT_EQ(result.color_to_count[0xff00ff00], 1u);
 }
 
 TEST(CelebiTest, OneBlue) {
   std::vector<Argb> pixels;
   pixels.push_back(0xff0000ff);
   QuantizerResult result = QuantizeCelebi(pixels, 256);
   EXPECT_EQ(result.color_to_count.size(), 1u);
-  EXPECT_EQ(result.color_to_count[0xff0000ff], 1);
+  EXPECT_EQ(result.color_to_count[0xff0000ff], 1u);
 }
 
 TEST(CelebiTest, FiveBlue) {
@@ -76,7 +76,7 @@ TEST(CelebiTest, FiveBlue) {
   }
   QuantizerResult result = QuantizeCelebi(pixels, 256);
   EXPECT_EQ(result.color_to_count.size(), 1u);
-  EXPECT_EQ(result.color_to_count[0xff0000ff], 5);
+  EXPECT_EQ(result.color_to_count[0xff0000ff], 5u);
 }
 
 TEST(CelebiTest, OneRedOneGreenOneBlue) {
@@ -86,9 +86,9 @@ TEST(CelebiTest, OneRedOneGreenOneBlue) {
   pixels.push_back(0xff0000ff);
   QuantizerResult result = QuantizeCelebi(pixels, 256);
   EXPECT_EQ(result.color_to_count.size(), 3u);
-  EXPECT_EQ(result.color_to_count[0xffff0000], 1);
-  EXPECT_EQ(result.color_to_count[0xff00ff00], 1);
-  EXPECT_EQ(result.color_to_count[0xff0000ff], 1);
+  EXPECT_EQ(result.color_to_count[0xffff0000], 1u);
+  EXPECT_EQ(result.color_to_count[0xff00ff00], 1u);
+  EXPECT_EQ(result.color_to_count[0xff0000ff], 1u);
 }
 
 TEST(CelebiTest, TwoRedThreeGreen) {
@@ -100,8 +100,8 @@ TEST(CelebiTest, TwoRedThreeGreen) {
   pixels.push_back(0xff00ff00);
   QuantizerResult result = QuantizeCelebi(pixels, 256);
   EXPECT_EQ(result.color_to_count.size(), 2u);
-  EXPECT_EQ(result.color_to_count[0xffff0000], 2);
-  EXPECT_EQ(result.color_to_count[0xff00ff00], 3);
+  EXPECT_EQ(result.color_to_count[0xffff0000], 2u);
+  EXPECT_EQ(result.color_to_count[0xff00ff00], 3u);
 }
 
 TEST(CelebiTest, NoColors) {

diff --git a/cpp/quantize/wsmeans.cc b/cpp/quantize/wsmeans.cc
@@ -247,7 +247,7 @@ QuantizerResult QuantizeWsmeans(const std::vector<Argb>& input_pixels,
 
   // Constructs the quantizer result to return.
 
-  std::map<Argb, int> color_to_count;
+  std::map<Argb, uint32_t> color_to_count;
   for (size_t i = 0; i < swatches.size(); i++) {
     color_to_count[swatches[i].argb] = swatches[i].population;
   }

diff --git a/cpp/quantize/wsmeans.h b/cpp/quantize/wsmeans.h
@@ -26,7 +26,7 @@
 namespace material_color_utilities {
 
 struct QuantizerResult {
-  std::map<Argb, int> color_to_count;
+  std::map<Argb, uint32_t> color_to_count;
   std::map<Argb, Argb> input_pixel_to_cluster_pixel;
 };
 

diff --git a/cpp/quantize/wsmeans_test.cc b/cpp/quantize/wsmeans_test.cc
@@ -51,7 +51,7 @@ TEST(WsmeansTest, OneRedAndO) {
   std::vector<Argb> starting_clusters;
   QuantizerResult result = QuantizeWsmeans(pixels, starting_clusters, 256);
   EXPECT_EQ(result.color_to_count.size(), 1u);
-  EXPECT_EQ(result.color_to_count[0xff141216], 1);
+  EXPECT_EQ(result.color_to_count[0xff141216], 1u);
 }
 
 TEST(WsmeansTest, OneRed) {
@@ -60,7 +60,7 @@ TEST(WsmeansTest, OneRed) {
   std::vector<Argb> starting_clusters;
   QuantizerResult result = QuantizeWsmeans(pixels, starting_clusters, 256);
   EXPECT_EQ(result.color_to_count.size(), 1u);
-  EXPECT_EQ(result.color_to_count[0xffff0000], 1);
+  EXPECT_EQ(result.color_to_count[0xffff0000], 1u);
 }
 
 TEST(WsmeansTest, OneGreen) {
@@ -69,7 +69,7 @@ TEST(WsmeansTest, OneGreen) {
   std::vector<Argb> starting_clusters;
   QuantizerResult result = QuantizeWsmeans(pixels, starting_clusters, 256);
   EXPECT_EQ(result.color_to_count.size(), 1u);
-  EXPECT_EQ(result.color_to_count[0xff00ff00], 1);
+  EXPECT_EQ(result.color_to_count[0xff00ff00], 1u);
 }
 
 TEST(WsmeansTest, OneBlue) {
@@ -78,7 +78,7 @@ TEST(WsmeansTest, OneBlue) {
   std::vector<Argb> starting_clusters;
   QuantizerResult result = QuantizeWsmeans(pixels, starting_clusters, 256);
   EXPECT_EQ(result.color_to_count.size(), 1u);
-  EXPECT_EQ(result.color_to_count[0xff0000ff], 1);
+  EXPECT_EQ(result.color_to_count[0xff0000ff], 1u);
 }
 
 TEST(WsmeansTest, FiveBlue) {
@@ -89,7 +89,7 @@ TEST(WsmeansTest, FiveBlue) {
   std::vector<Argb> starting_clusters;
   QuantizerResult result = QuantizeWsmeans(pixels, starting_clusters, 256);
   EXPECT_EQ(result.color_to_count.size(), 1u);
-  EXPECT_EQ(result.color_to_count[0xff0000ff], 5);
+  EXPECT_EQ(result.color_to_count[0xff0000ff], 5u);
 }
 
 }  // namespace