From 8e2f0a9a0acc9ed4d3e06d9a6d6a66c4e4aab5e4 Mon Sep 17 00:00:00 2001
From: Matthew Wilber <mwilber@nowhere.fake>
Date: Sun, 25 May 2003 16:44:28 +0000
Subject: [PATCH] added checking and printing of magic number, printing of
 bounding rectangle, changed member names to be more descriptive

git-svn-id: file:///srv/svn/repos/haiku/trunk/current@3317 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/tools/translation/bitsinfo/bitsinfo.cpp | 35 ++++++++++++++-------
 1 file changed, 24 insertions(+), 11 deletions(-)

diff --git a/src/tools/translation/bitsinfo/bitsinfo.cpp b/src/tools/translation/bitsinfo/bitsinfo.cpp
index 46bbd7eb75..7a2c507707 100644
--- a/src/tools/translation/bitsinfo/bitsinfo.cpp
+++ b/src/tools/translation/bitsinfo/bitsinfo.cpp
@@ -59,24 +59,37 @@ PrintBitsInfo(const char *filepath)
 		// read in the rest of the header
 		ssize_t size = sizeof(TranslatorBitmap);
 		if (file.Read(reinterpret_cast<uint8 *> (&header), size) != size) {
-			printf("Error reading from file\n");
+			printf("Error: Unable to read the Be bitmap header.\n");
 			return;
 		}
+		file.Unset();
+			// I don't need the file anymore
+
 		// convert to host byte order
 		if (swap_data(B_UINT32_TYPE, &header, sizeof(TranslatorBitmap),
 			B_SWAP_BENDIAN_TO_HOST) != B_OK) {
-			printf("Unable to swap byte order\n");
+			printf("Error: Unable to swap byte order\n");
 			return;
 		}
 		
-		printf("bits header for: %s\n", filepath);
-		
-		printf("width: %d\n",
-			static_cast<int>(header.bounds.Width() + 1));
-		printf("height: %d\n",
+		printf("Be bitmap (\"bits\") header for: %s\n\n", filepath);
+	
+		const uint32 kbitsmagic = 0x62697473UL;
+			// in ASCII, this number looks like "bits"
+		printf("magic number: 0x%.8lx ", header.magic);
+		if (header.magic == kbitsmagic)
+			printf("(valid)\n");
+		else
+			printf("(INVALID, should be: 0x%.8lx)\n",
+				kbitsmagic);
+		printf("bounds: (%f, %f, %f, %f)\n",
+			header.bounds.left, header.bounds.top,
+			header.bounds.right, header.bounds.bottom);
+		printf("dimensions: %d x %d\n",
+			static_cast<int>(header.bounds.Width() + 1),
 			static_cast<int>(header.bounds.Height() + 1));
 		
-		printf("rowBytes: %u\n",
+		printf("bytes per row: %u\n",
 			static_cast<unsigned int>(header.rowBytes));
 	
 		// print out colorspace if it matches an item in the list
@@ -132,15 +145,15 @@ PrintBitsInfo(const char *filepath)
 		int32 i;
 		for (i = 0; i < kncolorspaces; i++) {
 			if (header.colors == colorspaces[i].id) {
-				printf("colors: %s\n", colorspaces[i].name);
+				printf("color space: %s\n", colorspaces[i].name);
 				break;
 			}
 		}
 		if (i == kncolorspaces)
-			printf("colors: Unknown (0x%.8lx)\n",
+			printf("color space: Unknown (0x%.8lx)\n",
 				static_cast<unsigned long>(header.colors));
 			
-		printf("dataSize: %u\n",
+		printf("data size: %u\n",
 			static_cast<unsigned int>(header.dataSize));
 	} else
 		printf("Error opening %s\n", filepath);