Sophie

Sophie

distrib > Mageia > 6 > i586 > by-pkgid > 947d4e43bc83b9218d2864f632fa1083 > files > 2

dirac-1.0.2-12.mga6.src.rpm

--- libdirac_encoder/quant_chooser.cpp	2009/01/21 05:22:05	1.20
+++ libdirac_encoder/quant_chooser.cpp	2010/05/09 04:38:31	1.21
@@ -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