i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

IconUtils: Style fixes

Browse Source 
* Mostly just renaming variables for clarity and consistency
* whitespace
* fill out #pragma mark's
* indentation
This commit is contained in:
John Scipione
2014-07-17 14:51:33 -04:00
parent 9bbfee0fd5
commit bcd81d91f0
1 changed files with 165 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libs/icon/IconUtils.cpp
+165 -152
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2006-2013, Haiku. All rights reserved. * Copyright 2006-2014 Haiku, Inc. All rights reserved.
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
* *
* Authors: * Authors:
@@ -27,15 +27,20 @@
#include "FlatIconImporter.h" #include "FlatIconImporter.h"
#include "MessageImporter.h" #include "MessageImporter.h"
#ifndef HAIKU_TARGET_PLATFORM_HAIKU #ifndef HAIKU_TARGET_PLATFORM_HAIKU
# define B_MINI_ICON_TYPE 'MICN' # define B_MINI_ICON_TYPE 'MICN'
# define B_LARGE_ICON_TYPE 'ICON' # define B_LARGE_ICON_TYPE 'ICON'
#endif #endif
_USING_ICON_NAMESPACE; _USING_ICON_NAMESPACE;
using std::nothrow; using std::nothrow;
// #pragma mark - Scaling functions
static void static void
scale_bilinear(uint8* bits, int32 srcWidth, int32 srcHeight, int32 dstWidth, scale_bilinear(uint8* bits, int32 srcWidth, int32 srcHeight, int32 dstWidth,
int32 dstHeight, uint32 bpr) int32 dstHeight, uint32 bpr)
@@ -172,13 +177,13 @@ scale2x(const uint8* srcBits, uint8* dstBits, int32 srcWidth, int32 srcHeight,
/* /*
* This implements the AdvanceMAME Scale2x algorithm found on: * This implements the AdvanceMAME Scale2x algorithm found on:
* http://scale2x.sourceforge.net/ * http://scale2x.sourceforge.net/
* *
* It is an incredibly simple and powerful image doubling routine that does * It is an incredibly simple and powerful image doubling routine that does
* an astonishing job of doubling game graphic data while interpolating out * an astonishing job of doubling game graphic data while interpolating out
* the jaggies. * the jaggies.
* *
* Derived from the (public domain) SDL version of the library by Pete * Derived from the (public domain) SDL version of the library by Pete
* Shinners * Shinners.
*/ */
// Assume that both src and dst are 4 BPP (B_RGBA32) // Assume that both src and dst are 4 BPP (B_RGBA32)
@@ -216,13 +221,13 @@ scale3x(const uint8* srcBits, uint8* dstBits, int32 srcWidth, int32 srcHeight,
/* /*
* This implements the AdvanceMAME Scale3x algorithm found on: * This implements the AdvanceMAME Scale3x algorithm found on:
* http://scale2x.sourceforge.net/ * http://scale2x.sourceforge.net/
* *
* It is an incredibly simple and powerful image tripling routine that does * It is an incredibly simple and powerful image tripling routine that does
* an astonishing job of tripling game graphic data while interpolating out * an astonishing job of tripling game graphic data while interpolating out
* the jaggies. * the jaggies.
* *
* Derived from the (public domain) SDL version of the library by Pete * Derived from the (public domain) SDL version of the library by Pete
* Shinners * Shinners.
*/ */
// Assume that both src and dst are 4 BPP (B_RGBA32) // Assume that both src and dst are 4 BPP (B_RGBA32)
@@ -292,91 +297,95 @@ scale4x(const uint8* srcBits, uint8* dstBits, int32 srcWidth, int32 srcHeight,
} }
// #pragma mark - // #pragma mark - GetIcon()
status_t status_t
BIconUtils::GetIcon(BNode* node, const char* vectorIconAttrName, BIconUtils::GetIcon(BNode* node, const char* vectorIconAttrName,
const char* smallIconAttrName, const char* largeIconAttrName, const char* smallIconAttrName, const char* largeIconAttrName,
icon_size size, BBitmap* result) icon_size which, BBitmap* icon)
{ {
if (!result || result->InitCheck()) if (icon == NULL || icon->InitCheck() != B_OK)
return B_BAD_VALUE; return B_BAD_VALUE;
status_t ret = B_ERROR; status_t result = B_ERROR;
switch (icon->ColorSpace()) {
switch (result->ColorSpace()) {
case B_RGBA32: case B_RGBA32:
case B_RGB32: case B_RGB32:
// prefer vector icon // prefer vector icon
ret = GetVectorIcon(node, vectorIconAttrName, result); result = GetVectorIcon(node, vectorIconAttrName, icon);
if (ret < B_OK) { if (result != B_OK) {
// try to fallback to B_CMAP8 icons // try to fallback to B_CMAP8 icons
// (converting to B_RGBA32 is handled) // (converting to B_RGBA32 is handled)
// override size // override size
if (result->Bounds().IntegerWidth() + 1 >= 32) if (icon->Bounds().IntegerWidth() + 1 >= 32)
size = B_LARGE_ICON; which = B_LARGE_ICON;
else else
size = B_MINI_ICON; which = B_MINI_ICON;
ret = GetCMAP8Icon(node, smallIconAttrName, largeIconAttrName, result = GetCMAP8Icon(node, smallIconAttrName, largeIconAttrName,
size, result); which, icon);
} }
break; break;
case B_CMAP8: case B_CMAP8:
// prefer old B_CMAP8 icons // prefer old B_CMAP8 icons
ret = GetCMAP8Icon(node, smallIconAttrName, largeIconAttrName, result = GetCMAP8Icon(node, smallIconAttrName, largeIconAttrName,
size, result); which, icon);
if (ret < B_OK) { if (result != B_OK) {
// try to fallback to vector icon // try to fallback to vector icon
#ifdef HAIKU_TARGET_PLATFORM_HAIKU #ifdef HAIKU_TARGET_PLATFORM_HAIKU
BBitmap temp(result->Bounds(), B_BITMAP_NO_SERVER_LINK, BBitmap temp(icon->Bounds(), B_BITMAP_NO_SERVER_LINK,
B_RGBA32); B_RGBA32);
#else #else
BBitmap temp(result->Bounds(), B_RGBA32); BBitmap temp(icon->Bounds(), B_RGBA32);
#endif #endif
ret = temp.InitCheck(); result = temp.InitCheck();
if (ret < B_OK) if (result != B_OK)
break; break;
ret = GetVectorIcon(node, vectorIconAttrName, &temp);
if (ret < B_OK) result = GetVectorIcon(node, vectorIconAttrName, &temp);
if (result != B_OK)
break; break;
uint32 width = temp.Bounds().IntegerWidth() + 1; uint32 width = temp.Bounds().IntegerWidth() + 1;
uint32 height = temp.Bounds().IntegerHeight() + 1; uint32 height = temp.Bounds().IntegerHeight() + 1;
uint32 bytesPerRow = temp.BytesPerRow(); uint32 bytesPerRow = temp.BytesPerRow();
ret = ConvertToCMAP8((uint8*)temp.Bits(), width, height, result = ConvertToCMAP8((uint8*)temp.Bits(), width, height,
bytesPerRow, result); bytesPerRow, icon);
} }
break; break;
default: default:
printf("BIconUtils::GetIcon() - unsupported colorspace\n"); printf("BIconUtils::GetIcon() - unsupported colorspace\n");
break; break;
} }
return ret; return result;
} }
// #pragma mark - // #pragma mark - GetVectorIcon()
status_t status_t
BIconUtils::GetVectorIcon(BNode* node, const char* attrName, BBitmap* result) BIconUtils::GetVectorIcon(BNode* node, const char* attrName, BBitmap* icon)
{ {
if (!node || node->InitCheck() < B_OK || !attrName) if (node == NULL || node->InitCheck() != B_OK || attrName == NULL
|| *attrName == '\0') {
return B_BAD_VALUE; return B_BAD_VALUE;
}
#if TIME_VECTOR_ICONS #if TIME_VECTOR_ICONS
bigtime_t startTime = system_time(); bigtime_t startTime = system_time();
#endif #endif
// get the attribute info and check type and size of the attr contents // get the attribute info and check type and size of the attr contents
attr_info attrInfo; attr_info attrInfo;
status_t ret = node->GetAttrInfo(attrName, &attrInfo); status_t result = node->GetAttrInfo(attrName, &attrInfo);
if (ret < B_OK) if (result != B_OK)
return ret; return result;
type_code attrType = B_VECTOR_ICON_TYPE; type_code attrType = B_VECTOR_ICON_TYPE;
@@ -399,16 +408,17 @@ bigtime_t startTime = system_time();
return B_ERROR; return B_ERROR;
#if TIME_VECTOR_ICONS #if TIME_VECTOR_ICONS
bigtime_t importTime = system_time(); bigtime_t importTime = system_time();
#endif #endif
ret = GetVectorIcon(buffer, attrInfo.size, result); result = GetVectorIcon(buffer, attrInfo.size, icon);
if (ret < B_OK) if (result != B_OK)
return ret; return result;
#if TIME_VECTOR_ICONS #if TIME_VECTOR_ICONS
bigtime_t finishTime = system_time(); bigtime_t finishTime = system_time();
printf("read: %lld, import: %lld\n", importTime - startTime, finishTime - importTime); printf("read: %lld, import: %lld\n", importTime - startTime,
finishTime - importTime);
#endif #endif
return B_OK; return B_OK;
@@ -416,53 +426,53 @@ printf("read: %lld, import: %lld\n", importTime - startTime, finishTime - import
status_t status_t
BIconUtils::GetVectorIcon(const uint8* buffer, size_t size, BBitmap* result) BIconUtils::GetVectorIcon(const uint8* buffer, size_t size, BBitmap* icon)
{ {
if (!result) if (icon == NULL)
return B_BAD_VALUE; return B_BAD_VALUE;
status_t ret = result->InitCheck(); status_t result = icon->InitCheck();
if (ret < B_OK) if (result != B_OK)
return ret; return result;
BBitmap* temp = result; BBitmap* temp = icon;
ObjectDeleter<BBitmap> deleter; ObjectDeleter<BBitmap> deleter;
if (result->ColorSpace() != B_RGBA32 && result->ColorSpace() != B_RGB32) { if (icon->ColorSpace() != B_RGBA32 && icon->ColorSpace() != B_RGB32) {
temp = new (nothrow) BBitmap(result->Bounds(), temp = new (nothrow) BBitmap(icon->Bounds(),
B_BITMAP_NO_SERVER_LINK, B_RGBA32); B_BITMAP_NO_SERVER_LINK, B_RGBA32);
deleter.SetTo(temp); deleter.SetTo(temp);
if (!temp || temp->InitCheck() != B_OK) if (!temp || temp->InitCheck() != B_OK)
return B_NO_MEMORY; return B_NO_MEMORY;
} }
Icon icon; Icon vector;
ret = icon.InitCheck(); result = vector.InitCheck();
if (ret < B_OK) if (result != B_OK)
return ret; return result;
FlatIconImporter importer; FlatIconImporter importer;
ret = importer.Import(&icon, const_cast<uint8*>(buffer), size); result = importer.Import(&vector, const_cast<uint8*>(buffer), size);
if (ret < B_OK) { if (result != B_OK) {
// try the message based format used by Icon-O-Matic // try the message based format used by Icon-O-Matic
MessageImporter messageImporter; MessageImporter messageImporter;
BMemoryIO memoryIO(const_cast<uint8*>(buffer), size); BMemoryIO memoryIO(const_cast<uint8*>(buffer), size);
ret = messageImporter.Import(&icon, &memoryIO); result = messageImporter.Import(&vector, &memoryIO);
if (ret < B_OK) if (result != B_OK)
return ret; return result;
} }
IconRenderer renderer(temp); IconRenderer renderer(temp);
renderer.SetIcon(&icon); renderer.SetIcon(&vector);
renderer.SetScale((temp->Bounds().Width() + 1.0) / 64.0); renderer.SetScale((temp->Bounds().Width() + 1.0) / 64.0);
renderer.Render(); renderer.Render();
if (temp != result) { if (temp != icon) {
uint8* src = (uint8*)temp->Bits(); uint8* src = (uint8*)temp->Bits();
uint32 width = temp->Bounds().IntegerWidth() + 1; uint32 width = temp->Bounds().IntegerWidth() + 1;
uint32 height = temp->Bounds().IntegerHeight() + 1; uint32 height = temp->Bounds().IntegerHeight() + 1;
uint32 srcBPR = temp->BytesPerRow(); uint32 srcBPR = temp->BytesPerRow();
ret = ConvertToCMAP8(src, width, height, srcBPR, result); result = ConvertToCMAP8(src, width, height, srcBPR, icon);
} }
// TODO: would be nice to get rid of this // TODO: would be nice to get rid of this
@@ -471,69 +481,74 @@ BIconUtils::GetVectorIcon(const uint8* buffer, size_t size, BBitmap* result)
// transparent colors are "black" in all existing icons // transparent colors are "black" in all existing icons
// lighter transparent colors should be too dark if // lighter transparent colors should be too dark if
// app_server uses correct blending // app_server uses correct blending
// renderer.Demultiply(); //renderer.Demultiply();
return ret; return result;
} }
// #pragma mark - // #pragma mark - GetCMAP8Icon()
status_t status_t
BIconUtils::GetCMAP8Icon(BNode* node, const char* smallIconAttrName, BIconUtils::GetCMAP8Icon(BNode* node, const char* smallIconAttrName,
const char* largeIconAttrName, icon_size size, BBitmap* icon) const char* largeIconAttrName, icon_size which, BBitmap* icon)
{ {
// check parameters and initialization // check parameters and initialization
if (!icon || icon->InitCheck() != B_OK if (icon == NULL || icon->InitCheck() != B_OK
|| !node || node->InitCheck() != B_OK || node == NULL || node->InitCheck() != B_OK
|| !smallIconAttrName || !largeIconAttrName) || smallIconAttrName == NULL || largeIconAttrName == NULL) {
return B_BAD_VALUE; return B_BAD_VALUE;
}
status_t ret = B_OK; status_t result = B_OK;
// NOTE: this might be changed if other icon // NOTE: this might be changed if other icon
// sizes are supported in B_CMAP8 attributes, // sizes are supported in B_CMAP8 attributes,
// but this is currently not the case, so we // but this is currently not the case, so we
// relax the requirement to pass an icon // relax the requirement to pass an icon
// of just the right size // of just the right size
if (size < B_LARGE_ICON) if (which < B_LARGE_ICON)
size = B_MINI_ICON; which = B_MINI_ICON;
else else
size = B_LARGE_ICON; which = B_LARGE_ICON;
// set some icon size related variables // set some icon size related variables
const char *attribute = NULL; const char* attribute = NULL;
BRect bounds; BRect bounds;
uint32 attrType = 0; uint32 attrType = 0;
size_t attrSize = 0; off_t attrSize = 0;
switch (size) { switch (which) {
case B_MINI_ICON: case B_MINI_ICON:
attribute = smallIconAttrName; attribute = smallIconAttrName;
bounds.Set(0, 0, 15, 15); bounds.Set(0, 0, 15, 15);
attrType = B_MINI_ICON_TYPE; attrType = B_MINI_ICON_TYPE;
attrSize = 16 * 16; attrSize = 16 * 16;
break; break;
case B_LARGE_ICON: case B_LARGE_ICON:
attribute = largeIconAttrName; attribute = largeIconAttrName;
bounds.Set(0, 0, 31, 31); bounds.Set(0, 0, 31, 31);
attrType = B_LARGE_ICON_TYPE; attrType = B_LARGE_ICON_TYPE;
attrSize = 32 * 32; attrSize = 32 * 32;
break; break;
default: default:
// can not happen, see above // can not happen, see above
ret = B_BAD_VALUE; result = B_BAD_VALUE;
break; break;
} }
// get the attribute info and check type and size of the attr contents // get the attribute info and check type and size of the attr contents
attr_info attrInfo; attr_info attrInfo;
if (ret == B_OK) if (result == B_OK)
ret = node->GetAttrInfo(attribute, &attrInfo); result = node->GetAttrInfo(attribute, &attrInfo);
if (ret == B_OK && attrInfo.type != attrType)
ret = B_BAD_TYPE; if (result == B_OK && attrInfo.type != attrType)
if (ret == B_OK && attrInfo.size != attrSize) result = B_BAD_TYPE;
ret = B_BAD_DATA;
if (result == B_OK && attrInfo.size != attrSize)
result = B_BAD_DATA;
// check parameters // check parameters
// currently, scaling B_CMAP8 icons is not supported // currently, scaling B_CMAP8 icons is not supported
@@ -541,113 +556,116 @@ BIconUtils::GetCMAP8Icon(BNode* node, const char* smallIconAttrName,
return B_BAD_VALUE; return B_BAD_VALUE;
// read the attribute // read the attribute
if (ret == B_OK) { if (result == B_OK) {
bool tempBuffer = (icon->ColorSpace() != B_CMAP8 bool useBuffer = (icon->ColorSpace() != B_CMAP8
|| icon->Bounds() != bounds); || icon->Bounds() != bounds);
uint8* buffer = NULL; uint8* buffer = NULL;
ssize_t read; ssize_t read;
if (tempBuffer) { if (useBuffer) {
// other color space or bitmap size than stored in attribute // other color space or bitmap size than stored in attribute
buffer = new(nothrow) uint8[attrSize]; buffer = new(nothrow) uint8[attrSize];
if (!buffer) { if (buffer == NULL)
ret = B_NO_MEMORY; result = B_NO_MEMORY;
} else { else
read = node->ReadAttr(attribute, attrType, 0, buffer, attrSize); read = node->ReadAttr(attribute, attrType, 0, buffer, attrSize);
}
} else { } else {
read = node->ReadAttr(attribute, attrType, 0, icon->Bits(), read = node->ReadAttr(attribute, attrType, 0, icon->Bits(),
attrSize); attrSize);
} }
if (ret == B_OK) {
if (result == B_OK) {
if (read < 0) if (read < 0)
ret = read; result = read;
else if (read != (ssize_t)attrSize) else if (read != (ssize_t)attrSize)
ret = B_ERROR; result = B_ERROR;
} }
if (tempBuffer) {
if (useBuffer) {
// other color space than stored in attribute // other color space than stored in attribute
if (ret == B_OK) { if (result == B_OK) {
ret = ConvertFromCMAP8(buffer, (uint32)size, (uint32)size, result = ConvertFromCMAP8(buffer, (uint32)which, (uint32)which,
(uint32)size, icon); (uint32)which, icon);
} }
delete[] buffer; delete[] buffer;
} }
} }
return ret;
return result;
} }
// #pragma mark - // #pragma mark - ConvertFromCMAP8() and ConvertToCMAP8()
status_t status_t
BIconUtils::ConvertFromCMAP8(BBitmap* source, BBitmap* result) BIconUtils::ConvertFromCMAP8(BBitmap* source, BBitmap* destination)
{ {
if (source == NULL || source->ColorSpace() != B_CMAP8) if (source == NULL || source->ColorSpace() != B_CMAP8)
return B_BAD_VALUE; return B_BAD_VALUE;
status_t status = source->InitCheck(); status_t result = source->InitCheck();
if (status < B_OK) if (result != B_OK)
return status; return result;
status = result->InitCheck(); result = destination->InitCheck();
if (status < B_OK) if (result != B_OK)
return status; return result;
uint8* src = (uint8*)source->Bits(); uint8* src = (uint8*)source->Bits();
uint32 srcBPR = source->BytesPerRow(); uint32 srcBPR = source->BytesPerRow();
uint32 width = source->Bounds().IntegerWidth() + 1; uint32 width = source->Bounds().IntegerWidth() + 1;
uint32 height = source->Bounds().IntegerHeight() + 1; uint32 height = source->Bounds().IntegerHeight() + 1;
return ConvertFromCMAP8(src, width, height, srcBPR, result); return ConvertFromCMAP8(src, width, height, srcBPR, destination);
} }
status_t status_t
BIconUtils::ConvertToCMAP8(BBitmap* source, BBitmap* result) BIconUtils::ConvertToCMAP8(BBitmap* source, BBitmap* destination)
{ {
if (source == NULL || source->ColorSpace() != B_RGBA32 if (source == NULL || source->ColorSpace() != B_RGBA32
|| result->ColorSpace() != B_CMAP8) || destination->ColorSpace() != B_CMAP8) {
return B_BAD_VALUE; return B_BAD_VALUE;
}
status_t status = source->InitCheck(); status_t result = source->InitCheck();
if (status < B_OK) if (result != B_OK)
return status; return result;
status = result->InitCheck(); result = destination->InitCheck();
if (status < B_OK) if (result != B_OK)
return status; return result;
uint8* src = (uint8*)source->Bits(); uint8* src = (uint8*)source->Bits();
uint32 srcBPR = source->BytesPerRow(); uint32 srcBPR = source->BytesPerRow();
uint32 width = source->Bounds().IntegerWidth() + 1; uint32 width = source->Bounds().IntegerWidth() + 1;
uint32 height = source->Bounds().IntegerHeight() + 1; uint32 height = source->Bounds().IntegerHeight() + 1;
return ConvertToCMAP8(src, width, height, srcBPR, result); return ConvertToCMAP8(src, width, height, srcBPR, destination);
} }
status_t status_t
BIconUtils::ConvertFromCMAP8(const uint8* src, uint32 width, uint32 height, BIconUtils::ConvertFromCMAP8(const uint8* src, uint32 width, uint32 height,
uint32 srcBPR, BBitmap* result) uint32 srcBPR, BBitmap* icon)
{ {
if (src == NULL || result == NULL || srcBPR == 0) if (src == NULL || icon == NULL || srcBPR == 0)
return B_BAD_VALUE; return B_BAD_VALUE;
status_t ret = result->InitCheck(); status_t result = icon->InitCheck();
if (ret < B_OK) if (result != B_OK)
return ret; return result;
if (result->ColorSpace() != B_RGBA32 && result->ColorSpace() != B_RGB32) { if (icon->ColorSpace() != B_RGBA32 && icon->ColorSpace() != B_RGB32) {
// TODO: support other color spaces // TODO: support other color spaces
return B_BAD_VALUE; return B_BAD_VALUE;
} }
uint32 dstWidth = result->Bounds().IntegerWidth() + 1; uint32 dstWidth = icon->Bounds().IntegerWidth() + 1;
uint32 dstHeight = result->Bounds().IntegerHeight() + 1; uint32 dstHeight = icon->Bounds().IntegerHeight() + 1;
uint8* dst = (uint8*)result->Bits(); uint8* dst = (uint8*)icon->Bits();
uint32 dstBPR = result->BytesPerRow(); uint32 dstBPR = icon->BytesPerRow();
// check for downscaling or integer multiple scaling // check for downscaling or integer multiple scaling
if (dstWidth < width || dstHeight < height if (dstWidth < width || dstHeight < height
@@ -655,7 +673,7 @@ BIconUtils::ConvertFromCMAP8(const uint8* src, uint32 width, uint32 height,
|| (dstWidth == 3 * width && dstHeight == 3 * height) || (dstWidth == 3 * width && dstHeight == 3 * height)
|| (dstWidth == 4 * width && dstHeight == 4 * height)) { || (dstWidth == 4 * width && dstHeight == 4 * height)) {
BBitmap* converted = new BBitmap(BRect(0, 0, width - 1, height - 1), BBitmap* converted = new BBitmap(BRect(0, 0, width - 1, height - 1),
result->ColorSpace()); icon->ColorSpace());
converted->ImportBits(src, height * srcBPR, srcBPR, 0, B_CMAP8); converted->ImportBits(src, height * srcBPR, srcBPR, 0, B_CMAP8);
uint8* convertedBits = (uint8*)converted->Bits(); uint8* convertedBits = (uint8*)converted->Bits();
int32 convertedBPR = converted->BytesPerRow(); int32 convertedBPR = converted->BytesPerRow();
@@ -706,7 +724,7 @@ BIconUtils::ConvertFromCMAP8(const uint8* src, uint32 width, uint32 height,
&& dstWidth < 2 * width && dstHeight < 2 * height) { && dstWidth < 2 * width && dstHeight < 2 * height) {
// scale2x then downscale // scale2x then downscale
BBitmap* temp = new BBitmap(BRect(0, 0, width * 2 - 1, height * 2 - 1), BBitmap* temp = new BBitmap(BRect(0, 0, width * 2 - 1, height * 2 - 1),
result->ColorSpace()); icon->ColorSpace());
uint8* tempBits = (uint8*)temp->Bits(); uint8* tempBits = (uint8*)temp->Bits();
uint32 tempBPR = temp->BytesPerRow(); uint32 tempBPR = temp->BytesPerRow();
scale2x(dst, tempBits, width, height, dstBPR, tempBPR); scale2x(dst, tempBits, width, height, dstBPR, tempBPR);
@@ -716,7 +734,7 @@ BIconUtils::ConvertFromCMAP8(const uint8* src, uint32 width, uint32 height,
&& dstWidth < 3 * width && dstHeight < 3 * height) { && dstWidth < 3 * width && dstHeight < 3 * height) {
// scale3x then downscale // scale3x then downscale
BBitmap* temp = new BBitmap(BRect(0, 0, width * 3 - 1, height * 3 - 1), BBitmap* temp = new BBitmap(BRect(0, 0, width * 3 - 1, height * 3 - 1),
result->ColorSpace()); icon->ColorSpace());
uint8* tempBits = (uint8*)temp->Bits(); uint8* tempBits = (uint8*)temp->Bits();
uint32 tempBPR = temp->BytesPerRow(); uint32 tempBPR = temp->BytesPerRow();
scale3x(dst, tempBits, width, height, dstBPR, tempBPR); scale3x(dst, tempBits, width, height, dstBPR, tempBPR);
@@ -726,7 +744,7 @@ BIconUtils::ConvertFromCMAP8(const uint8* src, uint32 width, uint32 height,
&& dstWidth < 4 * width && dstHeight < 4 * height) { && dstWidth < 4 * width && dstHeight < 4 * height) {
// scale4x then downscale // scale4x then downscale
BBitmap* temp = new BBitmap(BRect(0, 0, width * 4 - 1, height * 4 - 1), BBitmap* temp = new BBitmap(BRect(0, 0, width * 4 - 1, height * 4 - 1),
result->ColorSpace()); icon->ColorSpace());
uint8* tempBits = (uint8*)temp->Bits(); uint8* tempBits = (uint8*)temp->Bits();
uint32 tempBPR = temp->BytesPerRow(); uint32 tempBPR = temp->BytesPerRow();
scale4x(dst, tempBits, width, height, dstBPR, tempBPR); scale4x(dst, tempBits, width, height, dstBPR, tempBPR);
@@ -735,11 +753,11 @@ BIconUtils::ConvertFromCMAP8(const uint8* src, uint32 width, uint32 height,
} else if (dstWidth > 4 * width && dstHeight > 4 * height) { } else if (dstWidth > 4 * width && dstHeight > 4 * height) {
// scale4x then bilinear // scale4x then bilinear
BBitmap* temp = new BBitmap(BRect(0, 0, width * 4 - 1, height * 4 - 1), BBitmap* temp = new BBitmap(BRect(0, 0, width * 4 - 1, height * 4 - 1),
result->ColorSpace()); icon->ColorSpace());
uint8* tempBits = (uint8*)temp->Bits(); uint8* tempBits = (uint8*)temp->Bits();
uint32 tempBPR = temp->BytesPerRow(); uint32 tempBPR = temp->BytesPerRow();
scale4x(dst, tempBits, width, height, dstBPR, tempBPR); scale4x(dst, tempBits, width, height, dstBPR, tempBPR);
result->ImportBits(tempBits, height * tempBPR, tempBPR, 0, icon->ImportBits(tempBits, height * tempBPR, tempBPR, 0,
temp->ColorSpace()); temp->ColorSpace());
scale_bilinear(dst, width, height, dstWidth, dstHeight, dstBPR); scale_bilinear(dst, width, height, dstWidth, dstHeight, dstBPR);
delete temp; delete temp;
@@ -754,38 +772,35 @@ BIconUtils::ConvertFromCMAP8(const uint8* src, uint32 width, uint32 height,
status_t status_t
BIconUtils::ConvertToCMAP8(const uint8* src, uint32 width, uint32 height, BIconUtils::ConvertToCMAP8(const uint8* src, uint32 width, uint32 height,
uint32 srcBPR, BBitmap* result) uint32 srcBPR, BBitmap* icon)
{ {
if (!src || !result || srcBPR == 0) if (src == NULL || icon == NULL || srcBPR == 0)
return B_BAD_VALUE; return B_BAD_VALUE;
status_t ret = result->InitCheck(); status_t result = icon->InitCheck();
if (ret < B_OK) if (result != B_OK)
return ret; return result;
if (result->ColorSpace() != B_CMAP8) if (icon->ColorSpace() != B_CMAP8)
return B_BAD_VALUE; return B_BAD_VALUE;
uint32 dstWidth = result->Bounds().IntegerWidth() + 1; uint32 dstWidth = icon->Bounds().IntegerWidth() + 1;
uint32 dstHeight = result->Bounds().IntegerHeight() + 1; uint32 dstHeight = icon->Bounds().IntegerHeight() + 1;
if (dstWidth < width || dstHeight < height) { if (dstWidth < width || dstHeight < height) {
// TODO: down scaling // TODO: down scaling
return B_ERROR; return B_ERROR;
} else if (dstWidth > width || dstHeight > height) { } else if (dstWidth > width || dstHeight > height) {
// TODO: up scaling // TODO: up scaling
// (currently copies bitmap into result at left-top) // (currently copies bitmap into icon at left-top)
memset(result->Bits(), 255, result->BitsLength()); memset(icon->Bits(), 255, icon->BitsLength());
} }
//#if __HAIKU__ //#if __HAIKU__
// // return icon->ImportBits(src, height * srcBPR, srcBPR, 0, B_RGBA32);
// return result->ImportBits(src, height * srcBPR, srcBPR, 0, B_RGBA32);
//
//#else //#else
uint8* dst = (uint8*)icon->Bits();
uint8* dst = (uint8*)result->Bits(); uint32 dstBPR = icon->BytesPerRow();
uint32 dstBPR = result->BytesPerRow();
const color_map* colorMap = system_colors(); const color_map* colorMap = system_colors();
if (colorMap == NULL) if (colorMap == NULL)
@@ -812,16 +827,14 @@ memset(result->Bits(), 255, result->BitsLength());
} }
return B_OK; return B_OK;
//#endif // __HAIKU__ //#endif // __HAIKU__
} }
// #pragma mark - forbidden // #pragma mark - Forbidden
BIconUtils::BIconUtils() {} BIconUtils::BIconUtils() {}
BIconUtils::~BIconUtils() {} BIconUtils::~BIconUtils() {}
BIconUtils::BIconUtils(const BIconUtils&) {} BIconUtils::BIconUtils(const BIconUtils&) {}
BIconUtils& BIconUtils::operator=(const BIconUtils&) { return *this; } BIconUtils& BIconUtils::operator=(const BIconUtils&) { return *this; }