Search
j0ke.net Open Build Service
>
Projects
>
multimedia
:
SL11
>
dirac
> dirac-gcc45.patch
Sign Up
|
Log In
Username
Password
Cancel
Overview
Repositories
Revisions
Requests
Users
Advanced
Attributes
Meta
File dirac-gcc45.patch of Package dirac (Revision 1)
Currently displaying revision
1
,
show latest
diff -Nur dirac-1.0.2-orig/libdirac_encoder/quant_chooser.cpp dirac-1.0.2/libdirac_encoder/quant_chooser.cpp --- dirac-1.0.2-orig/libdirac_encoder/quant_chooser.cpp 2010-06-27 12:00:16.870371867 +0200 +++ dirac-1.0.2/libdirac_encoder/quant_chooser.cpp 2010-06-27 12:05:29.274389459 +0200 @@ -1,6 +1,6 @@ /* ***** BEGIN LICENSE BLOCK ***** * -* $Id: quant_chooser.cpp,v 1.20 2009/01/21 05:22:05 asuraparaju Exp $ $Name: Dirac_1_0_2 $ +* $Id: quant_chooser.cpp,v 1.21 2010/05/09 04:38:31 asuraparaju Exp $ $Name: $ * * Version: MPL 1.1/GPL 2.0/LGPL 2.1 * @@ -333,14 +333,14 @@ void QuantChooser::SetSkip( CodeBlock& cblock , const int qidx) { const int u_threshold = dirac_quantiser_lists.QuantFactor4( qidx ); - + // Sets the skip flag for a codeblock bool can_skip = true; for (int j=cblock.Ystart(); j<cblock.Yend(); ++j ) { for (int i=cblock.Xstart(); i<cblock.Xend(); ++i ) { - if ( (std::abs(m_coeff_data[j][i])<<2) >= u_threshold ) + if ( (static_cast<int>(std::abs(m_coeff_data[j][i]))<<2) >= u_threshold ) can_skip = false; } } @@ -355,7 +355,7 @@ { 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 , static_cast<int>(std::abs(m_coeff_data[j][i])) ); }// i }// j diff -Nur dirac-1.0.2-orig/libdirac_encoder/quant_chooser.h dirac-1.0.2/libdirac_encoder/quant_chooser.h --- dirac-1.0.2-orig/libdirac_encoder/quant_chooser.h 2010-06-27 12:00:16.868371962 +0200 +++ dirac-1.0.2/libdirac_encoder/quant_chooser.h 2010-06-27 12:05:29.274389459 +0200 @@ -1,6 +1,6 @@ /* ***** BEGIN LICENSE BLOCK ***** * -* $Id: quant_chooser.h,v 1.7 2008/05/27 01:29:54 asuraparaju Exp $ $Name: Dirac_1_0_2 $ +* $Id: quant_chooser.h,v 1.7 2008/05/27 01:29:54 asuraparaju Exp $ $Name: $ * * Version: MPL 1.1/GPL 2.0/LGPL 2.1 *
