1.7.3 fixing bitmap writer (#104)

CHANGES.adoc

@@ -1,5 +1,8 @@
 = Change log
 
+1.7.3::
+* `Image`: Fixing bitmap writer.
+
 1.7.2::
 * `Image`: Reducting resolution in both X and Y axes added to the image preprocessor.
 * `Image`: Handling of both indexed and RGBA PNG files.

build.gradle.kts

@@ -11,7 +11,7 @@ plugins {
 allprojects {
 
     group = "com.github.c64lib"
-    version = "1.7.2"
+    version = "1.7.3"
 
     if (project.hasProperty(tagPropertyName)) {
         version = project.property(tagPropertyName) ?: version

processors/image/adapters/out/file/src/main/kotlin/com/github/c64lib/rbt/processors/image/adapters/out/file/C64CharsetWriter.kt

@@ -50,7 +50,7 @@ class C64CharsetWriter(private val project: Project) : WriteCharsetPort {
     for (blockY in 0 until numBlocksY) {
       for (blockX in 0 until numBlocksX) {
         for (y in 0 until 8) {
-          val yOffset = (blockY * 8) * numBlocksX * 8
+          val yOffset = blockY * 8
           val xOffset = blockX * 8
 
           val byte =

processors/image/adapters/out/file/src/test/kotlin/com/github/c64lib/rbt/processors/image/adapters/out/file/C64CharsetWriterTest.kt

@@ -36,12 +36,13 @@ import org.mockito.Mockito
 class C64CharsetWriterTest :
     BehaviorSpec({
       fun createTestImage(): Image {
-        val image = Image(16, 8)
+        val image = Image(16, 16)
 
         // Draw some example pixels
         image[0, 0] = Color(255, 255, 255, 255)
         image[7, 0] = Color(255, 255, 255, 255)
         image[15, 7] = Color(255, 255, 255, 255)
+        image[15, 15] = Color(255, 255, 255, 255)
 
         return image
       }
@@ -64,9 +65,10 @@ class C64CharsetWriterTest :
           Then("the resulting file should have the correct size and data") {
             val charsetData = readCharsetData(outputFile)
 
-            charsetData.size shouldBe 16
+            charsetData.size shouldBe 32
             charsetData[0] shouldBe 0b10000001.toByte()
             charsetData[15] shouldBe 0b00000001.toByte()
+            charsetData[31] shouldBe 0b00000001.toByte()
           }
         }
       }

processors/image/src/main/kotlin/com/github/c64lib/rbt/processors/image/domain/Image.kt

@@ -31,14 +31,14 @@ class Image(val width: Int, val height: Int) {
   private val pixels = Array(height) { Array(width) { Color(0, 0, 0, 255) } }
 
   operator fun get(x: Int, y: Int): Color {
-    require(x in 0 until width) { "x coordinate out of bounds" }
-    require(y in 0 until height) { "y coordinate out of bounds" }
+    require(x in 0 until width) { "x coordinate out of bounds: $x >= $width" }
+    require(y in 0 until height) { "y coordinate out of bounds: $y >= $height" }
     return pixels[y][x]
   }
 
   operator fun set(x: Int, y: Int, color: Color) {
-    require(x in 0 until width) { "x coordinate out of bounds" }
-    require(y in 0 until height) { "y coordinate out of bounds" }
+    require(x in 0 until width) { "x coordinate out of bounds: $x >= $width" }
+    require(y in 0 until height) { "y coordinate out of bounds: $y >= $height" }
     pixels[y][x] = color
   }