sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject [sis] 02/04: Merge branch 'geoapi-4.0' into feat/netcdf-attribute-names
Date Thu, 21 Feb 2019 12:04:32 GMT
This is an automated email from the ASF dual-hosted git repository.

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

commit bc1c422911483ef6dae138b9e754461f357a1556
Merge: 85928b6 13e0760
Author: Alexis Manin <alexis.manin@gmail.com>
AuthorDate: Mon Feb 18 15:41:10 2019 +0100

    Merge branch 'geoapi-4.0' into feat/netcdf-attribute-names

 .../org/apache/sis/internal/netcdf/Convention.java | 43 +++++++++++++++++--
 .../org/apache/sis/internal/netcdf/Variable.java   | 49 ++++------------------
 .../sis/internal/netcdf/impl/VariableInfo.java     |  7 ++--
 .../sis/internal/netcdf/ucar/VariableWrapper.java  |  7 ++--
 .../apache/sis/internal/netcdf/VariableTest.java   |  5 ++-
 5 files changed, 58 insertions(+), 53 deletions(-)

diff --cc storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Convention.java
index f8c35e8,b864ab5..ae501ef
--- a/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Convention.java
+++ b/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Convention.java
@@@ -16,8 -16,8 +16,9 @@@
   */
  package org.apache.sis.internal.netcdf;
  
 +import java.util.Arrays;
  import java.util.Iterator;
+ import java.awt.image.DataBuffer;
  import org.apache.sis.internal.referencing.LazySet;
  import org.apache.sis.referencing.operation.transform.TransferFunction;
  import org.apache.sis.measure.MeasurementRange;


Mime
View raw message