[SCM] dirac packaging branch, master, updated. debian/1.0.2-3-6-g3c9dcd6

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 3c9dcd68c52d9d286fb7741c1ce4ab596a262a3a
Author: Alessio Treglia <alessio at debian.org>
Date:   Wed Aug 18 18:11:11 2010 +0200

    Add patch to fix FTBFS with GCC 4.5 (Closes: #564976).

diff --git a/debian/patches/gcc45.patch b/debian/patches/gcc45.patch
new file mode 100644
index 0000000..27bb0e5
--- /dev/null
+++ b/debian/patches/gcc45.patch
@@ -0,0 +1,28 @@
+Description: Fix build failure with GCC 4.5.
+Author: Brian M. Carlson <sandals at crustytoothpaste.net>
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=564976
+Forwarded: yes, https://sourceforge.net/support/tracker.php?aid=2984304
+---
+ libdirac_encoder/quant_chooser.cpp |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- dirac.orig/libdirac_encoder/quant_chooser.cpp
++++ dirac/libdirac_encoder/quant_chooser.cpp
+@@ -340,7 +340,7 @@ void QuantChooser::SetSkip( CodeBlock& c
+     {
+         for (int i=cblock.Xstart(); i<cblock.Xend(); ++i )
+         {
+-            if ( (std::abs(m_coeff_data[j][i])<<2) >= u_threshold )
++            if ( (std::abs(int(m_coeff_data[j][i]))<<2) >= u_threshold )
+                 can_skip = false;
+         }   
+     }
+@@ -355,7 +355,7 @@ CoeffType QuantChooser::BlockAbsMax( con
+     {
+         for (int i=node.Xp() ; i<node.Xp()+node.Xl(); ++i)
+         {    
+-            val = std::max( val , std::abs(m_coeff_data[j][i]) );
++            val = std::max( val , std::abs(int(m_coeff_data[j][i])) );
+         }// i
+     }// j
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 7ed9922..ffd74ad 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 build-system-modifications.patch
 bootstrap.patch
+gcc45.patch

-- 
dirac packaging