<commit_before>diff -ruN dirac-0.6.0.old/Makefile.am dirac-0.6.0/Makefile.am
--- dirac/Makefile.am	2007-03-27 00:17:15.000000000 +0200
+++ dirac/Makefile.am	2007-03-27 00:18:31.000000000 +0200
@@ -2,17 +2,12 @@
 #
 
 SUBDIRS = libdirac_byteio libdirac_common libdirac_motionest libdirac_encoder libdirac_decoder \
-encoder decoder util $(CPPUNITTESTS_DIR) tests $(DOC_DIR) win32
+encoder decoder util $(CPPUNITTESTS_DIR) win32
 
 .PHONY: valgrind-check
 valgrind-check:
 	cd tests && $(MAKE) $(AM_MAKEFLAGS) $@
 
-if HAVE_DOXYGEN
-DOC_DIR = doc
-else
-DOC_DIR =
-endif
 
 if HAVE_LATEX
 DOC_DIR = doc
diff -ruN dirac-0.6.0.old/configure.ac dirac-0.6.0/configure.ac
--- dirac/configure.ac	2007-03-27 00:17:15.000000000 +0200
+++ dirac/configure.ac	2007-03-27 00:19:52.000000000 +0200
@@ -143,7 +143,7 @@
 dnl algorithm documentation is not distributed in
 dnl the release. It is available only from CVS
 dnl -----------------------------------------------
-AC_CHECK_FILE($srcdir/doc/documentation/algorithm/algorithm/index.htm,[HAVE_ALGO="true"], [HAVE_ALGO="false"])
+dnl AC_CHECK_FILE($srcdir/doc/documentation/algorithm/algorithm/index.htm,[HAVE_ALGO="true"], [HAVE_ALGO="false"])
 AM_CONDITIONAL(HAVE_ALGO, $HAVE_ALGO)
 
 dnl -----------------------------------------------
@@ -151,7 +151,7 @@
 dnl Enhancements is not distributed in
 dnl the release. It is available only from CVS
 dnl -----------------------------------------------
-AC_CHECK_FILE($srcdir/doc/documentation/algorithm/enhancements/index.htm,[HAVE_ENHANCE="true"], [HAVE_ENHANCE="false"])
+dnl AC_CHECK_FILE($srcdir/doc/documentation/algorithm/enhancements/index.htm,[HAVE_ENHANCE="true"], [HAVE_ENHANCE="false"])
 AM_CONDITIONAL(HAVE_ENHANCE, $HAVE_ENHANCE)
 
 dnl -----------------------------------------------
@@ -159,7 +159,7 @@
 dnl Global Motion documentation is not distributed in
 dnl the release. It is available only from CVS
 dnl -----------------------------------------------
-AC_CHECK_FILE($srcdir/doc/documentation/algorithm/global_motion/index.htm,[HAVE_GM="true"], [HAVE_GM="false"])
+dnl AC_CHECK_FILE($srcdir/doc/documentation/algorithm/global_motion/index.htm,[HAVE_GM="true"], [HAVE_GM="false"])
 AM_CONDITIONAL(HAVE_GM, $HAVE_GM)
 
 dnl -----------------------------------------------
@@ -167,7 +167,7 @@
 dnl Upconversion doc is not distributed in
 dnl the release. It is available only from CVS
 dnl -----------------------------------------------
-AC_CHECK_FILE($srcdir/doc/documentation/algorithm/upconversion/index.htm,[HAVE_UPCONV="true"], [HAVE_UPCONV="false"])
+dnl AC_CHECK_FILE($srcdir/doc/documentation/algorithm/upconversion/index.htm,[HAVE_UPCONV="true"], [HAVE_UPCONV="false"])
 AM_CONDITIONAL(HAVE_UPCONV, $HAVE_UPCONV)
 
 dnl -----------------------------------------------
@@ -175,7 +175,7 @@
 dnl programmer's guide is not distributed in
 dnl the release. It is available only from CVS
 dnl -----------------------------------------------
