Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 221129 | Differences between
and this patch

Collapse All | Expand All

(-)steghide-0.5.1.old/configure.in (-3 / +13 lines)
Lines 7-33 Link Here
7
dnl checks for programs.
7
dnl checks for programs.
8
AC_PROG_CXX
8
AC_PROG_CXX
9
AC_PROG_INSTALL
9
AC_PROG_INSTALL
10
AC_PROG_AWK
10
AC_PROG_AWK
11
AC_PROG_LN_S
11
AC_PROG_LN_S
12
AC_CXX_COMPILE_STDCXX_0X
12
13
13
dnl GNU gettext
14
dnl GNU gettext
14
AC_CHECK_FUNCS(strchr)
15
AC_CHECK_FUNCS(strchr)
15
AM_GNU_GETTEXT
16
AM_GNU_GETTEXT
16
AM_CONDITIONAL(USE_INTLDIR, test "$nls_cv_use_gnu_gettext" = yes)
17
AM_CONDITIONAL(USE_INTLDIR, test "$nls_cv_use_gnu_gettext" = yes)
17
18
18
dnl check if debugging support is requested
19
dnl check if debugging support is requested
19
AC_MSG_CHECKING([wether to enable debugging])
20
AC_MSG_CHECKING([whether to enable debugging])
20
AC_ARG_ENABLE(debug,[  --enable-debug          enable debugging],
21
AC_ARG_ENABLE(debug,[  --enable-debug          enable debugging],
21
	if test "$enableval" = yes ;
22
	if test "$enableval" = yes ;
22
	then
23
	then
23
		AC_MSG_RESULT([yes])
24
		AC_MSG_RESULT([yes])
24
		AC_DEFINE(DEBUG,1,[enable code used only for debugging])
25
		AC_DEFINE(DEBUG,1,[enable code used only for debugging])
25
		CXXFLAGS="-O2 -Wall -g"
26
	else
26
	else
27
		AC_MSG_RESULT([no])
27
		AC_MSG_RESULT([no])
28
		CXXFLAGS="-O2 -Wall"
29
	fi
28
	fi
30
	,
29
	,
31
	AC_MSG_RESULT([no])
30
	AC_MSG_RESULT([no])
32
	CXXFLAGS="-O2 -Wall"
31
	CXXFLAGS="-O2 -Wall"
33
)
32
)
Lines 213-219 Link Here
213
	echo "libmhash can be downloaded from http://mhash.sourceforge.net/.";
212
	echo "libmhash can be downloaded from http://mhash.sourceforge.net/.";
214
	echo "**********";
213
	echo "**********";
215
	AC_MSG_ERROR([[libmhash not found]])
214
	AC_MSG_ERROR([[libmhash not found]])
216
fi
215
fi
217
216
217
dnl Should we add std=c++0x?
218
219
if test "$ac_cv_cxx_compile_cxx0x_cxx" = yes;
220
then
221
	CXXFLAGS="${CXXFLAGS} -std=c++0x -Wall -Wextra"
222
else
223
	CXXFLAGS="${CXXFLAGS} -Wall -Wextra"
