HaikuDepot: Fix x86gcc2 build
Change-Id: I12f4982b160e52ed171a3229b5de3555fb50a516 Reviewed-on: https://review.haiku-os.org/c/haiku/+/10244 Reviewed-by: waddlesplash <[email protected]>
This commit is contained in:
@@ -234,7 +234,7 @@ PackageIconTarRepository::GetIcon(const BString& pkgName, uint32 size,
|
|||||||
} else {
|
} else {
|
||||||
off_t iconDataTarOffset = -1;
|
off_t iconDataTarOffset = -1;
|
||||||
const IconTarPtrRef tarPtrRef = _GetIconTarPtr(pkgName);
|
const IconTarPtrRef tarPtrRef = _GetIconTarPtr(pkgName);
|
||||||
BitmapSize storedSize;
|
BitmapSize storedSize = BITMAP_SIZE_ANY;
|
||||||
|
|
||||||
if (tarPtrRef.IsSet()) {
|
if (tarPtrRef.IsSet()) {
|
||||||
storedSize = _BestStoredSize(tarPtrRef, size);
|
storedSize = _BestStoredSize(tarPtrRef, size);
|
||||||
|
|||||||
@@ -13,6 +13,8 @@
|
|||||||
#include <String.h>
|
#include <String.h>
|
||||||
#include <Referenceable.h>
|
#include <Referenceable.h>
|
||||||
|
|
||||||
|
#include "PackageInfo.h"
|
||||||
|
|
||||||
|
|
||||||
enum {
|
enum {
|
||||||
PKG_CHANGED_LOCALIZED_TEXT = 1 << 0,
|
PKG_CHANGED_LOCALIZED_TEXT = 1 << 0,
|
||||||
@@ -28,8 +30,8 @@ enum {
|
|||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
class PackageInfo;
|
//class PackageInfo;
|
||||||
typedef BReference<PackageInfo> PackageInfoRef;
|
//typedef BReference<PackageInfo> PackageInfoRef;
|
||||||
|
|
||||||
|
|
||||||
/*! PackageInfoChangeEvent is akin to the PackageChangeEvent but couples a
|
/*! PackageInfoChangeEvent is akin to the PackageChangeEvent but couples a
|
||||||
|
|||||||
@@ -164,7 +164,7 @@ PackageClassificationInfo::operator!=(const PackageClassificationInfo& other) co
|
|||||||
PackageClassificationInfoBuilder::PackageClassificationInfoBuilder()
|
PackageClassificationInfoBuilder::PackageClassificationInfoBuilder()
|
||||||
:
|
:
|
||||||
fCategories(),
|
fCategories(),
|
||||||
fProminence(-1L),
|
fProminence(PROMINANCE_ORDERING_NONE),
|
||||||
fIsDesktop(false),
|
fIsDesktop(false),
|
||||||
fIsNativeDesktop(false)
|
fIsNativeDesktop(false)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -132,7 +132,7 @@ SharedIcons::_CreateIconForResource(int32 resourceID, uint32 size)
|
|||||||
BitmapHolderRef result(NULL);
|
BitmapHolderRef result(NULL);
|
||||||
|
|
||||||
if (SharedIcons::_CreateIconForResourceChecked(resourceID, size, &result) != B_OK) {
|
if (SharedIcons::_CreateIconForResourceChecked(resourceID, size, &result) != B_OK) {
|
||||||
HDERROR("unable to create bitmap for resource [%d]", resourceID);
|
HDERROR("unable to create bitmap for resource [%" B_PRId32 "]", resourceID);
|
||||||
debugger("unable to create bitmap for resource");
|
debugger("unable to create bitmap for resource");
|
||||||
// the resource is bundled into the build product so not being able to find it is an
|
// the resource is bundled into the build product so not being able to find it is an
|
||||||
// illegal state.
|
// illegal state.
|
||||||
@@ -171,7 +171,7 @@ SharedIcons::_CreateIconForResourceChecked(int32 resourceID, uint32 size,
|
|||||||
data = resources.LoadResource(B_VECTOR_ICON_TYPE, resourceID, &dataSize);
|
data = resources.LoadResource(B_VECTOR_ICON_TYPE, resourceID, &dataSize);
|
||||||
|
|
||||||
if (data == NULL) {
|
if (data == NULL) {
|
||||||
HDERROR("unable to read the resource [%d]", resourceID);
|
HDERROR("unable to read the resource [%" B_PRId32 "]", resourceID);
|
||||||
status = B_ERROR;
|
status = B_ERROR;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -183,7 +183,7 @@ SharedIcons::_CreateIconForResourceChecked(int32 resourceID, uint32 size,
|
|||||||
status = BIconUtils::GetVectorIcon(reinterpret_cast<const uint8*>(data), dataSize, bitmap);
|
status = BIconUtils::GetVectorIcon(reinterpret_cast<const uint8*>(data), dataSize, bitmap);
|
||||||
|
|
||||||
if (status != B_OK) {
|
if (status != B_OK) {
|
||||||
HDERROR("unable to parse the resource [%d] as a vector icon", resourceID);
|
HDERROR("unable to parse the resource [%" B_PRId32 "] as a vector icon", resourceID);
|
||||||
delete bitmap;
|
delete bitmap;
|
||||||
bitmap = NULL;
|
bitmap = NULL;
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
Reference in New Issue
Block a user