Hello Thanks for the patch.
A few questions about the patch as I do not understand why you changed a few things. On Fri, Aug 19, 2005 at 10:40:36AM -0700, Matt Kraai wrote: > Package: steghide > Version: 0.5.1-5 > Severity: serious > Tags: patch > > steghide fails to build because it contains a number of > incompatibilities with GCC 4.0: > ... > --- steghide-0.5.1.orig/src/ProgressOutput.h > +++ steghide-0.5.1/src/ProgressOutput.h > @@ -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 ; Should this be positive? > - static const float NoAvgWeight = -1.0 ; > + static float NoAvgWeight ; > > protected: > std::string vcompose (const char *msgfmt, va_list ap) const ; > only in patch2: > unchanged: > --- steghide-0.5.1.orig/src/wrapper_hash_map.h > +++ steghide-0.5.1/src/wrapper_hash_map.h > @@ -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 > only in patch2: > unchanged: > --- steghide-0.5.1.orig/src/wrapper_hash_set.h > +++ steghide-0.5.1/src/wrapper_hash_set.h > @@ -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 > only in patch2: > unchanged: > --- steghide-0.5.1.orig/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) ; } > Thanks > #endif // ndef SH_AUDATA_H > only in patch2: > unchanged: > --- steghide-0.5.1.orig/src/Arguments.h > +++ steghide-0.5.1/src/Arguments.h > @@ -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 ; > only in patch2: > unchanged: > --- steghide-0.5.1.orig/src/Arguments.cc > +++ steghide-0.5.1/src/Arguments.cc > @@ -28,6 +28,8 @@ > #include "error.h" > #include "msg.h" > > +float Arguments::Default_Goal = 100.0 ; > + > // the global Arguments object > Arguments Args ; > > only in patch2: > unchanged: > --- steghide-0.5.1.orig/src/ProgressOutput.cc > +++ steghide-0.5.1/src/ProgressOutput.cc > @@ -23,6 +23,8 @@ > #include "ProgressOutput.h" > #include "common.h" > > +float ProgressOutput::NoAvgWeight = 1.0 ; > + Shouldn't this value be negative? > ProgressOutput::ProgressOutput () > : Message("__nomessage__") > { Regards, // Ola -- --------------------- Ola Lundqvist --------------------------- / [EMAIL PROTECTED] Annebergsslingan 37 \ | [EMAIL PROTECTED] 654 65 KARLSTAD | | +46 (0)54-10 14 30 +46 (0)70-332 1551 | | http://www.opal.dhs.org UIN/icq: 4912500 | \ gpg/f.p.: 7090 A92B 18FE 7994 0C36 4FE4 18A1 B1CF 0FE5 3DD9 / --------------------------------------------------------------- -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]