Add 96x96 and 128x128 icon sizes to tracker including scaling of BeOS icons using scale3x and scale4x algorithms.hrev44422

5 files changed, 150 insertions, 5 deletions

diff --git a/src/kits/tracker/ContainerWindow.cpp b/src/kits/tracker/ContainerWindow.cpp
index bc92cb3ca5..33ec87306f 100644
--- a/src/kits/tracker/ContainerWindow.cpp
+++ b/src/kits/tracker/ContainerWindow.cpp
@@ -1997,6 +1997,20 @@ BContainerWindow::AddWindowMenu(BMenu* menu)
 	item->SetTarget(PoseView());
 	iconSizeMenu->AddItem(item);
 
+	message = new BMessage(kIconMode);
+	message->AddInt32("size", 96);
+	item = new BMenuItem(B_TRANSLATE("96 x 96"), message);
+	item->SetMarked(PoseView()->IconSizeInt() == 96);
+	item->SetTarget(PoseView());
+	iconSizeMenu->AddItem(item);
+
+	message = new BMessage(kIconMode);
+	message->AddInt32("size", 128);
+	item = new BMenuItem(B_TRANSLATE("128 x 128"), message);
+	item->SetMarked(PoseView()->IconSizeInt() == 128);
+	item->SetTarget(PoseView());
+	iconSizeMenu->AddItem(item);
+
 	iconSizeMenu->AddSeparatorItem();
 
 	message = new BMessage(kIconMode);
diff --git a/src/kits/tracker/DeskWindow.cpp b/src/kits/tracker/DeskWindow.cpp
index dcd54ba86a..a4ac77579a 100644
--- a/src/kits/tracker/DeskWindow.cpp
+++ b/src/kits/tracker/DeskWindow.cpp
@@ -313,6 +313,20 @@ BDeskWindow::AddWindowContextMenus(BMenu* menu)
 	item->SetTarget(PoseView());
 	iconSizeMenu->AddItem(item);
 
+	message = new BMessage(kIconMode);
+	message->AddInt32("size", 96);
+	item = new BMenuItem(B_TRANSLATE("96 x 96"), message);
+	item->SetMarked(PoseView()->IconSizeInt() == 96);
+	item->SetTarget(PoseView());
+	iconSizeMenu->AddItem(item);
+
+	message = new BMessage(kIconMode);
+	message->AddInt32("size", 128);
+	item = new BMenuItem(B_TRANSLATE("128 x 128"), message);
+	item->SetMarked(PoseView()->IconSizeInt() == 128);
+	item->SetTarget(PoseView());
+	iconSizeMenu->AddItem(item);
+
 	iconSizeMenu->AddSeparatorItem();
 
 	message = new BMessage(kIconMode);
diff --git a/src/kits/tracker/PoseView.cpp b/src/kits/tracker/PoseView.cpp
index 11b0e3ec79..da5746694f 100644
--- a/src/kits/tracker/PoseView.cpp
+++ b/src/kits/tracker/PoseView.cpp
@@ -2171,6 +2171,12 @@ BPoseView::MessageReceived(BMessage* message)
 						case 64:
 							fViewState->SetIconSize(48);
 							break;
