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

BBitmap: Archive the data also if "deep" is not set

Browse Source 
Fixes #12326
This commit is contained in:
Stefano Ceccherini
2015-08-24 10:21:31 +02:00
parent 65b4405ecc
commit 2f41383c3b
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/interface/Bitmap.cpp
+8 -9
View File
@@ -429,16 +429,15 @@ BBitmap::Archive(BMessage* data, bool deep) const
break; break;
} }
} }
// Note: R5 does not archive the data if B_BITMAP_IS_CONTIGUOUS is
// true and it does save all formats as B_RAW_TYPE and it does save
// the data even if B_BITMAP_ACCEPTS_VIEWS is set (as opposed to
// the BeBook)
if (ret == B_OK) {
const_cast<BBitmap*>(this)->_AssertPointer();
ret = data->AddData("_data", B_RAW_TYPE, fBasePointer, fSize);
}
} }
// Note: R5 does not archive the data if B_BITMAP_IS_CONTIGUOUS is
// true and it does save all formats as B_RAW_TYPE and it does save
// the data even if B_BITMAP_ACCEPTS_VIEWS is set (as opposed to
// the BeBook)
if (ret == B_OK) {
const_cast<BBitmap*>(this)->_AssertPointer();
ret = data->AddData("_data", B_RAW_TYPE, fBasePointer, fSize);
}
return ret; return ret;
} }