224
fi
225
226
AC_SUBST(CXXFLAGS)
227
218
dnl create Makefiles
228
dnl create Makefiles
219
AC_OUTPUT([Makefile steghide.spec steghide.doxygen doc/Makefile po/Makefile.in src/Makefile tests/Makefile tests/data/Makefile m4/Makefile intl/Makefile])
229
AC_OUTPUT([Makefile steghide.spec steghide.doxygen doc/Makefile po/Makefile.in src/Makefile tests/Makefile tests/data/Makefile m4/Makefile intl/Makefile])
(-)steghide-0.5.1.old/m4/ac_cxx_compile_stdcxx_0x.m4 (+107 lines)
Line 0 Link Here
1
# ===========================================================================
2
#        http://autoconf-archive.cryp.to/ac_cxx_compile_stdcxx_0x.html
3
# ===========================================================================
4
#
5
# SYNOPSIS
6
#
7
#   AC_CXX_COMPILE_STDCXX_0X
8
#
9
# DESCRIPTION
10
#
11
#   Check for baseline language coverage in the compiler for the C++0x
12
#   standard.
13
#
14
# LAST MODIFICATION
15
#
16
#   2008-04-17
17
#
18
# COPYLEFT
19
#
20
#   Copyright (c) 2008 Benjamin Kosnik <bkoz@redhat.com>
21
#
22
#   Copying and distribution of this file, with or without modification, are
23
#   permitted in any medium without royalty provided the copyright notice
24
#   and this notice are preserved.
25
26
AC_DEFUN([AC_CXX_COMPILE_STDCXX_0X], [
27
  AC_CACHE_CHECK(if g++ supports C++0x features without additional flags,
28
  ac_cv_cxx_compile_cxx0x_native,
29
  [AC_LANG_SAVE
30
  AC_LANG_CPLUSPLUS
31
  AC_TRY_COMPILE([
32
  template <typename T>
33
    struct check
34
    {
35
      static_assert(sizeof(int) <= sizeof(T), "not big enough");
36
    };
37
38
    typedef check<check<bool>> right_angle_brackets;
39
40
    int a;
41
    decltype(a) b;
42
43
    typedef check<int> check_type;
44
    check_type c;
45
    check_type&& cr = c;],,
46
  ac_cv_cxx_compile_cxx0x_native=yes, ac_cv_cxx_compile_cxx0x_native=no)
47
  AC_LANG_RESTORE
48
  ])
49
50
  AC_CACHE_CHECK(if g++ supports C++0x features with -std=c++0x,
51
  ac_cv_cxx_compile_cxx0x_cxx,
52
  [AC_LANG_SAVE
53
  AC_LANG_CPLUSPLUS
54
  ac_save_CXXFLAGS="$CXXFLAGS"
55
  CXXFLAGS="$CXXFLAGS -std=c++0x"
56
  AC_TRY_COMPILE([
57
  template <typename T>
58
    struct check
59
    {
60
      static_assert(sizeof(int) <= sizeof(T), "not big enough");
61
    };
62
63
    typedef check<check<bool>> right_angle_brackets;
64
65
    int a;
66
    decltype(a) b;
67
68
    typedef check<int> check_type;
69
    check_type c;
70
    check_type&& cr = c;],,
71
  ac_cv_cxx_compile_cxx0x_cxx=yes, ac_cv_cxx_compile_cxx0x_cxx=no)
72
  CXXFLAGS="$ac_save_CXXFLAGS"
73
  AC_LANG_RESTORE
74
  ])
75
76
  AC_CACHE_CHECK(if g++ supports C++0x features with -std=gnu++0x,
77
  ac_cv_cxx_compile_cxx0x_gxx,
78
  [AC_LANG_SAVE
79
  AC_LANG_CPLUSPLUS
80
  ac_save_CXXFLAGS="$CXXFLAGS"
81
  CXXFLAGS="$CXXFLAGS -std=gnu++0x"
82
  AC_TRY_COMPILE([
83
  template <typename T>
84
    struct check
85
    {
86
      static_assert(sizeof(int) <= sizeof(T), "not big enough");
87
    };
88
89
    typedef check<check<bool>> right_angle_brackets;
90
91
    int a;
92
    decltype(a) b;
93
94
    typedef check<int> check_type;
95
    check_type c;
96
    check_type&& cr = c;],,
97
  ac_cv_cxx_compile_cxx0x_gxx=yes, ac_cv_cxx_compile_cxx0x_gxx=no)
98
  CXXFLAGS="$ac_save_CXXFLAGS"
99
  AC_LANG_RESTORE
100
  ])
101
102
  if test "$ac_cv_cxx_compile_cxx0x_native" = yes ||
103
     test "$ac_cv_cxx_compile_cxx0x_cxx" = yes ||
104
     test "$ac_cv_cxx_compile_cxx0x_gxx" = yes; then
105
    AC_DEFINE(HAVE_STDCXX_0X,,[Define if g++ supports C++0x features. ])
106
  fi
107
])
(-)steghide-0.5.1.old/src/Arguments.cc (+2 lines)
Lines 26-35 Link Here
26
#include "Terminal.h"
26
#include "Terminal.h"
27
#include "common.h"
27
#include "common.h"
28
#include "error.h"
28
#include "error.h"
29
#include "msg.h"
29
#include "msg.h"
30
30
31
float Arguments::Default_Goal = 100.0 ;
32
31
// the global Arguments object
33
// the global Arguments object
32
Arguments Args ;
34
Arguments Args ;
33
35
34
Arguments::Arguments (int argc, char* argv[])
36
Arguments::Arguments (int argc, char* argv[])
35
{
37
{
(-)steghide-0.5.1.old/src/Arguments.h (-1 / +1 lines)
Lines 98-108 Link Here
98
	static const bool		Default_EmbedEmbFn = true ;
98
	static const bool		Default_EmbedEmbFn = true ;
99
	static const bool		Default_Force = false ;
99
	static const bool		Default_Force = false ;
100
	static const VERBOSITY	Default_Verbosity = NORMAL ;
100
	static const VERBOSITY	Default_Verbosity = NORMAL ;
101
	static const unsigned long	Default_Radius = 0 ; // there is no default radius for all file formats
101
	static const unsigned long	Default_Radius = 0 ; // there is no default radius for all file formats
102
	static const unsigned int	Max_Algorithm = 3 ;
102
	static const unsigned int	Max_Algorithm = 3 ;
103
	static const float		Default_Goal = 100.0 ;
103
	static float			Default_Goal ;
104
	static const DEBUGCOMMAND	Default_DebugCommand = NONE ;
104
	static const DEBUGCOMMAND	Default_DebugCommand = NONE ;
105
	static const bool		Default_Check = false ;
105
	static const bool		Default_Check = false ;
106
	static const unsigned int	Default_DebugLevel = 0 ;
106
	static const unsigned int	Default_DebugLevel = 0 ;
107
	static const unsigned int	Default_GmlGraphRecDepth = 0 ;
107
	static const unsigned int	Default_GmlGraphRecDepth = 0 ;
108
	static const unsigned int	Default_GmlStartVertex = 0 ;
108
	static const unsigned int	Default_GmlStartVertex = 0 ;
(-)steghide-0.5.1.old/src/EncryptionMode.h (-1 / +1 lines)
Lines 69-79 Link Here
69
	static const unsigned int NumValues = 8 ;
69
	static const unsigned int NumValues = 8 ;
70
	IRep Value ;
70
	IRep Value ;
71
71
72
	typedef struct struct_Translation {
72
	typedef struct struct_Translation {
73
		IRep	irep ;
73
		IRep	irep ;
74
		char*	srep ;
74
		const char*	srep ;
75
	} Translation ;
75
	} Translation ;
76
	static const Translation Translations[] ;
76
	static const Translation Translations[] ;
77
} ;
77
} ;
78
78
79
#endif // ndef SH_ENCMODE_H
79
#endif // ndef SH_ENCMODE_H
(-)steghide-0.5.1.old/src/Graph.cc (+2 lines)
Lines 20-29 Link Here
20
20
21
#include <ctime>
21
#include <ctime>
22
#include <list>
22
#include <list>
23
#include <map>
23
#include <map>
24
#include <vector>
24
#include <vector>
25
#include <algorithm>
26
#include <climits>
25
27
26
#include "BitString.h"
28
#include "BitString.h"
27
#include "CvrStgFile.h"
29
#include "CvrStgFile.h"
28
#include "Edge.h"
30
#include "Edge.h"
29
#include "Graph.h"
31
#include "Graph.h"
(-)steghide-0.5.1.old/src/Matching.cc (+1 lines)
Lines 16-25 Link Here
16
 * along with this program; if not, write to the Free Software
