template-headers.diff 2.9 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576
  1. diff -Naur steghide-0.5.1.orig/src/AuData.h steghide-0.5.1.new/src/AuData.h
  2. --- steghide-0.5.1.orig/src/AuData.h 2003-09-28 11:30:29.000000000 -0400
  3. +++ steghide-0.5.1.new/src/AuData.h 2007-06-28 17:22:44.000000000 -0400
  4. @@ -26,22 +26,30 @@
  5. // AuMuLawAudioData
  6. typedef AudioDataImpl<AuMuLaw,BYTE> AuMuLawAudioData ;
  7. +template<>
  8. inline BYTE AuMuLawAudioData::readValue (BinaryIO* io) const { return (io->read8()) ; }
  9. +template<>
  10. inline void AuMuLawAudioData::writeValue (BinaryIO* io, BYTE v) const { io->write8(v) ; }
  11. // AuPCM8AudioData
  12. typedef AudioDataImpl<AuPCM8,SBYTE> AuPCM8AudioData ;
  13. +template<>
  14. inline SBYTE AuPCM8AudioData::readValue (BinaryIO* io) const { return ((SBYTE) io->read8()) ; }
  15. +template<>
  16. inline void AuPCM8AudioData::writeValue (BinaryIO* io, SBYTE v) const { io->write8((BYTE) v) ; }
  17. // AuPCM16AudioData
  18. typedef AudioDataImpl<AuPCM16,SWORD16> AuPCM16AudioData ;
  19. +template<>
  20. inline SWORD16 AuPCM16AudioData::readValue (BinaryIO* io) const { return ((SWORD16) io->read16_be()) ; }
  21. +template<>
  22. inline void AuPCM16AudioData::writeValue (BinaryIO* io, SWORD16 v) const { io->write16_be((UWORD16) v) ; }
  23. // AuPCM32AudioData
  24. typedef AudioDataImpl<AuPCM32,SWORD32> AuPCM32AudioData ;
  25. +template<>
  26. inline SWORD32 AuPCM32AudioData::readValue (BinaryIO* io) const { return ((SWORD32) io->read32_be()) ; }
  27. +template<>
  28. inline void AuPCM32AudioData::writeValue (BinaryIO* io, SWORD32 v) const { io->write32_be((UWORD32) v) ; }
  29. #endif // ndef SH_AUDATA_H
  30. diff -Naur steghide-0.5.1.orig/src/AuSampleValues.cc steghide-0.5.1.new/src/AuSampleValues.cc
  31. --- steghide-0.5.1.orig/src/AuSampleValues.cc 2003-09-28 11:30:30.000000000 -0400
  32. +++ steghide-0.5.1.new/src/AuSampleValues.cc 2007-06-28 17:23:52.000000000 -0400
  33. @@ -21,17 +21,25 @@
  34. #include "AuSampleValues.h"
  35. // AuMuLawSampleValue
  36. +template<>
  37. const BYTE AuMuLawSampleValue::MinValue = 0 ;
  38. +template<>
  39. const BYTE AuMuLawSampleValue::MaxValue = BYTE_MAX ;
  40. // AuPCM8SampleValue
  41. +template<>
  42. const SBYTE AuPCM8SampleValue::MinValue = SBYTE_MIN ;
  43. +template<>
  44. const SBYTE AuPCM8SampleValue::MaxValue = SBYTE_MAX ;
  45. // AuPCM16SampleValue
  46. +template<>
  47. const SWORD16 AuPCM16SampleValue::MinValue = SWORD16_MIN ;
  48. +template<>
  49. const SWORD16 AuPCM16SampleValue::MaxValue = SWORD16_MAX ;
  50. // AuPCM32SampleValue
  51. +template<>
  52. const SWORD32 AuPCM32SampleValue::MinValue = SWORD32_MIN ;
  53. +template<>
  54. const SWORD32 AuPCM32SampleValue::MaxValue = SWORD32_MAX ;
  55. diff -Naur steghide-0.5.1.orig/src/MHashPP.cc steghide-0.5.1.new/src/MHashPP.cc
  56. --- steghide-0.5.1.orig/src/MHashPP.cc 2003-10-05 06:17:50.000000000 -0400
  57. +++ steghide-0.5.1.new/src/MHashPP.cc 2007-06-28 17:22:44.000000000 -0400
  58. @@ -120,7 +120,7 @@
  59. std::string MHashPP::getAlgorithmName (hashid id)
  60. {
  61. - char *name = mhash_get_hash_name (id) ;
  62. + char *name = (char *) mhash_get_hash_name (id) ;
  63. std::string retval ;
  64. if (name == NULL) {
  65. retval = std::string ("<algorithm not found>") ;