You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by de...@apache.org on 2015/09/12 02:09:05 UTC

svn commit: r1702577 - in /sis/branches/JDK7: ./ core/sis-build-helper/src/main/ant/prepare-release.xml core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/TransverseMercator.java

Author: desruisseaux
Date: Sat Sep 12 00:09:05 2015
New Revision: 1702577

URL: http://svn.apache.org/r1702577
Log:
Merge fix from the JDK8 branch.

Modified:
    sis/branches/JDK7/   (props changed)
    sis/branches/JDK7/core/sis-build-helper/src/main/ant/prepare-release.xml
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/TransverseMercator.java

Propchange: sis/branches/JDK7/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 12 00:09:05 2015
@@ -1,4 +1,4 @@
 /sis/branches/Android:1430670-1480699
 /sis/branches/JDK6:1394913-1508480
-/sis/branches/JDK8:1584960-1702436
+/sis/branches/JDK8:1584960-1702576
 /sis/trunk:1394364-1508466,1519089-1519674

Modified: sis/branches/JDK7/core/sis-build-helper/src/main/ant/prepare-release.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-build-helper/src/main/ant/prepare-release.xml?rev=1702577&r1=1702576&r2=1702577&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-build-helper/src/main/ant/prepare-release.xml (original)
+++ sis/branches/JDK7/core/sis-build-helper/src/main/ant/prepare-release.xml Sat Sep 12 00:09:05 2015
@@ -33,6 +33,7 @@
     <replaceregexp file = "${user.dir}/pom.xml"
                   match = "&lt;sis\.plugin\.version&gt;.+&lt;/sis\.plugin\.version&gt;"
                 replace = "&lt;sis.plugin.version&gt;${sis.version}-SNAPSHOT&lt;/sis.plugin.version&gt;"/>
+                <!-- The -SNAPSHOT part will be removed later, at tag creation. -->
 
     <!-- Replace the version number in Java code. -->
     <replaceregexp file = "${user.dir}/core/sis-utility/src/main/java/org/apache/sis/util/Version.java"

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/TransverseMercator.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/TransverseMercator.java?rev=1702577&r1=1702576&r2=1702577&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/TransverseMercator.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/TransverseMercator.java [UTF-8] Sat Sep 12 00:09:05 2015
@@ -484,6 +484,7 @@ public class TransverseMercator extends
             sin_8ξ = sin(8*ξ);
             cos_8ξ = cos(8*ξ);
 
+            sinh_2η = sinh(2*η);
             cosh_2η = cosh(2*η);
             sinh_4η = sinh(4*η);
             cosh_4η = cosh(4*η);