From 96c733a7c64b3244f1c138c0285c0edb9246c526 Mon Sep 17 00:00:00 2001 From: Denis Molony Date: Wed, 20 Nov 2019 05:52:03 +1000 Subject: [PATCH] tidying --- .../diskbrowser/applefile/SHRPictureFile1.java | 8 ++++---- .../diskbrowser/applefile/SHRPictureFile2.java | 14 ++++++-------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/src/com/bytezone/diskbrowser/applefile/SHRPictureFile1.java b/src/com/bytezone/diskbrowser/applefile/SHRPictureFile1.java index 5c14b93..77a04e5 100644 --- a/src/com/bytezone/diskbrowser/applefile/SHRPictureFile1.java +++ b/src/com/bytezone/diskbrowser/applefile/SHRPictureFile1.java @@ -131,9 +131,9 @@ public class SHRPictureFile1 extends HiResImage boolean mode320 = (mainBlock.masterMode & 0x80) == 0; int max = mainBlock.unpackedSize[line]; - if (mode320) + if (mode320) // two pixels per col { - for (int i = 0; i < max; i++) // two pixels per col + for (int i = 0; i < max; i++) { int left = (buffer[ptr] & 0xF0) >> 4; int right = buffer[ptr++] & 0x0F; @@ -146,9 +146,9 @@ public class SHRPictureFile1 extends HiResImage element2 = draw (dataBuffer, element2, rgbLeft, rgbLeft, rgbRight, rgbRight); } } - else + else // four pixels per col { - for (int i = 0; i < max; i++) // four pixels per col + for (int i = 0; i < max; i++) { int p1 = (buffer[ptr] & 0xC0) >> 6; int p2 = (buffer[ptr] & 0x30) >> 4; diff --git a/src/com/bytezone/diskbrowser/applefile/SHRPictureFile2.java b/src/com/bytezone/diskbrowser/applefile/SHRPictureFile2.java index 122b0bf..5c4904d 100644 --- a/src/com/bytezone/diskbrowser/applefile/SHRPictureFile2.java +++ b/src/com/bytezone/diskbrowser/applefile/SHRPictureFile2.java @@ -218,9 +218,9 @@ public class SHRPictureFile2 extends HiResImage else colorTable = colorTables[line]; - if (mode320) + if (mode320) // two pixels per col { - for (int col = 0; col < 160; col++) // two pixels per col + for (int col = 0; col < 160; col++) { int left = (buffer[ptr] & 0xF0) >> 4; int right = buffer[ptr++] & 0x0F; @@ -232,12 +232,10 @@ public class SHRPictureFile2 extends HiResImage element1 = draw (dataBuffer, element1, rgbLeft, rgbLeft, rgbRight, rgbRight); element2 = draw (dataBuffer, element2, rgbLeft, rgbLeft, rgbRight, rgbRight); } - element1 += 640; // skip line already drawn - element2 += 640; // one line ahead } - else // mode640 + else // four pixels per col { - for (int col = 0; col < 160; col++) // four pixels per col + for (int col = 0; col < 160; col++) { int p1 = (buffer[ptr] & 0xC0) >> 6; int p2 = (buffer[ptr] & 0x30) >> 4; @@ -253,9 +251,9 @@ public class SHRPictureFile2 extends HiResImage element1 = draw (dataBuffer, element1, rgb1, rgb2, rgb3, rgb4); element2 = draw (dataBuffer, element2, rgb1, rgb2, rgb3, rgb4); } - element1 += 640; // skip line already drawn - element2 += 640; // one line ahead } + element1 += 640; // skip line already drawn + element2 += 640; // one line ahead } }