Mercurial > audlegacy-plugins
changeset 120:7ce296248b5c trunk
[svn] 669 is 2-byte, not 4-byte. Thanks to a report from Kevin Korb on #audacious.
| author | chainsaw |
|---|---|
| date | Wed, 25 Oct 2006 13:41:36 -0700 |
| parents | b8fd91c53d9b |
| children | b59bca84e3cd |
| files | ChangeLog src/modplug/modplugbmp.cxx src/modplug/modplugbmp.h |
| diffstat | 3 files changed, 10 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Oct 25 00:28:43 2006 -0700 +++ b/ChangeLog Wed Oct 25 13:41:36 2006 -0700 @@ -1,3 +1,11 @@ +2006-10-25 07:28:43 +0000 William Pitcock <nenolod@nenolod.net> + revision [238] + - typo :< + + trunk/mk/rules.mk.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + + 2006-10-25 07:02:27 +0000 William Pitcock <nenolod@nenolod.net> revision [236] - link against needed libs
--- a/src/modplug/modplugbmp.cxx Wed Oct 25 00:28:43 2006 -0700 +++ b/src/modplug/modplugbmp.cxx Wed Oct 25 13:41:36 2006 -0700 @@ -111,7 +111,7 @@ vfs_fclose(file); return 1; } - if (!memcmp(magic, M669_MAGIC, 4)) { + if (!memcmp(magic, M669_MAGIC, 2)) { vfs_fclose(file); return 1; }
--- a/src/modplug/modplugbmp.h Wed Oct 25 00:28:43 2006 -0700 +++ b/src/modplug/modplugbmp.h Wed Oct 25 13:41:36 2006 -0700 @@ -37,7 +37,7 @@ /* These nicer formats have the magic bytes at the front of the file where they belong */ #define UMX_MAGIC (unsigned char [4]) { 0xC1, 0x83, 0x2A, 0x9E } #define XM_MAGIC (unsigned char [4]) { 0x45, 0x78, 0x74, 0x65 } /* Exte(nded Module) */ -#define M669_MAGIC (unsigned char [4]) { 0x69, 0x66, 0x20, 0x20 } +#define M669_MAGIC (unsigned char [4]) { 0x69, 0x66, 0x20, 0x20 } /* Last two bytes are bogus, and not checked */ #define IT_MAGIC (unsigned char [4]) { 0x49, 0x4D, 0x50, 0x4D } /* IMPM */ #define MTM_MAGIC (unsigned char [4]) { 0x4D, 0x54, 0x4D, 0x10 } #define PSM_MAGIC (unsigned char [4]) { 0x50, 0x53, 0x4D, 0x20 }