16
 * along with this program; if not, write to the Free Software
17
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
17
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
18
 *
18
 *
19
 */
19
 */
20
20
21
#include <algorithm>
21
#include "Edge.h"
22
#include "Edge.h"
22
#include "Graph.h"
23
#include "Graph.h"
23
#include "Matching.h"
24
#include "Matching.h"
24
#include "ProgressOutput.h"
25
#include "ProgressOutput.h"
25
#include "common.h"
26
#include "common.h"
(-)steghide-0.5.1.old/src/ProgressOutput.cc (+2 lines)
Lines 21-30 Link Here
21
#include <cmath>
21
#include <cmath>
22
22
23
#include "ProgressOutput.h"
23
#include "ProgressOutput.h"
24
#include "common.h"
24
#include "common.h"
25
25
26
float ProgressOutput::NoAvgWeight = 1.0 ;
27
26
ProgressOutput::ProgressOutput ()
28
ProgressOutput::ProgressOutput ()
27
	: Message("__nomessage__")
29
	: Message("__nomessage__")
28
{
30
{
29
	LastUpdate = time(NULL) - 1 ; // -1 to ensure that message is written first time
31
	LastUpdate = time(NULL) - 1 ; // -1 to ensure that message is written first time
30
}
32
}
(-)steghide-0.5.1.old/src/ProgressOutput.h (-2 / +2 lines)
Lines 60-72 Link Here
60
	/**
60
	/**
61
	 * update the output appending rate, [average edge weight], "done" and a newline
61
	 * update the output appending rate, [average edge weight], "done" and a newline
62
	 * \param rate the rate of matched vertices
62
	 * \param rate the rate of matched vertices
63
	 * \param avgweight the average edge weight (is not printed if not given)
63
	 * \param avgweight the average edge weight (is not printed if not given)
64
	 **/
64
	 **/
65
	void done (float rate, float avgweight = NoAvgWeight) const ;
65
	void done (float rate, float avgweight = 1.0) const ;
66
66
67
	static const float NoAvgWeight = -1.0 ;
67
	static float NoAvgWeight ;
68
68
69
	protected:
