Merge branch 'master' into staging
[jackhill/guix/guix.git] / gnu / packages / patches / steghide-fixes.patch
1 --- steghide-0.5.1/src/AuData.h
2 +++ steghide-0.5.1/src/AuData.h
3 @@ -26,22 +26,22 @@
4
5 // AuMuLawAudioData
6 typedef AudioDataImpl<AuMuLaw,BYTE> AuMuLawAudioData ;
7 -inline BYTE AuMuLawAudioData::readValue (BinaryIO* io) const { return (io->read8()) ; }
8 -inline void AuMuLawAudioData::writeValue (BinaryIO* io, BYTE v) const { io->write8(v) ; }
9 +template<> inline BYTE AuMuLawAudioData::readValue (BinaryIO* io) const { return (io->read8()) ; }
10 +template<> inline void AuMuLawAudioData::writeValue (BinaryIO* io, BYTE v) const { io->write8(v) ; }
11
12 // AuPCM8AudioData
13 typedef AudioDataImpl<AuPCM8,SBYTE> AuPCM8AudioData ;
14 -inline SBYTE AuPCM8AudioData::readValue (BinaryIO* io) const { return ((SBYTE) io->read8()) ; }
15 -inline void AuPCM8AudioData::writeValue (BinaryIO* io, SBYTE v) const { io->write8((BYTE) v) ; }
16 +template<> inline SBYTE AuPCM8AudioData::readValue (BinaryIO* io) const { return ((SBYTE) io->read8()) ; }
17 +template<> inline void AuPCM8AudioData::writeValue (BinaryIO* io, SBYTE v) const { io->write8((BYTE) v) ; }
18
19 // AuPCM16AudioData
20 typedef AudioDataImpl<AuPCM16,SWORD16> AuPCM16AudioData ;
21 -inline SWORD16 AuPCM16AudioData::readValue (BinaryIO* io) const { return ((SWORD16) io->read16_be()) ; }
22 -inline void AuPCM16AudioData::writeValue (BinaryIO* io, SWORD16 v) const { io->write16_be((UWORD16) v) ; }
23 +template<> inline SWORD16 AuPCM16AudioData::readValue (BinaryIO* io) const { return ((SWORD16) io->read16_be()) ; }
24 +template<> inline void AuPCM16AudioData::writeValue (BinaryIO* io, SWORD16 v) const { io->write16_be((UWORD16) v) ; }
25
26 // AuPCM32AudioData
27 typedef AudioDataImpl<AuPCM32,SWORD32> AuPCM32AudioData ;
28 -inline SWORD32 AuPCM32AudioData::readValue (BinaryIO* io) const { return ((SWORD32) io->read32_be()) ; }
29 -inline void AuPCM32AudioData::writeValue (BinaryIO* io, SWORD32 v) const { io->write32_be((UWORD32) v) ; }
30 +template<> inline SWORD32 AuPCM32AudioData::readValue (BinaryIO* io) const { return ((SWORD32) io->read32_be()) ; }
31 +template<> inline void AuPCM32AudioData::writeValue (BinaryIO* io, SWORD32 v) const { io->write32_be((UWORD32) v) ; }
32
33 #endif // ndef SH_AUDATA_H
34 --- steghide-0.5.1/src/AuSampleValues.cc
35 +++ steghide-0.5.1/src/AuSampleValues.cc
36 @@ -21,17 +21,17 @@
37 #include "AuSampleValues.h"
38
39 // AuMuLawSampleValue
40 -const BYTE AuMuLawSampleValue::MinValue = 0 ;
41 -const BYTE AuMuLawSampleValue::MaxValue = BYTE_MAX ;
42 +template<> const BYTE AuMuLawSampleValue::MinValue = 0 ;
43 +template<> const BYTE AuMuLawSampleValue::MaxValue = BYTE_MAX ;
44
45 // AuPCM8SampleValue
46 -const SBYTE AuPCM8SampleValue::MinValue = SBYTE_MIN ;
47 -const SBYTE AuPCM8SampleValue::MaxValue = SBYTE_MAX ;
48 +template<> const SBYTE AuPCM8SampleValue::MinValue = SBYTE_MIN ;
49 +template<> const SBYTE AuPCM8SampleValue::MaxValue = SBYTE_MAX ;
50
51 // AuPCM16SampleValue
52 -const SWORD16 AuPCM16SampleValue::MinValue = SWORD16_MIN ;
53 -const SWORD16 AuPCM16SampleValue::MaxValue = SWORD16_MAX ;
54 +template<> const SWORD16 AuPCM16SampleValue::MinValue = SWORD16_MIN ;
55 +template<> const SWORD16 AuPCM16SampleValue::MaxValue = SWORD16_MAX ;
56
57 // AuPCM32SampleValue
58 -const SWORD32 AuPCM32SampleValue::MinValue = SWORD32_MIN ;
59 -const SWORD32 AuPCM32SampleValue::MaxValue = SWORD32_MAX ;
60 +template<> const SWORD32 AuPCM32SampleValue::MinValue = SWORD32_MIN ;
61 +template<> const SWORD32 AuPCM32SampleValue::MaxValue = SWORD32_MAX ;
62 --- steghide-0.5.1/src/Graph.cc
63 +++ steghide-0.5.1/src/Graph.cc
64 @@ -18,6 +18,7 @@
65 *
66 */
67
68 +#include <climits>
69 #include <ctime>
70 #include <list>
71 #include <map>