Apple-2-Tools
/
dmolony-DiskBrowser
mirror of https://github.com/dmolony/DiskBrowser.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

added C1/4100

This commit is contained in:
Denis Molony 2024-03-12 17:37:13 +10:00
parent dfc7a68580
commit 8cb682f068
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/com/bytezone/diskbrowser/applefile/HiResImage.java
View File

@ -16,9 +16,10 @@ import com.bytezone.diskbrowser.utilities.Utility;
public abstract class HiResImage extends AbstractFile public abstract class HiResImage extends AbstractFile
// -----------------------------------------------------------------------------------// // -----------------------------------------------------------------------------------//
{ {
static final String[] auxTypes = { "Paintworks Packed SHR Image", "Packed Super Hi-Res Image", static final String[] auxTypes =
"Super Hi-Res Image (Apple Preferred Format)", "Packed QuickDraw II PICT File", { "Paintworks Packed SHR Image", "Packed Super Hi-Res Image",
"Packed Super Hi-Res 3200 color image", "DreamGraphix" }; "Super Hi-Res Image (Apple Preferred Format)", "Packed QuickDraw II PICT File",
"Packed Super Hi-Res 3200 color image", "DreamGraphix" };
static final int COLOR_TABLE_SIZE = 32; static final int COLOR_TABLE_SIZE = 32;
static final int COLOR_TABLE_OFFSET_AUX_0 = 32_256; static final int COLOR_TABLE_OFFSET_AUX_0 = 32_256;
@ -115,7 +116,8 @@ public abstract class HiResImage extends AbstractFile
static PaletteFactory paletteFactory = new PaletteFactory (); static PaletteFactory paletteFactory = new PaletteFactory ();
static final byte[] pngHeader = { (byte) 0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A }; static final byte[] pngHeader =
{ (byte) 0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A };
static boolean colourQuirks; static boolean colourQuirks;
static boolean monochrome; static boolean monochrome;
@ -275,8 +277,8 @@ public abstract class HiResImage extends AbstractFile
{ {
String auxText = ""; String auxText = "";
StringBuilder text = new StringBuilder (); StringBuilder text = new StringBuilder ();
text.append (String.format ("Image File : %s%nFile type : $%02X %s%n", name, fileType, text.append (String.format ("Image File : %s%nFile type : $%02X %s%n", name,
ProdosConstants.fileTypes[fileType])); fileType, ProdosConstants.fileTypes[fileType]));
switch (fileType) switch (fileType)
{ {
@ -393,7 +395,8 @@ public abstract class HiResImage extends AbstractFile
{ {
if (dataBuffer.getSize () < rgbList.length + element) if (dataBuffer.getSize () < rgbList.length + element)
{ {
System.out.printf ("Bollocks: %d %d %d%n", dataBuffer.getSize (), rgbList.length, element); System.out.printf ("Bollocks: %d %d %d%n", dataBuffer.getSize (), rgbList.length,
element);
return element; return element;
} }
@ -462,12 +465,13 @@ public abstract class HiResImage extends AbstractFile
int type = (buffer[ptr] & 0xC0) >>> 6; // 0-3 int type = (buffer[ptr] & 0xC0) >>> 6; // 0-3
int count = (buffer[ptr++] & 0x3F) + 1; // 1-64 int count = (buffer[ptr++] & 0x3F) + 1; // 1-64
text.append (String.format ("%04X/%04d: %02X (%d,%2d) ", ptr - 1, size, buffer[ptr - 1], text.append (String.format ("%04X/%04d: %02X (%d,%2d) ", ptr - 1, size,
type, count)); buffer[ptr - 1], type, count));
if (type == 0) if (type == 0)
{ {
text.append (String.format ("%s%n", HexFormatter.getHexString (buffer, ptr, count))); text.append (
String.format ("%s%n", HexFormatter.getHexString (buffer, ptr, count)));
ptr += count; ptr += count;
size += count; size += count;
} }
@ -651,8 +655,8 @@ public abstract class HiResImage extends AbstractFile
if (buffer.length < 4) if (buffer.length < 4)
return false; return false;
return buffer[0] == (byte) 0xC1 && buffer[1] == (byte) 0xD0 && buffer[2] == (byte) 0xD0 return buffer[0] == (byte) 0xC1 && buffer[1] == (byte) 0xD0
&& buffer[3] == 0; && buffer[2] == (byte) 0xD0 && buffer[3] == 0;
} }
// ---------------------------------------------------------------------------------// // ---------------------------------------------------------------------------------//