69
	protected:
70
	std::string vcompose (const char *msgfmt, va_list ap) const ;
70
	std::string vcompose (const char *msgfmt, va_list ap) const ;
71
71
72
	private:
72
	private:
(-)steghide-0.5.1.old/src/SMDConstructionHeuristic.cc (+2 lines)
Lines 16-25 Link Here
16
 * along with this program; if not, write to the Free Software
16
 * along with this program; if not, write to the Free Software
17
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
17
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
18
 *
18
 *
19
 */
19
 */
20
20
21
#include <algorithm>
22
21
#include "Edge.h"
23
#include "Edge.h"
22
#include "Graph.h"
24
#include "Graph.h"
23
#include "Matching.h"
25
#include "Matching.h"
24
#include "SMDConstructionHeuristic.h"
26
#include "SMDConstructionHeuristic.h"
25
#include "Vertex.h"
27
#include "Vertex.h"
(-)steghide-0.5.1.old/src/WavFile.cc (+1 lines)
Lines 19-28 Link Here
19
 */
19
 */
20
20
21
#include <cstdio>
21
#include <cstdio>
22
#include <cstdlib>
22
#include <cstdlib>
23
#include <cstring>
23
#include <cstring>
24
#include <algorithm>
24
25
25
#include "CvrStgFile.h"
26
#include "CvrStgFile.h"
26
#include "DFSAPHeuristic.h"
27
#include "DFSAPHeuristic.h"
27
#include "SampleValueAdjacencyList.h"
28
#include "SampleValueAdjacencyList.h"
28
#include "SMDConstructionHeuristic.h"
29
#include "SMDConstructionHeuristic.h"
(-)steghide-0.5.1.old/src/wrapper_hash_map.h (-2 / +6 lines)
Lines 25-41 Link Here
25
25
26
#ifdef __GNUC__
26
#ifdef __GNUC__
27
# if __GNUC__ < 3
27
# if __GNUC__ < 3
28
#  include <hash_map.h>
28
#  include <hash_map.h>
29
    namespace sgi { using ::hash ; using ::hash_map ; } ;
29
    namespace sgi { using ::hash ; using ::hash_map ; } ;
30
# else
30
# elif __GNUC__ == 3 || ( __GNUC__ == 4 && __GNUC_MINOR__ < 3 )
31
#  include <ext/hash_map>
31
#  include <ext/hash_map>
32
#  if __GNUC_MINOR__ == 0
32
#  if __GNUC__ == 3 &&  __GNUC_MINOR__ == 0
33
    namespace sgi = std ;			// GCC 3.0
33
    namespace sgi = std ;			// GCC 3.0
34
#  else
34
#  else
35
    namespace sgi = __gnu_cxx ;	// GCC 3.1 and later
35
    namespace sgi = __gnu_cxx ;	// GCC 3.1 and later
36
#  endif
36
#  endif
37
# else
38
#  include <unordered_map>
39
#  define hash_map unordered_map
40
   namespace sgi = std ;
37
# endif
41
# endif
38
#else
42
#else
39
  namespace sgi = std ;
43
  namespace sgi = std ;
40
#endif
44
#endif
41
45
(-)steghide-0.5.1.old/src/wrapper_hash_set.h (-2 / +6 lines)
Lines 26-42 Link Here
26
26
27
#ifdef __GNUC__
27
#ifdef __GNUC__
28
# if __GNUC__ < 3
28
# if __GNUC__ < 3
29
#  include <hash_set.h>
29
#  include <hash_set.h>
30
    namespace sgi { using ::hash ; using ::hash_set ; } ;
30
    namespace sgi { using ::hash ; using ::hash_set ; } ;
31
# else
31
# elif __GNUC__ == 3 || ( __GNUC__ == 4 && __GNUC_MINOR__ < 3 )
32
#  include <ext/hash_set>
32
#  include <ext/hash_set>
33
#  if __GNUC_MINOR__ == 0
33
#  if __GNUC__ == 3 && __GNUC_MINOR__ == 0
34
    namespace sgi = std ;			// GCC 3.0
34
    namespace sgi = std ;			// GCC 3.0
35
#  else
35
#  else
36
    namespace sgi = ::__gnu_cxx ;	// GCC 3.1 and later
36
    namespace sgi = ::__gnu_cxx ;	// GCC 3.1 and later
37
#  endif
37
#  endif
38
# else
39
#  include <unordered_set>
40
#  define hash_set unordered_set
41
   namespace sgi = std ;
38
# endif
42
# endif
39
#else
43
#else
40
  namespace sgi = std ;
44
  namespace sgi = std ;
41
#endif
45
#endif
42
46

Return to bug 221129