1fa3e33604
* gnu/packages/image.scm (steghide): New variable. * gnu/packages/patches/steghide-fixes.patch: New patch. * gnu/local.mk (dist_patch_DATA): Add it.
71 lines
3.4 KiB
Diff
71 lines
3.4 KiB
Diff
--- steghide-0.5.1/src/AuData.h
|
|
+++ steghide-0.5.1/src/AuData.h
|
|
@@ -26,22 +26,22 @@
|
|
|
|
// AuMuLawAudioData
|
|
typedef AudioDataImpl<AuMuLaw,BYTE> AuMuLawAudioData ;
|
|
-inline BYTE AuMuLawAudioData::readValue (BinaryIO* io) const { return (io->read8()) ; }
|
|
-inline void AuMuLawAudioData::writeValue (BinaryIO* io, BYTE v) const { io->write8(v) ; }
|
|
+template<> inline BYTE AuMuLawAudioData::readValue (BinaryIO* io) const { return (io->read8()) ; }
|
|
+template<> inline void AuMuLawAudioData::writeValue (BinaryIO* io, BYTE v) const { io->write8(v) ; }
|
|
|
|
// AuPCM8AudioData
|
|
typedef AudioDataImpl<AuPCM8,SBYTE> AuPCM8AudioData ;
|
|
-inline SBYTE AuPCM8AudioData::readValue (BinaryIO* io) const { return ((SBYTE) io->read8()) ; }
|
|
-inline void AuPCM8AudioData::writeValue (BinaryIO* io, SBYTE v) const { io->write8((BYTE) v) ; }
|
|
+template<> inline SBYTE AuPCM8AudioData::readValue (BinaryIO* io) const { return ((SBYTE) io->read8()) ; }
|
|
+template<> inline void AuPCM8AudioData::writeValue (BinaryIO* io, SBYTE v) const { io->write8((BYTE) v) ; }
|
|
|
|
// AuPCM16AudioData
|
|
typedef AudioDataImpl<AuPCM16,SWORD16> AuPCM16AudioData ;
|
|
-inline SWORD16 AuPCM16AudioData::readValue (BinaryIO* io) const { return ((SWORD16) io->read16_be()) ; }
|
|
-inline void AuPCM16AudioData::writeValue (BinaryIO* io, SWORD16 v) const { io->write16_be((UWORD16) v) ; }
|
|
+template<> inline SWORD16 AuPCM16AudioData::readValue (BinaryIO* io) const { return ((SWORD16) io->read16_be()) ; }
|
|
+template<> inline void AuPCM16AudioData::writeValue (BinaryIO* io, SWORD16 v) const { io->write16_be((UWORD16) v) ; }
|
|
|
|
// AuPCM32AudioData
|
|
typedef AudioDataImpl<AuPCM32,SWORD32> AuPCM32AudioData ;
|
|
-inline SWORD32 AuPCM32AudioData::readValue (BinaryIO* io) const { return ((SWORD32) io->read32_be()) ; }
|
|
-inline void AuPCM32AudioData::writeValue (BinaryIO* io, SWORD32 v) const { io->write32_be((UWORD32) v) ; }
|
|
+template<> inline SWORD32 AuPCM32AudioData::readValue (BinaryIO* io) const { return ((SWORD32) io->read32_be()) ; }
|
|
+template<> inline void AuPCM32AudioData::writeValue (BinaryIO* io, SWORD32 v) const { io->write32_be((UWORD32) v) ; }
|
|
|
|
#endif // ndef SH_AUDATA_H
|
|
--- steghide-0.5.1/src/AuSampleValues.cc
|
|
+++ steghide-0.5.1/src/AuSampleValues.cc
|
|
@@ -21,17 +21,17 @@
|
|
#include "AuSampleValues.h"
|
|
|
|
// AuMuLawSampleValue
|
|
-const BYTE AuMuLawSampleValue::MinValue = 0 ;
|
|
-const BYTE AuMuLawSampleValue::MaxValue = BYTE_MAX ;
|
|
+template<> const BYTE AuMuLawSampleValue::MinValue = 0 ;
|
|
+template<> const BYTE AuMuLawSampleValue::MaxValue = BYTE_MAX ;
|
|
|
|
// AuPCM8SampleValue
|
|
-const SBYTE AuPCM8SampleValue::MinValue = SBYTE_MIN ;
|
|
-const SBYTE AuPCM8SampleValue::MaxValue = SBYTE_MAX ;
|
|
+template<> const SBYTE AuPCM8SampleValue::MinValue = SBYTE_MIN ;
|
|
+template<> const SBYTE AuPCM8SampleValue::MaxValue = SBYTE_MAX ;
|
|
|
|
// AuPCM16SampleValue
|
|
-const SWORD16 AuPCM16SampleValue::MinValue = SWORD16_MIN ;
|
|
-const SWORD16 AuPCM16SampleValue::MaxValue = SWORD16_MAX ;
|
|
+template<> const SWORD16 AuPCM16SampleValue::MinValue = SWORD16_MIN ;
|
|
+template<> const SWORD16 AuPCM16SampleValue::MaxValue = SWORD16_MAX ;
|
|
|
|
// AuPCM32SampleValue
|
|
-const SWORD32 AuPCM32SampleValue::MinValue = SWORD32_MIN ;
|
|
-const SWORD32 AuPCM32SampleValue::MaxValue = SWORD32_MAX ;
|
|
+template<> const SWORD32 AuPCM32SampleValue::MinValue = SWORD32_MIN ;
|
|
+template<> const SWORD32 AuPCM32SampleValue::MaxValue = SWORD32_MAX ;
|
|
--- steghide-0.5.1/src/Graph.cc
|
|
+++ steghide-0.5.1/src/Graph.cc
|
|
@@ -18,6 +18,7 @@
|
|
*
|
|
*/
|
|
|
|
+#include <climits>
|
|
#include <ctime>
|
|
#include <list>
|
|
#include <map>
|