tags 564976 + patch kthxbye Attached is a patch which fixes the FTBFS. In both cases, a double value was being passed to std::abs. I presume that previously std::abs automatically converted the double to an int; however, it does not do that anymore. I forced conversion to int because in both cases the comparisons are against other int values.
-- brian m. carlson / brian with sandals: Houston, Texas, US +1 832 623 2791 | http://www.crustytoothpaste.net/~bmc | My opinion only OpenPGP: RSA v4 4096b: 88AC E9B2 9196 305B A994 7552 F1BA 225C 0223 B187
diff -ur dirac.old/libdirac_encoder/quant_chooser.cpp dirac-1.0.2/libdirac_encoder/quant_chooser.cpp
--- dirac.old/libdirac_encoder/quant_chooser.cpp 2009-01-21 05:22:05.000000000 +0000
+++ dirac-1.0.2/libdirac_encoder/quant_chooser.cpp 2010-07-03 17:40:12.000000000 +0000
@@ -340,7 +340,7 @@
{
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 @@
{
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
signature.asc
Description: Digital signature