+						case 96:
+							fViewState->SetIconSize(64);
+							break;
+						case 128:
+							fViewState->SetIconSize(96);
+							break;
 					}
 				} else if (scale == 1 && (int32)IconSizeInt() != 128) {
 					switch ((int32)IconSizeInt()) {
@@ -2183,11 +2189,17 @@ BPoseView::MessageReceived(BMessage* message)
 						case 48:
 							fViewState->SetIconSize(64);
 							break;
+						case 64:
+							fViewState->SetIconSize(96);
+							break;
+						case 96:
+							fViewState->SetIconSize(128);
+							break;
 					}
 				}
 			} else {
 				int32 iconSize = fViewState->LastIconSize();
-				if (iconSize < 32 || iconSize > 64) {
+				if (iconSize < 32 || iconSize > 128) {
 					// uninitialized last icon size?
 					iconSize = 32;
 				}
diff --git a/src/kits/tracker/ViewState.cpp b/src/kits/tracker/ViewState.cpp
index ae80f1cbcf..8ebaaf6f18 100644
--- a/src/kits/tracker/ViewState.cpp
+++ b/src/kits/tracker/ViewState.cpp
@@ -475,12 +475,12 @@ BViewState::_Sanitize(BViewState* state, bool fixOnly)
 	}
 	if (state->fIconSize < 16)
 		state->fIconSize = 16;
-	if (state->fIconSize > 64)
-		state->fIconSize = 64;
+	if (state->fIconSize > 128)
+		state->fIconSize = 128;
 	if (state->fLastIconSize < 16)
 		state->fLastIconSize = 16;
-	if (state->fLastIconSize > 64)
-		state->fLastIconSize = 64;
+	if (state->fLastIconSize > 128)
+		state->fLastIconSize = 128;
 
 	if (fixOnly)
 		return state;
diff --git a/src/libs/icon/IconUtils.cpp b/src/libs/icon/IconUtils.cpp
index 3acfe5c35e..d9884d5ebc 100644
--- a/src/libs/icon/IconUtils.cpp
+++ b/src/libs/icon/IconUtils.cpp
@@ -145,6 +145,93 @@ scale2x(const uint8* srcBits, uint8* dstBits, int32 srcWidth, int32 srcHeight,
 }
 
 
+static void
+scale3x(const uint8* srcBits, uint8* dstBits, int32 srcWidth, int32 srcHeight,
+	int32 srcBPR, int32 dstBPR)
+{
+	/*
+	 * This implements the AdvanceMAME Scale3x algorithm found on:
+	 * http://scale2x.sourceforge.net/
+	 * 
+	 * It is an incredibly simple and powerful image tripling routine that does
+	 * an astonishing job of tripling game graphic data while interpolating out
+	 * the jaggies.
+	 *
+	 * Derived from the (public domain) SDL version of the library by Pete
+	 * Shinners
+	 */
+
+	// Assume that both src and dst are 4 BPP (B_RGBA32)
+	for(int32 y = 0; y < srcHeight; ++y)
+	{
+		for(int32 x = 0; x < srcWidth; ++x)
+		{
+			uint32 a = *(uint32*)(srcBits + (MAX(0, y - 1) * srcBPR)
+				+ (4 * MAX(0, x - 1)));
+			uint32 b = *(uint32*)(srcBits + (MAX(0, y - 1) * srcBPR)
+				+ (4 * x));
+			uint32 c = *(uint32*)(srcBits + (MAX(0, y - 1) * srcBPR)
+				+ (4 * MIN(srcWidth - 1, x + 1)));
+			uint32 d = *(uint32*)(srcBits + (y * srcBPR)
+				+ (4 * MAX(0, x - 1)));
+			uint32 e = *(uint32*)(srcBits + (y * srcBPR)
+				+ (4 * x));
+			uint32 f = *(uint32*)(srcBits + (y * srcBPR)
+				+ (4 * MIN(srcWidth - 1,x + 1)));
+			uint32 g = *(uint32*)(srcBits + (MIN(srcHeight - 1, y + 1)
+				* srcBPR) + (4 * MAX(0, x - 1)));
+			uint32 h = *(uint32*)(srcBits + (MIN(srcHeight - 1, y + 1)
+				* srcBPR) + (4 * x));
+			uint32 i = *(uint32*)(srcBits + (MIN(srcHeight - 1, y + 1)
+				* srcBPR) + (4 * MIN(srcWidth - 1, x + 1)));
+
+			uint32 e0 = d == b && b != f && d != h ? d : e;
+			uint32 e1 = (d == b && b != f && d != h && e != c)
+				|| (b == f && b != d && f != h && e != a) ? b : e;
+			uint32 e2 = b == f && b != d && f != h ? f : e;
+			uint32 e3 = (d == b && b != f && d != h && e != g)
+				|| (d == b && b != f && d != h && e != a) ? d : e;
+			uint32 e4 = e;
+			uint32 e5 = (b == f && b != d && f != h && e != i)
+				|| (h == f && d != h && b != f && e != c) ? f : e;
+			uint32 e6 = d == h && d != b && h != f ? d : e;
+			uint32 e7 = (d == h && d != b && h != f && e != i)
+				|| (h == f && d != h && b != f && e != g) ? h : e;
+			uint32 e8 = h == f && d != h && b != f ? f : e;
+
+			*(uint32*)(dstBits + y * 3 * dstBPR + x * 3 * 4) = e0;
+			*(uint32*)(dstBits + y * 3 * dstBPR + (x * 3 + 1) * 4) = e1;
+			*(uint32*)(dstBits + y * 3 * dstBPR + (x * 3 + 2) * 4) = e2;
+			*(uint32*)(dstBits + (y * 3 + 1) * dstBPR + x * 3 * 4) = e3;
+			*(uint32*)(dstBits + (y * 3 + 1) * dstBPR + (x * 3 + 1) * 4) = e4;
+			*(uint32*)(dstBits + (y * 3 + 1) * dstBPR + (x * 3 + 2) * 4) = e5;
+			*(uint32*)(dstBits + (y * 3 + 2) * dstBPR + x * 3 * 4) = e6;
+			*(uint32*)(dstBits + (y * 3 + 2) * dstBPR + (x * 3 + 1) * 4) = e7;
+			*(uint32*)(dstBits + (y * 3 + 2) * dstBPR + (x * 3 + 2) * 4) = e8;
+		}
+	}
+}
+
+
+static void
+scale4x(const uint8* srcBits, uint8* dstBits, int32 srcWidth, int32 srcHeight,
+	int32 srcBPR, int32 dstBPR)
+{
+	// scale4x is just scale2x twice
+	BBitmap* tmp = new BBitmap(BRect(0, 0, srcWidth * 2 - 1,
+		srcHeight * 2 - 1), B_RGBA32);
+	uint8* tmpBits = (uint8*)tmp->Bits();
+	int32 tmpBPR = tmp->BytesPerRow();
+
+	scale2x(srcBits, tmpBits, srcWidth, srcHeight, srcBPR, tmpBPR);
+	scale2x(tmpBits, dstBits, srcWidth * 2, srcHeight * 2, tmpBPR, dstBPR);
+
+	delete tmp;
+}
+
+
+
+
 //	#pragma mark -
 
 
@@ -536,6 +623,24 @@ BIconUtils::ConvertFromCMAP8(const uint8* src, uint32 width, uint32 height,
 			int32 convertedBPR = converted->BytesPerRow();
 			scale2x(convertedBits, dst, width, height, convertedBPR, dstBPR);
 			delete converted;
+		} else if (dstWidth == 3 * width && dstHeight == 3 * height) {
+			// scale using the scale3x algorithm
+			BBitmap* converted = new BBitmap(BRect(0, 0, width - 1, height - 1),
+				result->ColorSpace());
+			converted->ImportBits(src, height * srcBPR, srcBPR, 0, B_CMAP8);
+			uint8* convertedBits = (uint8*)converted->Bits();
+			int32 convertedBPR = converted->BytesPerRow();
+			scale3x(convertedBits, dst, width, height, convertedBPR, dstBPR);
+			delete converted;
+		} else if (dstWidth == 4 * width && dstHeight == 4 * height) {
+			// scale using the scale4x algorithm
+			BBitmap* converted = new BBitmap(BRect(0, 0, width - 1, height - 1),
+				result->ColorSpace());
+			converted->ImportBits(src, height * srcBPR, srcBPR, 0, B_CMAP8);
+			uint8* convertedBits = (uint8*)converted->Bits();
+			int32 convertedBPR = converted->BytesPerRow();
+			scale4x(convertedBits, dst, width, height, convertedBPR, dstBPR);
+			delete converted;
 		} else {
 			// bilinear scaling
 			scale_bilinear(dst, width, height, dstWidth, dstHeight, dstBPR);