From ed5640d8b587fbcfed7dd7967f3de04b37a76f26 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 7 Apr 2024 11:06:44 +0200 Subject: Adding upstream version 4:7.4.7. Signed-off-by: Daniel Baumann --- .../patches/libformula-seconds_rounding.patch.1 | 37 ++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 external/jfreereport/patches/libformula-seconds_rounding.patch.1 (limited to 'external/jfreereport/patches/libformula-seconds_rounding.patch.1') diff --git a/external/jfreereport/patches/libformula-seconds_rounding.patch.1 b/external/jfreereport/patches/libformula-seconds_rounding.patch.1 new file mode 100644 index 000000000..369332d1a --- /dev/null +++ b/external/jfreereport/patches/libformula-seconds_rounding.patch.1 @@ -0,0 +1,37 @@ +diff -ur jfreereport_libformula.org/source/org/pentaho/reporting/libraries/formula/function/datetime/SecondFunction.java jfreereport_libformula/source/org/pentaho/reporting/libraries/formula/function/datetime/SecondFunction.java +--- jfreereport_libformula.org/source/org/pentaho/reporting/libraries/formula/function/datetime/SecondFunction.java 2016-03-05 09:43:06.121774691 +0100 ++++ jfreereport_libformula/source/org/pentaho/reporting/libraries/formula/function/datetime/SecondFunction.java 2016-03-05 09:51:04.810488511 +0100 +@@ -29,7 +29,7 @@ + import org.pentaho.reporting.libraries.formula.util.NumberUtil; + + /** +- * This function extracts the minute (0 through 59) from a time. ++ * This function extracts the seconds (0 through 59) from a time. + * + * @author Cedric Pronzato + */ +@@ -67,14 +67,15 @@ + + // time * 24 so that we get the full hours (which we remove later) + final BigDecimal bd = NumberUtil.getAsBigDecimal(n); +- final BigDecimal hours = bd.multiply(MINUTES_PER_DAY); +- final BigDecimal dayAndHoursAsInt = NumberUtil.performIntRounding(hours); +- final BigDecimal minutesFraction = hours.subtract(dayAndHoursAsInt); +- +- // Multiply the minutes with 60 to get the minutes as ints +- final BigDecimal seconds = minutesFraction.multiply(SECONDS); +- final BigDecimal secondsAsInt = NumberUtil.performIntRounding(seconds); ++ final BigDecimal minutes = bd.multiply(MINUTES_PER_DAY); ++ final BigDecimal dayHoursAndMinutesAsInt = NumberUtil.performIntRounding(minutes); ++ final BigDecimal secondsFraction = minutes.subtract(dayHoursAndMinutesAsInt); ++ ++ // Multiply the minutes with 60 to get the seconds as ints ++ final BigDecimal seconds = secondsFraction.multiply(SECONDS); ++ final BigDecimal nanoSeconds = seconds.setScale(9, BigDecimal.ROUND_HALF_UP); ++ final BigDecimal secondsAsInt = NumberUtil.performIntRounding(nanoSeconds); + + return new TypeValuePair(NumberType.GENERIC_NUMBER, secondsAsInt); + } +-} +\ No newline at end of file ++} -- cgit v1.2.3