sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1702578 - in /sis/branches/JDK6: ./ core/sis-build-helper/src/main/ant/prepare-release.xml core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/TransverseMercator.java
Date Sat, 12 Sep 2015 00:11:45 GMT
Author: desruisseaux
Date: Sat Sep 12 00:11:44 2015
New Revision: 1702578

URL: http://svn.apache.org/r1702578
Log:
Merge fix from the JDK7 branch.

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

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

Modified: sis/branches/JDK6/core/sis-build-helper/src/main/ant/prepare-release.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-build-helper/src/main/ant/prepare-release.xml?rev=1702578&r1=1702577&r2=1702578&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-build-helper/src/main/ant/prepare-release.xml (original)
+++ sis/branches/JDK6/core/sis-build-helper/src/main/ant/prepare-release.xml Sat Sep 12 00:11:44
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/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/TransverseMercator.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/TransverseMercator.java?rev=1702578&r1=1702577&r2=1702578&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/TransverseMercator.java
[UTF-8] (original)
+++ sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/TransverseMercator.java
[UTF-8] Sat Sep 12 00:11:44 2015
@@ -485,6 +485,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*η);



Mime
View raw message