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

Fix a confusion with the big-endian versus little endian saving of the

Browse Source 
magic four bytes to recognize native (BMessage-based) icons. The file
recognition rule didn't work in the end.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@27951 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus
2008-10-10 18:41:57 +00:00
parent ea93f584ad
commit 609bc8ca47
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/icon-o-matic/IconEditorApp.cpp
+1 -1
View File
@@ -740,7 +740,7 @@ IconEditorApp::_InstallDocumentMimeType()
strerror(ret)); strerror(ret));
// set sniffer rule // set sniffer rule
const char* snifferRule = "0.9 ('GSMI')"; const char* snifferRule = "0.9 ('IMSG')";
ret = mime.SetSnifferRule(snifferRule); ret = mime.SetSnifferRule(snifferRule);
if (ret < B_OK) { if (ret < B_OK) {
BString parseError; BString parseError;
src/apps/icon-o-matic/document/Defines.cpp
+1 -1
View File
@@ -7,7 +7,7 @@
*/ */
#include "Defines.h" #include "Defines.h"
const uint32 kNativeIconMagicNumber = 'GSMI'; const uint32 kNativeIconMagicNumber = 'IMSG';
const char* kNativeIconMimeType = "application/x-vnd.Haiku-icon"; const char* kNativeIconMimeType = "application/x-vnd.Haiku-icon";
src/apps/icon-o-matic/import_export/message/MessageExporter.cpp
+1 -1
View File
@@ -104,7 +104,7 @@ MessageExporter::Export(const Icon* icon, BPositionIO* stream)
// later tells us that this file is one of us // later tells us that this file is one of us
if (ret == B_OK) { if (ret == B_OK) {
ssize_t size = sizeof(uint32); ssize_t size = sizeof(uint32);
uint32 magic = B_HOST_TO_LENDIAN_INT32(kNativeIconMagicNumber); uint32 magic = B_HOST_TO_BENDIAN_INT32(kNativeIconMagicNumber);
ssize_t written = stream->Write(&magic, size); ssize_t written = stream->Write(&magic, size);
if (written != size) { if (written != size) {
if (written < 0) if (written < 0)
src/apps/icon-o-matic/import_export/message/MessageImporter.cpp
+1 -1
View File
@@ -59,7 +59,7 @@ MessageImporter::Import(Icon* icon, BPositionIO* stream)
return ret; return ret;
} }
if (B_LENDIAN_TO_HOST_INT32(magic) != kNativeIconMagicNumber) { if (B_BENDIAN_TO_HOST_INT32(magic) != kNativeIconMagicNumber) {
// this might be an old native icon file, where // this might be an old native icon file, where
// we didn't prepend the magic number yet, seek back // we didn't prepend the magic number yet, seek back
if (stream->Seek(position, SEEK_SET) != position) { if (stream->Seek(position, SEEK_SET) != position) {