diff -Naur steghide-0.5.1/src/Arguments.cc steghide-0.5.1.oden/src/Arguments.cc
--- steghide-0.5.1/src/Arguments.cc 2003-10-11 23:25:04.000000000 +0200
+++ steghide-0.5.1.oden/src/Arguments.cc 2006-01-08 09:17:29.000000000 +0100
@@ -28,6 +28,8 @@
#include "error.h"
#include "msg.h"
+float Arguments::Default_Goal = 100.0 ;
+
// the global Arguments object
Arguments Args ;
diff -Naur steghide-0.5.1/src/Arguments.h steghide-0.5.1.oden/src/Arguments.h
--- steghide-0.5.1/src/Arguments.h 2003-10-11 23:23:57.000000000 +0200
+++ steghide-0.5.1.oden/src/Arguments.h 2006-01-08 09:17:29.000000000 +0100
@@ -100,7 +100,7 @@
static const VERBOSITY Default_Verbosity = NORMAL ;
static const unsigned long Default_Radius = 0 ; // there is no default radius for all file formats
static const unsigned int Max_Algorithm = 3 ;
- static const float Default_Goal = 100.0 ;
+ static float Default_Goal ;
static const DEBUGCOMMAND Default_DebugCommand = NONE ;
static const bool Default_Check = false ;
static const unsigned int Default_DebugLevel = 0 ;
diff -Naur steghide-0.5.1/src/AuData.h steghide-0.5.1.oden/src/AuData.h
--- steghide-0.5.1/src/AuData.h 2003-09-28 17:30:29.000000000 +0200
+++ steghide-0.5.1.oden/src/AuData.h 2006-01-08 09:17:29.000000000 +0100
@@ -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
diff -Naur steghide-0.5.1/src/ProgressOutput.cc steghide-0.5.1.oden/src/ProgressOutput.cc
--- steghide-0.5.1/src/ProgressOutput.cc 2003-10-11 11:20:51.000000000 +0200
+++ steghide-0.5.1.oden/src/ProgressOutput.cc 2006-01-08 09:17:29.000000000 +0100
@@ -23,6 +23,8 @@
#include "ProgressOutput.h"
#include "common.h"
+const float ProgressOutput::NoAvgWeight = 1.0 ;
+
ProgressOutput::ProgressOutput ()
: Message("__nomessage__")
{
diff -Naur steghide-0.5.1/src/ProgressOutput.h steghide-0.5.1.oden/src/ProgressOutput.h
--- steghide-0.5.1/src/ProgressOutput.h 2003-09-28 17:30:30.000000000 +0200
+++ steghide-0.5.1.oden/src/ProgressOutput.h 2006-01-08 09:17:29.000000000 +0100
@@ -62,9 +62,9 @@
* \param rate the rate of matched vertices
* \param avgweight the average edge weight (is not printed if not given)
**/
- void done (float rate, float avgweight = NoAvgWeight) const ;
+ void done (float rate, float avgweight = 1.0) const ;
- static const float NoAvgWeight = -1.0 ;
+ static const float NoAvgWeight ;
protected:
std::string vcompose (const char *msgfmt, va_list ap) const ;
diff -Naur steghide-0.5.1/src/wrapper_hash_map.h steghide-0.5.1.oden/src/wrapper_hash_map.h
--- steghide-0.5.1/src/wrapper_hash_map.h 2003-09-28 17:30:30.000000000 +0200
+++ steghide-0.5.1.oden/src/wrapper_hash_map.h 2006-01-08 09:17:29.000000000 +0100
@@ -29,7 +29,7 @@
namespace sgi { using ::hash ; using ::hash_map ; } ;
# else
# include <ext/hash_map>
-# if __GNUC_MINOR__ == 0
+# if __GNUC__ == 3 && __GNUC_MINOR__ == 0
namespace sgi = std ; // GCC 3.0
# else
namespace sgi = __gnu_cxx ; // GCC 3.1 and later
diff -Naur steghide-0.5.1/src/wrapper_hash_set.h steghide-0.5.1.oden/src/wrapper_hash_set.h
--- steghide-0.5.1/src/wrapper_hash_set.h 2003-09-28 17:30:30.000000000 +0200
+++ steghide-0.5.1.oden/src/wrapper_hash_set.h 2006-01-08 09:17:29.000000000 +0100
@@ -30,7 +30,7 @@
namespace sgi { using ::hash ; using ::hash_set ; } ;
# else
# include <ext/hash_set>
-# if __GNUC_MINOR__ == 0
+# if __GNUC__ == 3 && __GNUC_MINOR__ == 0
namespace sgi = std ; // GCC 3.0
# else
namespace sgi = ::__gnu_cxx ; // GCC 3.1 and later
