Avoid quantization if the --color-limit argument isn't set or that th…

…e original picture has less than 256 colors
Zarbuz · Jun 3, 2020 · 514a9b2 · 514a9b2
1 parent 8c9a2ef
commit 514a9b2
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 4 deletions.
diff --git a/SchematicToVoxCore/Converter/Image/PNGToSchematic.cs b/SchematicToVoxCore/Converter/Image/PNGToSchematic.cs
@@ -47,13 +47,20 @@ private Schematic WriteSchematicFromImage()
                     gr.DrawImage(bitmapColor, new Rectangle(0, 0, clone.Width, clone.Height));
                 }
 
-                System.Drawing.Image image = quantizer.QuantizeImage(clone, 10, 70, _colorLimit);
-                bitmapColor = new Bitmap(image);
+                if (_colorLimit != 256 || bitmapColor.CountColor() > 256)
+                {
+                    System.Drawing.Image image = quantizer.QuantizeImage(clone, 10, 70, _colorLimit);
+                    bitmapColor = new Bitmap(image);
+                }
+
             }
             else if (_color)
             {
-                System.Drawing.Image image = quantizer.QuantizeImage(clone, 10, 70, _colorLimit);
-                bitmap = new Bitmap(image);
+	            if (_colorLimit != 256 || clone.CountColor() > 256)
+	            {
+		            System.Drawing.Image image = quantizer.QuantizeImage(clone, 10, 70, _colorLimit);
+		            bitmap = new Bitmap(image);
+                }
             }
 
             Bitmap bitmapBlack = Grayscale.MakeGrayscale3(bitmap);

diff --git a/SchematicToVoxCore/Extensions/FctExtensions.cs b/SchematicToVoxCore/Extensions/FctExtensions.cs
@@ -12,6 +12,24 @@ public static int GetColorIntensity(this Color color)
             return color.R + color.G + color.B;
         }
 
+        public static int CountColor(this Bitmap bitmap)
+        {
+            List<Color> colors = new List<Color>();
+            for (int i = 0; i < bitmap.Width; i++)
+            {
+	            for (int j = 0; j < bitmap.Height; j++)
+	            {
+		            Color color = bitmap.GetPixel(i, j);
+		            if (!colors.Contains(color))
+		            {
+                        colors.Add(color);
+		            }
+	            }
+            }
+
+            return colors.Count;
+        }
+
         public static uint ColorToUInt(this Color color)
         {
             return (uint)((color.A << 24) | (color.R << 16) |