From 290bc091c79a3bb397b5b4e715a1dcf7c9997042 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 28 Jun 2005 11:54:48 +0000 Subject: [PATCH] We use B_BITMAP_NO_SERVER_LINK BBitmaps internally now. This should remove the only app_server dependency the registrar has before shutdown. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@13307 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kits/storage/AppFileInfo.cpp | 2 +- src/kits/storage/NodeInfo.cpp | 2 +- src/kits/storage/mime/CreateAppMetaMimeThread.cpp | 2 +- src/kits/storage/mime/database_access.cpp | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/kits/storage/AppFileInfo.cpp b/src/kits/storage/AppFileInfo.cpp index d1738e8bf3..11b995af64 100644 --- a/src/kits/storage/AppFileInfo.cpp +++ b/src/kits/storage/AppFileInfo.cpp @@ -906,7 +906,7 @@ BAppFileInfo::SetIconForType(const char *type, const BBitmap *icon, if (icon) { bool otherColorSpace = (icon->ColorSpace() != B_CMAP8); if (otherColorSpace) { - BBitmap bitmap(bounds, B_CMAP8); + BBitmap bitmap(bounds, B_BITMAP_NO_SERVER_LINK, B_CMAP8); error = bitmap.InitCheck(); if (error == B_OK) error = bitmap.ImportBits(icon); diff --git a/src/kits/storage/NodeInfo.cpp b/src/kits/storage/NodeInfo.cpp index d7f7fc7824..4de38c84de 100644 --- a/src/kits/storage/NodeInfo.cpp +++ b/src/kits/storage/NodeInfo.cpp @@ -356,7 +356,7 @@ BNodeInfo::SetIcon(const BBitmap *icon, icon_size k) bool otherColorSpace = (icon->ColorSpace() != B_CMAP8); ssize_t written = 0; if (otherColorSpace) { - BBitmap bitmap(bounds, B_CMAP8); + BBitmap bitmap(bounds, B_BITMAP_NO_SERVER_LINK, B_CMAP8); error = bitmap.InitCheck(); if (error == B_OK) error = bitmap.ImportBits(icon); diff --git a/src/kits/storage/mime/CreateAppMetaMimeThread.cpp b/src/kits/storage/mime/CreateAppMetaMimeThread.cpp index 3e605daac9..894c14b323 100644 --- a/src/kits/storage/mime/CreateAppMetaMimeThread.cpp +++ b/src/kits/storage/mime/CreateAppMetaMimeThread.cpp @@ -38,7 +38,7 @@ CreateAppMetaMimeThread::DoMimeUpdate(const entry_ref *entry, bool *entryIsDir) BMimeType mime; BPath path; attr_info info; - BBitmap miniIcon(BRect(0,0,15,15), B_CMAP8); + BBitmap miniIcon(BRect(0,0,15,15), B_BITMAP_NO_SERVER_LINK, B_CMAP8); BNode typeNode; if (!err) diff --git a/src/kits/storage/mime/database_access.cpp b/src/kits/storage/mime/database_access.cpp index 6e383f7708..8332c8e534 100644 --- a/src/kits/storage/mime/database_access.cpp +++ b/src/kits/storage/mime/database_access.cpp @@ -390,7 +390,8 @@ get_icon_data(const BBitmap *icon, icon_size which, void **data, int32 *dataSize if (!err) { otherColorSpace = (icon->ColorSpace() != B_CMAP8); if (otherColorSpace) { - icon8 = new(std::nothrow) BBitmap(bounds, B_CMAP8); + icon8 = new(std::nothrow) BBitmap(bounds, B_BITMAP_NO_SERVER_LINK, + B_CMAP8); if (!icon8) err = B_NO_MEMORY; if (!err)