Hotfix about generation of heightmap with color option enabled withou…

…t cm
Zarbuz · Jul 29, 2021 · 282299a · 282299a
1 parent b0f5689
commit 282299a
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/SchematicToVoxCore/Converter/Image/DirectBitmap.cs b/SchematicToVoxCore/Converter/Image/DirectBitmap.cs
@@ -7,15 +7,25 @@ namespace FileToVox.Converter.Image
 {
 	public class DirectBitmap : IDisposable
 	{
+		#region Fields
+
 		public int[] Bits { get; }
 		public bool Disposed { get; private set; }
 		public int Length { get; }
 		public int Width { get; }
 		public int Height { get; private set; }
 		public Dictionary<int, int> Heights { get; private set; }
 
+
+		#endregion
+
 		public DirectBitmap(Bitmap bitmap, int height)
 		{
+			if (bitmap == null)
+			{
+				return;
+			}
+
 			Width = bitmap.Width;
 			Length = bitmap.Height;
 			Height = height;
@@ -91,6 +101,7 @@ public int GetHeight(int x, int y)
 		public void Dispose()
 		{
 			if (Disposed) return;
+
 			Disposed = true;
 		}
 	}

diff --git a/SchematicToVoxCore/FileToVox.csproj b/SchematicToVoxCore/FileToVox.csproj
@@ -8,7 +8,7 @@
     <RuntimeIdentifiers>win-x64;linux-x64;osx-x64</RuntimeIdentifiers>
     <ApplicationIcon />
     <Authors>Zarbuz</Authors>
-    <Version>1.12.5</Version>
+    <Version>1.12.6</Version>
     <PackageProjectUrl>https://github.com/Zarbuz/FileToVox</PackageProjectUrl>
     <RepositoryUrl>https://github.com/Zarbuz/FileToVox</RepositoryUrl>
   </PropertyGroup>

diff --git a/SchematicToVoxCore/Utils/ImageUtils.cs b/SchematicToVoxCore/Utils/ImageUtils.cs
@@ -42,10 +42,10 @@ public static Schematic WriteSchematicFromImage(Bitmap bitmap, Bitmap colorBitma
 			}
 			else if (heightmapStep.EnableColor)
 			{
-				if (heightmapStep.ColorLimit != 256 || colorBitmap.CountColor() > 256)
+				if (heightmapStep.ColorLimit != 256 || bitmap.CountColor() > 256)
 				{
 					Quantizer.Quantizer quantizer = new Quantizer.Quantizer();
-					colorBitmap = quantizer.QuantizeImage(colorBitmap, 10, 70, heightmapStep.ColorLimit);
+					bitmap = quantizer.QuantizeImage(bitmap, 10, 70, heightmapStep.ColorLimit);
 				}
 			}