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

Replaced applications of BBitmap::SetBits() by BBitmap::ImportBits().

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@978 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2002-09-03 16:57:53 +00:00
parent 7bb1eb8242
commit 76ba3434f8
3 changed files with 16 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/storage/AppFileInfo.cpp
+6 -3
View File
@@ -802,8 +802,10 @@ BAppFileInfo::GetIconForType(const char *type, BBitmap *icon,
error = B_ERROR; error = B_ERROR;
if (otherColorSpace) { if (otherColorSpace) {
// other color space than stored in attribute // other color space than stored in attribute
if (error == B_OK) if (error == B_OK) {
icon->SetBits(buffer, attrSize, 0, B_CMAP8); error = icon->ImportBits(buffer, attrSize, B_ANY_BYTES_PER_ROW,
0, B_CMAP8);
}
delete[] buffer; delete[] buffer;
} }
} }
@@ -889,8 +891,9 @@ BAppFileInfo::SetIconForType(const char *type, const BBitmap *icon,
if (otherColorSpace) { if (otherColorSpace) {
BBitmap bitmap(bounds, B_CMAP8); BBitmap bitmap(bounds, B_CMAP8);
error = bitmap.InitCheck(); error = bitmap.InitCheck();
if (error == B_OK)
error = bitmap.ImportBits(icon);
if (error == B_OK) { if (error == B_OK) {
bitmap.SetBits(icon->Bits(), 0, attrSize, B_CMAP8);
error = _WriteData(attribute, resourceID, attrType, error = _WriteData(attribute, resourceID, attrType,
bitmap.Bits(), attrSize, true); bitmap.Bits(), attrSize, true);
} }
src/kits/storage/NodeInfo.cpp
+6 -3
View File
@@ -283,8 +283,10 @@ BNodeInfo::GetIcon(BBitmap *icon, icon_size k) const
} }
if (otherColorSpace) { if (otherColorSpace) {
// other color space than stored in attribute // other color space than stored in attribute
if (error == B_OK) if (error == B_OK) {
icon->SetBits(buffer, attrSize, 0, B_CMAP8); error = icon->ImportBits(buffer, attrSize, B_ANY_BYTES_PER_ROW,
0, B_CMAP8);
}
delete[] buffer; delete[] buffer;
} }
} }
@@ -351,8 +353,9 @@ BNodeInfo::SetIcon(const BBitmap *icon, icon_size k)
if (otherColorSpace) { if (otherColorSpace) {
BBitmap bitmap(bounds, B_CMAP8); BBitmap bitmap(bounds, B_CMAP8);
error = bitmap.InitCheck(); error = bitmap.InitCheck();
if (error == B_OK)
error = bitmap.ImportBits(icon);
if (error == B_OK) { if (error == B_OK) {
bitmap.SetBits(icon->Bits(), 0, attrSize, B_CMAP8);
written = fNode->WriteAttr(attribute, attrType, 0, written = fNode->WriteAttr(attribute, attrType, 0,
bitmap.Bits(), attrSize); bitmap.Bits(), attrSize);
} }
src/kits/storage/mime/database_access.cpp
+4 -29
View File
@@ -270,8 +270,8 @@ get_icon_for_type(const char *type, const char *fileType, BBitmap *icon,
err = (err == attrSize) ? B_OK : B_FILE_ERROR; err = (err == attrSize) ? B_OK : B_FILE_ERROR;
if (otherColorSpace) { if (otherColorSpace) {
if (!err) { if (!err) {
icon->SetBits(buffer, attrSize, 0, B_CMAP8); err = icon->ImportBits(buffer, attrSize, B_ANY_BYTES_PER_ROW,
err = icon->InitCheck(); 0, B_CMAP8);
} }
delete[] buffer; delete[] buffer;
} }
@@ -374,33 +374,8 @@ get_icon_data(const BBitmap *icon, icon_size which, void **data, int32 *dataSize
icon8 = new(nothrow) BBitmap(bounds, B_CMAP8); icon8 = new(nothrow) BBitmap(bounds, B_CMAP8);
if (!icon8) if (!icon8)
err = B_NO_MEMORY; err = B_NO_MEMORY;
if (!err) { if (!err)
switch (icon->ColorSpace()) { err = icon8->ImportBits(icon);
case B_RGB32:
{
// Set each pixel individually, since SetBits() for B_RGB32 takes
// 24-bit rgb pixel data...
char *bgra = (char*)icon->Bits();
for (int32 i = 0; i*4+3 < icon->BitsLength(); bgra += 4, i++) {
char rgb[3];
rgb[0] = bgra[2]; // red
rgb[1] = bgra[1]; // green
rgb[2] = bgra[0]; // blue
icon8->SetBits(rgb, 3, i, B_RGB32);
}
break;
}
case B_GRAY1:
{
icon8->SetBits(icon->Bits(), icon->BitsLength(), 0, B_GRAY1);
break;
}
default:
err = B_BAD_VALUE;
}
if (!err)
err = icon8->InitCheck(); // I don't think this is actually useful, even if SetBits() fails...
}
if (!err) { if (!err) {
srcData = icon8->Bits(); srcData = icon8->Bits();
*dataSize = icon8->BitsLength(); *dataSize = icon8->BitsLength();