sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject [sis] 01/01: Merge branch 'geoapi-3.1'
Date Wed, 05 Jun 2019 19:25:26 GMT
This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 4e74c589565dfae2cc93485a104585eb13c8cc9b
Merge: fee544d 62129dd
Author: Martin Desruisseaux <martin.desruisseaux@geomatys.com>
AuthorDate: Wed Jun 5 21:24:35 2019 +0200

    Merge branch 'geoapi-3.1'

 .../org/apache/sis/console/CRSCommandTest.java     |  21 ++-
 .../apache/sis/coverage/grid/GridDerivation.java   |   1 -
 .../java/org/apache/sis/image/DefaultIterator.java |   7 +-
 .../java/org/apache/sis/image/LinearIterator.java  |   5 +-
 .../java/org/apache/sis/image/PixelIterator.java   |   7 +-
 .../feature/jts/GeometryCoordinateTransform.java   |  80 +++++-----
 .../internal/feature/jts/GeometryTransform.java    | 161 ++++++++++++++-------
 .../org/apache/sis/internal/feature/jts/JTS.java   |  30 +++-
 .../org/apache/sis/image/DefaultIteratorTest.java  |  42 ++++--
 .../org/apache/sis/image/LinearIteratorTest.java   |   2 +-
 .../apache/sis/internal/feature/jts/JTSTest.java   |  11 +-
 .../operation/transform/TransformSeparator.java    |  62 ++------
 .../transform/TransformSeparatorTest.java          |  13 +-
 .../java/org/apache/sis/util/CharSequences.java    |  12 +-
 14 files changed, 267 insertions(+), 187 deletions(-)

diff --cc core/sis-feature/src/main/java/org/apache/sis/image/PixelIterator.java
index 8f0d6ef,8b7a793..a8f8bf6
--- a/core/sis-feature/src/main/java/org/apache/sis/image/PixelIterator.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/image/PixelIterator.java
@@@ -473,11 -475,11 +474,11 @@@ public abstract class PixelIterator 
      /**
       * Returns the order in which pixels are traversed. {@link SequenceType#LINEAR} means
that pixels on the first
       * row are traversed from left to right, then pixels on the second row from left to
right, <i>etc.</i>
-      * A {@code null} value means that the iteration order is unspecified.
+      * An empty value means that the iteration order is unspecified.
       *
-      * @return order in which pixels are traversed, or {@code null} if unspecified.
+      * @return order in which pixels are traversed.
       */
-     abstract SequenceType getIterationOrder();
 -    public abstract Optional<SequenceType> getIterationOrder();
++    abstract Optional<SequenceType> getIterationOrder();
  
      /**
       * Returns the number of bands (samples per pixel) in the image or raster.


Mime
View raw message