-AC_CHECK_FILE($srcdir/doc/documentation/code/programmers_guide/index.htm,[HAVE_PROG="true"], [HAVE_PROG="false"])
+dnl AC_CHECK_FILE($srcdir/doc/documentation/code/programmers_guide/index.htm,[HAVE_PROG="true"], [HAVE_PROG="false"])
 AM_CONDITIONAL(HAVE_PROG, $HAVE_PROG)
 
 dnl -----------------------------------------------
@@ -183,7 +183,7 @@
 dnl Diagnostics tools docs are is not distributed in
 dnl the release. It is available only from CVS
 dnl -----------------------------------------------
-AC_CHECK_FILE($srcdir/doc/documentation/tools/diagnostics/index.htm,[HAVE_DIAG="true"], [HAVE_DIAG="false"])
+dnl AC_CHECK_FILE($srcdir/doc/documentation/tools/diagnostics/index.htm,[HAVE_DIAG="true"], [HAVE_DIAG="false"])
 AM_CONDITIONAL(HAVE_DIAG, $HAVE_DIAG)
 
 dnl -----------------------------------------------
--- dirac/libdirac_common/band_codec.cpp    2007-07-06 23:20:51.000000000 +0200
+++ dirac/libdirac_common/band_codec.cpp    2007-03-27 18:29:13.000000000 +0200

@@ -433,7 +433,7 @@
         }
 
     }
-    return 0; // Avoid warning
+
 }

<commit_msg>extras/contrib: Fix dirac patch which was reverted.<commit_after>diff -ruN dirac-0.6.0.old/Makefile.am dirac-0.6.0/Makefile.am
--- dirac/Makefile.am	2007-03-27 00:17:15.000000000 +0200
+++ dirac/Makefile.am	2007-03-27 00:18:31.000000000 +0200
@@ -2,17 +2,12 @@
 #
 
 SUBDIRS = libdirac_byteio libdirac_common libdirac_motionest libdirac_encoder libdirac_decoder \
-encoder decoder util $(CPPUNITTESTS_DIR) tests $(DOC_DIR) win32
+encoder decoder util $(CPPUNITTESTS_DIR) win32
 
 .PHONY: valgrind-check
 valgrind-check:
 	cd tests && $(MAKE) $(AM_MAKEFLAGS) $@
 
-if HAVE_DOXYGEN
-DOC_DIR = doc
-else
-DOC_DIR =
-endif
 
 if HAVE_LATEX
 DOC_DIR = doc
diff -ruN dirac-0.6.0.old/configure.ac dirac-0.6.0/configure.ac
--- dirac/configure.ac	2007-03-27 00:17:15.000000000 +0200
+++ dirac/configure.ac	2007-03-27 00:19:52.000000000 +0200
@@ -143,7 +143,7 @@
 dnl algorithm documentation is not distributed in
 dnl the release. It is available only from CVS
 dnl -----------------------------------------------
-AC_CHECK_FILE($srcdir/doc/documentation/algorithm/algorithm/index.htm,[HAVE_ALGO="true"], [HAVE_ALGO="false"])
+dnl AC_CHECK_FILE($srcdir/doc/documentation/algorithm/algorithm/index.htm,[HAVE_ALGO="true"], [HAVE_ALGO="false"])
 AM_CONDITIONAL(HAVE_ALGO, $HAVE_ALGO)
 
 dnl -----------------------------------------------
@@ -151,7 +151,7 @@
 dnl Enhancements is not distributed in
 dnl the release. It is available only from CVS
 dnl -----------------------------------------------
-AC_CHECK_FILE($srcdir/doc/documentation/algorithm/enhancements/index.htm,[HAVE_ENHANCE="true"], [HAVE_ENHANCE="false"])
+dnl AC_CHECK_FILE($srcdir/doc/documentation/algorithm/enhancements/index.htm,[HAVE_ENHANCE="true"], [HAVE_ENHANCE="false"])
 AM_CONDITIONAL(HAVE_ENHANCE, $HAVE_ENHANCE)
 
 dnl -----------------------------------------------
