sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject [sis] 02/02: Move ComputedImage in public API.
Date Thu, 02 Jan 2020 19:06:19 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 efd6eaac7234bfa14e5d6cb3e8ddee80fc22846f
Author: Martin Desruisseaux <martin.desruisseaux@geomatys.com>
AuthorDate: Thu Jan 2 19:53:28 2020 +0100

    Move ComputedImage in public API.
---
 .../apache/sis/{internal/coverage/j2d => image}/ComputedImage.java   | 5 +----
 .../org/apache/sis/{internal/coverage/j2d => image}/TileCache.java   | 2 +-
 .../java/org/apache/sis/internal/coverage/j2d/ColorModelFactory.java | 2 +-
 .../main/java/org/apache/sis/internal/coverage/j2d/ImageLayout.java  | 1 +
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/ComputedImage.java
b/core/sis-feature/src/main/java/org/apache/sis/image/ComputedImage.java
similarity index 98%
rename from core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/ComputedImage.java
rename to core/sis-feature/src/main/java/org/apache/sis/image/ComputedImage.java
index 99b3e5c..e74a71e 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/ComputedImage.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/image/ComputedImage.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.coverage.j2d;
+package org.apache.sis.image;
 
 import java.util.Set;
 import java.util.HashSet;
@@ -29,7 +29,6 @@ import java.awt.image.SampleModel;
 import java.lang.ref.WeakReference;
 import org.apache.sis.internal.system.ReferenceQueueConsumer;
 import org.apache.sis.internal.feature.Resources;
-import org.apache.sis.image.PlanarImage;
 import org.apache.sis.util.collection.Cache;
 import org.apache.sis.util.ArgumentChecks;
 import org.apache.sis.util.Disposable;
@@ -144,8 +143,6 @@ public abstract class ComputedImage extends PlanarImage {
     /**
      * Creates an initially empty image with the given sample model.
      * The default tile size will be the width and height of the given sample model.
-     * The {@link ImageLayout#createCompatibleSampleModel(RenderedImage)} convenience method
-     * may be used for getting a sample model of desired size.
      *
      * <div class="note"><b>Note:</b>
      * the restriction about sample model size matching tile size is for reducing the amount
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/TileCache.java
b/core/sis-feature/src/main/java/org/apache/sis/image/TileCache.java
similarity index 99%
rename from core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/TileCache.java
rename to core/sis-feature/src/main/java/org/apache/sis/image/TileCache.java
index 6dbdb54..e024556 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/TileCache.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/image/TileCache.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.coverage.j2d;
+package org.apache.sis.image;
 
 import java.awt.image.DataBuffer;
 import java.awt.image.Raster;
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/ColorModelFactory.java
b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/ColorModelFactory.java
index 15fee68..c784929 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/ColorModelFactory.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/ColorModelFactory.java
@@ -396,7 +396,7 @@ public final class ColorModelFactory {
      * @param  maximum        the maximal sample value expected.
      * @return the color space for the given range of values.
      *
-     * @see ImageUtilities#createGrayScale(int, int, int, int, int, double, double)
+     * @see ImageFactory#createGrayScale(int, int, int, int, int, double, double)
      */
     public static ColorModel createGrayScale(final int dataType, final int numComponents,
             final int visibleBand, final double minimum, final double maximum)
diff --git a/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/ImageLayout.java
b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/ImageLayout.java
index 1e29459..e63d523 100644
--- a/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/ImageLayout.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/internal/coverage/j2d/ImageLayout.java
@@ -23,6 +23,7 @@ import java.awt.image.IndexColorModel;
 import java.awt.image.RenderedImage;
 import java.awt.image.SampleModel;
 import org.apache.sis.math.MathFunctions;
+import org.apache.sis.image.ComputedImage;
 import org.apache.sis.util.ArgumentChecks;
 import org.apache.sis.internal.util.Strings;
 


Mime
View raw message