new gcc snapshot
[dottout.git] / net-im / emesene / files / media-sound / mac / files / mac-precision.patch
blob3b61a1d5df0323a574176429e18b27e99ea5c955
1 --- mac-3.99-u4-b4/src/MACLib/APESimple.cpp.old 2005-11-28 11:10:22.000000000 -0800
2 +++ mac-3.99-u4-b4/src/MACLib/APESimple.cpp 2005-11-28 11:12:04.000000000 -0800
3 @@ -298,7 +298,7 @@
4 if (spTempBuffer == NULL) throw(ERROR_INSUFFICIENT_MEMORY);
6 // get the header
7 - THROW_ON_ERROR(spAPEDecompress->GetInfo(APE_INFO_WAV_HEADER_DATA, (int) spTempBuffer.GetPtr(), spAPEDecompress->GetInfo(APE_INFO_WAV_HEADER_BYTES)));
8 + THROW_ON_ERROR(spAPEDecompress->GetInfo(APE_INFO_WAV_HEADER_DATA, (long) spTempBuffer.GetPtr(), spAPEDecompress->GetInfo(APE_INFO_WAV_HEADER_BYTES)));
10 // initialize the output
11 if (nOutputMode == UNMAC_DECODER_OUTPUT_WAV)
12 @@ -370,7 +370,7 @@
14 spTempBuffer.Assign(new unsigned char[spAPEDecompress->GetInfo(APE_INFO_WAV_TERMINATING_BYTES)], TRUE);
15 if (spTempBuffer == NULL) throw(ERROR_INSUFFICIENT_MEMORY);
16 - THROW_ON_ERROR(spAPEDecompress->GetInfo(APE_INFO_WAV_TERMINATING_DATA, (int) spTempBuffer.GetPtr(), spAPEDecompress->GetInfo(APE_INFO_WAV_TERMINATING_BYTES)))
17 + THROW_ON_ERROR(spAPEDecompress->GetInfo(APE_INFO_WAV_TERMINATING_DATA, (long) spTempBuffer.GetPtr(), spAPEDecompress->GetInfo(APE_INFO_WAV_TERMINATING_BYTES)))
19 unsigned int nBytesToWrite = spAPEDecompress->GetInfo(APE_INFO_WAV_TERMINATING_BYTES);
20 unsigned int nBytesWritten = 0;
21 @@ -392,7 +392,7 @@
22 spTempBuffer.Assign(new unsigned char[nTerminatingBytes], TRUE);
23 if (spTempBuffer == NULL) throw(ERROR_INSUFFICIENT_MEMORY);
25 - THROW_ON_ERROR(spAPEDecompress->GetInfo(APE_INFO_WAV_TERMINATING_DATA, (int) spTempBuffer.GetPtr(), nTerminatingBytes))
26 + THROW_ON_ERROR(spAPEDecompress->GetInfo(APE_INFO_WAV_TERMINATING_DATA, (long) spTempBuffer.GetPtr(), nTerminatingBytes))
28 if (bHasTag)
30 --- mac-3.99-u4-b4/src/MACLib/APEInfo.cpp.old 2005-11-28 11:09:13.000000000 -0800
31 +++ mac-3.99-u4-b4/src/MACLib/APEInfo.cpp 2005-11-28 11:09:51.000000000 -0800
32 @@ -311,7 +311,7 @@
33 break;
35 case APE_INFO_IO_SOURCE:
36 - nRetVal = (int) m_spIO.GetPtr();
37 + nRetVal = (long) m_spIO.GetPtr();
38 break;
39 case APE_INFO_FRAME_BYTES:
41 @@ -350,10 +350,10 @@
42 break;
44 case APE_INFO_TAG:
45 - nRetVal = (int) m_spAPETag.GetPtr();
46 + nRetVal = (long) m_spAPETag.GetPtr();
47 break;
48 case APE_INTERNAL_INFO:
49 - nRetVal = (int) &m_APEFileInfo;
50 + nRetVal = (long) &m_APEFileInfo;
51 break;
52 default:
53 break;
54 --- mac-3.99-u4-b4/src/MACLib/APEDecompress.cpp.old 2005-11-28 11:08:03.000000000 -0800
55 +++ mac-3.99-u4-b4/src/MACLib/APEDecompress.cpp 2005-11-28 11:08:32.000000000 -0800
56 @@ -452,7 +452,7 @@
58 else
60 - WAVEFORMATEX wfeFormat; GetInfo(APE_INFO_WAVEFORMATEX, (int) &wfeFormat, 0);
61 + WAVEFORMATEX wfeFormat; GetInfo(APE_INFO_WAVEFORMATEX, (long) &wfeFormat, 0);
62 WAVE_HEADER WAVHeader; FillWaveHeader(&WAVHeader,
63 (m_nFinishBlock - m_nStartBlock) * GetInfo(APE_INFO_BLOCK_ALIGN),
64 &wfeFormat, 0);
65 --- mac-3.99-u4-b4/src/MACLib/MD5.cpp.old 2005-11-28 11:12:35.000000000 -0800
66 +++ mac-3.99-u4-b4/src/MACLib/MD5.cpp 2005-11-28 11:13:10.000000000 -0800
67 @@ -100,7 +100,7 @@
68 CopyToLittleEndian (tempBuffer, in, 16);
69 x = tempBuffer;
70 #else
71 - if ( (unsigned int)in & 3 ) {
72 + if ( (unsigned long)in & 3 ) {
73 memcpy ( tempBuffer, in, 64 );
74 x = tempBuffer;
76 --- mac-3.99-u4-b4/src/MACLib/Old/APEDecompressOld.cpp.old 2005-11-28 11:05:19.000000000 -0800
77 +++ mac-3.99-u4-b4/src/MACLib/Old/APEDecompressOld.cpp 2005-11-28 11:05:37.000000000 -0800
78 @@ -250,7 +250,7 @@
80 else
82 - WAVEFORMATEX wfeFormat; GetInfo(APE_INFO_WAVEFORMATEX, (int) &wfeFormat, 0);
83 + WAVEFORMATEX wfeFormat; GetInfo(APE_INFO_WAVEFORMATEX, (long) &wfeFormat, 0);
84 WAVE_HEADER WAVHeader; FillWaveHeader(&WAVHeader,
85 (m_nFinishBlock - m_nStartBlock) * GetInfo(APE_INFO_BLOCK_ALIGN),
86 &wfeFormat, 0);
87 --- mac-3.99-u4-b4/src/MACLib/Old/UnMAC.cpp.old 2005-11-28 11:06:57.000000000 -0800
88 +++ mac-3.99-u4-b4/src/MACLib/Old/UnMAC.cpp 2005-11-28 11:07:23.000000000 -0800
89 @@ -78,7 +78,7 @@
90 // set the initialized flag to TRUE
91 m_bInitialized = TRUE;
93 - m_pAPEDecompress->GetInfo(APE_INFO_WAVEFORMATEX, (int) &m_wfeInput);
94 + m_pAPEDecompress->GetInfo(APE_INFO_WAVEFORMATEX, (long) &m_wfeInput);
96 // return a successful value
97 return ERROR_SUCCESS;
98 @@ -197,7 +197,7 @@
100 m_pAPEDecompressCore->GenerateDecodedArrays(nBlocks, nSpecialCodes, FrameIndex, CPULoadBalancingFactor);
102 - WAVEFORMATEX WaveFormatEx; m_pAPEDecompress->GetInfo(APE_INFO_WAVEFORMATEX, (int) &WaveFormatEx);
103 + WAVEFORMATEX WaveFormatEx; m_pAPEDecompress->GetInfo(APE_INFO_WAVEFORMATEX, (long) &WaveFormatEx);
104 m_pPrepare->UnprepareOld(m_pAPEDecompressCore->GetDataX(), m_pAPEDecompressCore->GetDataY(), nBlocks, &WaveFormatEx,
105 pOutputData, (unsigned int *) &CRC, (int *) &nSpecialCodes, m_pAPEDecompress->GetInfo(APE_INFO_FILE_VERSION));
107 @@ -205,7 +205,7 @@
109 m_pAPEDecompressCore->GenerateDecodedArrays(nBlocks, nSpecialCodes, FrameIndex, CPULoadBalancingFactor);
111 - WAVEFORMATEX WaveFormatEx; m_pAPEDecompress->GetInfo(APE_INFO_WAVEFORMATEX, (int) &WaveFormatEx);
112 + WAVEFORMATEX WaveFormatEx; m_pAPEDecompress->GetInfo(APE_INFO_WAVEFORMATEX, (long) &WaveFormatEx);
113 m_pPrepare->UnprepareOld(m_pAPEDecompressCore->GetDataX(), NULL, nBlocks, &WaveFormatEx,
114 pOutputData, (unsigned int *) &CRC, (int *) &nSpecialCodes, m_pAPEDecompress->GetInfo(APE_INFO_FILE_VERSION));