@@ -159,7 +159,7 @@
 dnl Global Motion documentation is not distributed in
 dnl the release. It is available only from CVS
 dnl -----------------------------------------------
-AC_CHECK_FILE($srcdir/doc/documentation/algorithm/global_motion/index.htm,[HAVE_GM="true"], [HAVE_GM="false"])
+dnl AC_CHECK_FILE($srcdir/doc/documentation/algorithm/global_motion/index.htm,[HAVE_GM="true"], [HAVE_GM="false"])
 AM_CONDITIONAL(HAVE_GM, $HAVE_GM)
 
 dnl -----------------------------------------------
@@ -167,7 +167,7 @@
 dnl Upconversion doc is not distributed in
 dnl the release. It is available only from CVS
 dnl -----------------------------------------------
-AC_CHECK_FILE($srcdir/doc/documentation/algorithm/upconversion/index.htm,[HAVE_UPCONV="true"], [HAVE_UPCONV="false"])
+dnl AC_CHECK_FILE($srcdir/doc/documentation/algorithm/upconversion/index.htm,[HAVE_UPCONV="true"], [HAVE_UPCONV="false"])
 AM_CONDITIONAL(HAVE_UPCONV, $HAVE_UPCONV)
 
 dnl -----------------------------------------------
@@ -175,7 +175,7 @@
 dnl programmer's guide is not distributed in
 dnl the release. It is available only from CVS
 dnl -----------------------------------------------
-AC_CHECK_FILE($srcdir/doc/documentation/code/programmers_guide/index.htm,[HAVE_PROG="true"], [HAVE_PROG="false"])
+dnl AC_CHECK_FILE($srcdir/doc/documentation/code/programmers_guide/index.htm,[HAVE_PROG="true"], [HAVE_PROG="false"])
 AM_CONDITIONAL(HAVE_PROG, $HAVE_PROG)
 
 dnl -----------------------------------------------
@@ -183,7 +183,7 @@
 dnl Diagnostics tools docs are is not distributed in
 dnl the release. It is available only from CVS
 dnl -----------------------------------------------
-AC_CHECK_FILE($srcdir/doc/documentation/tools/diagnostics/index.htm,[HAVE_DIAG="true"], [HAVE_DIAG="false"])
+dnl AC_CHECK_FILE($srcdir/doc/documentation/tools/diagnostics/index.htm,[HAVE_DIAG="true"], [HAVE_DIAG="false"])
 AM_CONDITIONAL(HAVE_DIAG, $HAVE_DIAG)
 
 dnl -----------------------------------------------
--- dirac/libdirac_common/band_codec.cpp    2007-07-06 23:20:51.000000000 +0200
+++ dirac/libdirac_common/band_codec.cpp    2007-03-27 18:29:13.000000000 +0200
@@ -433,7 +433,7 @@
         }
 
     }
-
+    return 0; // avoid warning
 }
 
 inline int BandCodec::ChooseInfoContext() const 7

{'fraction_non_alphanumeric': 0.2622648469199557, 'fraction_numerical': 0.059387679822943566, 'mean_word_length': 2.645898700134469, 'pattern_counts': {'":': 0, '<': 3, '<?xml version=': 0, '>': 3, 'https://': 0, 'lorem ipsum': 0, 'www.': 0, 'xml': 0}, 'pii_count': 0, 'substrings_counts': 12, 'word_list_counts': {'cursed_substrings.json': 0, 'profanity_word_list.json': 0, 'sexual_word_list.json': 0, 'zh_pornsignals.json': 0}}
{'dir': 'git-commits-cleaned', 'id': '5441113', 'n_tokens_mistral': 3127, 'n_tokens_neox': 2615, 'n_words': 491}