[OMPT-svn-commit] SF.net SVN: modplug:[847] trunk/OpenMPT/soundlib/Sndfile.cpp

[<sag...@us...>]

Revision: 847
          http://modplug.svn.sourceforge.net/modplug/?rev=847&view=rev
Author:   saga-games
Date:     2011-04-11 19:53:15 +0000 (Mon, 11 Apr 2011)

Log Message:
-----------
This was supposed to be commited as well.

Modified Paths:
--------------
    trunk/OpenMPT/soundlib/Sndfile.cpp

Modified: trunk/OpenMPT/soundlib/Sndfile.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Sndfile.cpp	2011-04-11 19:50:20 UTC (rev 846)
+++ trunk/OpenMPT/soundlib/Sndfile.cpp	2011-04-11 19:53:15 UTC (rev 847)
@@ -66,7 +66,7 @@
 // External decompressors
 extern void AMSUnpack(const char *psrc, UINT inputlen, char *pdest, UINT dmax, char packcharacter);
 extern WORD MDLReadBits(DWORD &bitbuf, UINT &bitnum, LPBYTE &ibuf, CHAR n);
-extern int DMFUnpack(LPBYTE psample, LPBYTE ibuf, LPBYTE ibufmax, UINT maxlen);
+extern int DMFUnpack(LPBYTE psample, uint8 *ibuf, uint8 *ibufmax, UINT maxlen);
 extern DWORD ITReadBits(DWORD &bitbuf, UINT &bitnum, LPBYTE &ibuf, CHAR n);
 extern void ITUnpack8Bit(LPSTR pSample, DWORD dwLen, LPBYTE lpMemFile, DWORD dwMemLength, BOOL b215);
 extern void ITUnpack16Bit(LPSTR pSample, DWORD dwLen, LPBYTE lpMemFile, DWORD dwMemLength, BOOL b215);
@@ -2288,7 +2288,7 @@
 		{
 			UINT maxlen = pSmp->nLength;
 			if (pSmp->uFlags & CHN_16BIT) maxlen <<= 1;
-			LPBYTE ibuf = (LPBYTE)lpMemFile, ibufmax = (LPBYTE)(lpMemFile+dwMemLength);
+			uint8 *ibuf = (uint8 *)lpMemFile, *ibufmax = (uint8 *)(lpMemFile + dwMemLength);
 			len = DMFUnpack((LPBYTE)pSmp->pSample, ibuf, ibufmax, maxlen);
 		}
 		break;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.