Index: Makefile.in --- Makefile.in.orig 2003-10-15 10:01:28 +0200 +++ Makefile.in 2006-12-14 23:25:31 +0100 @@ -161,7 +161,7 @@ SUBDIRS = m4 intl po doc src tests docdir = $(prefix)/share/doc/$(PACKAGE) EXTRA_DIST = config.rpath mkinstalldirs ABOUT-NLS BUGS CREDITS HISTORY LEAME depcomp -doc_DATA = ABOUT-NLS BUGS COPYING CREDITS HISTORY INSTALL LEAME README TODO +doc_DATA = MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess config.h.in \ config.sub configure depcomp install-sh missing mkinstalldirs steghide.doxygen steghide.spec Index: configure --- configure.orig 2003-10-15 10:01:26 +0200 +++ configure 2006-12-14 23:25:48 +0100 @@ -7560,17 +7560,17 @@ #define DEBUG 1 _ACEOF - CXXFLAGS="-O2 -Wall -g" + CXXFLAGS="-O2" else echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 - CXXFLAGS="-O2 -Wall" + CXXFLAGS="-O2" fi else echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 - CXXFLAGS="-O2 -Wall" + CXXFLAGS="-O2" fi; Index: src/AuData.h --- src/AuData.h.orig 2003-09-28 17:30:29 +0200 +++ src/AuData.h 2006-12-14 23:25:31 +0100 @@ -26,22 +26,30 @@ // AuMuLawAudioData typedef AudioDataImpl AuMuLawAudioData ; +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 AuPCM8AudioData ; +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 AuPCM16AudioData ; +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 AuPCM32AudioData ; +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 Index: src/AuSampleValues.cc --- src/AuSampleValues.cc.orig 2003-09-28 17:30:30 +0200 +++ src/AuSampleValues.cc 2006-12-14 23:25:31 +0100 @@ -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 ; Index: src/MHashKeyGen.h --- src/MHashKeyGen.h.orig 2003-09-28 17:30:30 +0200 +++ src/MHashKeyGen.h 2006-12-14 23:25:31 +0100 @@ -23,6 +23,7 @@ #include +#define _Bool bool #include class MHashKeyGen { Index: src/MHashPP.cc --- src/MHashPP.cc.orig 2003-10-05 12:17:50 +0200 +++ src/MHashPP.cc 2006-12-14 23:25:31 +0100 @@ -21,6 +21,7 @@ #include #include +#define _Bool bool #include #include "BitString.h" @@ -120,7 +121,7 @@ std::string MHashPP::getAlgorithmName (hashid id) { - char *name = mhash_get_hash_name (id) ; + char *name = (char *)mhash_get_hash_name (id) ; std::string retval ; if (name == NULL) { retval = std::string ("") ; Index: src/MHashPP.h --- src/MHashPP.h.orig 2003-09-28 17:30:30 +0200 +++ src/MHashPP.h 2006-12-14 23:25:31 +0100 @@ -21,6 +21,7 @@ #ifndef SH_MHASHPP_H #define SH_MHASHPP_H +#define _Bool bool #include #include "common.h" Index: src/Makefile.in --- src/Makefile.in.orig 2003-10-15 10:01:29 +0200 +++ src/Makefile.in 2006-12-14 23:25:31 +0100 @@ -274,11 +274,11 @@ @AMDEP_TRUE@ ./$(DEPDIR)/msg.Po CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \ +LTCXXCOMPILE = $(CXX) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CXXFLAGS) $(CXXFLAGS) CXXLD = $(CXX) -CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ +CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ DIST_SOURCES = $(steghide_SOURCES) HEADERS = $(noinst_HEADERS)