This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/sis.git
from 0a0451285d Merge branch 'geoapi-3.1': renaming of GeoHEIF classes and
module.
add c7bfa69041 Refactoring of the GIMI reader: * Rename "gimi" module and
packages as "geoheif". * Retrofit GIMI internal package into the main package.
* Reduce the visibility of classes that don't need to be public. * Handle
container boxes in a dedicated `ContainerBox` subclass. * Move some field
initializations to constructors (it removes redundancies). * Keep box
identifiers as integers instead of converting them to strings. * Replace chains
of `if - else` statements by a switch [...]
add 470783640d Merge branch 'geoapi-4.0' into geoapi-3.1: refactoring of
the GIMI reader.
new 81e91adb6b Merge branch 'geoapi-3.1': refactoring of GeoHEIF reader.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../apache/sis/buildtools/gradle/Dependency.java | 2 +-
.../org.apache.sis.feature/main/module-info.java | 5 +-
.../main/org/apache/sis/metadata/sql/Contents.sql | 2 +
.../main/module-info.java | 6 +-
.../org.apache.sis.storage/main/module-info.java | 4 +-
.../src/org.apache.sis.util/main/module-info.java | 9 +-
.../main/org/apache/sis/util/ArraysExt.java | 24 +-
incubator/build.gradle.kts | 8 +-
....apache.sis.storage.geoheif.isobmff.BoxRegistry | 8 -
.../main/module-info.java | 25 +-
.../sis/storage/geoheif/CoverageBuilder.java | 687 +++++++++++++++++++++
.../apache/sis/storage/geoheif/FromImageIO.java | 157 ++++-
.../apache/sis/storage/geoheif/GeoHeifStore.java | 446 +++++++------
.../sis/storage/geoheif/GeoHeifStoreProvider.java | 100 +--
.../org/apache/sis/storage/geoheif/GimiTile.java | 67 --
.../apache/sis/storage/geoheif/GimiTileMatrix.java | 116 ----
.../sis/storage/geoheif/GimiTileMatrixSet.java | 72 ---
.../main/org/apache/sis/storage/geoheif/Group.java | 64 +-
.../main/org/apache/sis/storage/geoheif/Image.java | 254 ++------
.../apache/sis/storage/geoheif/ImageResource.java | 460 ++++++++++----
.../sis/storage/geoheif/MatrixGridRessource.java | 154 -----
.../org/apache/sis/storage/geoheif/Pyramid.java | 195 +-----
.../sis/storage/geoheif/ResourceBuilder.java | 467 ++++++++++++++
.../sis/storage/geoheif/ResourceUnknown.java | 62 --
.../apache/sis/storage/geoheif/ScaleSortedMap.java | 105 ----
.../apache/sis/storage/geoheif/TileMatrices.java | 65 --
.../sis/storage/geoheif/UncompressedImage.java | 361 +++--------
.../apache/sis/storage/geoheif/package-info.java | 7 +-
.../main/org/apache/sis/storage/isobmff/Box.java | 278 ++-------
.../apache/sis/storage/isobmff/BoxRegistry.java | 87 ++-
.../org/apache/sis/storage/isobmff/ByteReader.java | 92 +++
.../apache/sis/storage/isobmff/ContainerBox.java | 76 +++
.../org/apache/sis/storage/isobmff/Extension.java | 64 +-
.../org/apache/sis/storage/isobmff/FullBox.java | 86 ++-
.../sis/storage/isobmff/MainBoxRegistry.java | 189 ++++++
.../org/apache/sis/storage/isobmff/Reader.java | 448 ++++++++++----
.../main/org/apache/sis/storage/isobmff/Root.java | 53 ++
.../org/apache/sis/storage/isobmff/TreeNode.java | 372 ++++++++++-
...llBox.java => UnsupportedVersionException.java} | 25 +-
.../apache/sis/storage/isobmff/VectorReader.java | 134 ++++
.../storage/isobmff/base/ColourInformation.java | 112 +++-
.../sis/storage/isobmff/base/CombinaisonType.java | 34 +-
.../apache/sis/storage/isobmff/base/Copyright.java | 92 +++
.../sis/storage/isobmff/base/EntityToGroup.java | 40 +-
.../sis/storage/isobmff/base/ExtendedType.java | 51 +-
.../storage/isobmff/base/FDItemInfoExtension.java | 80 ++-
.../apache/sis/storage/isobmff/base/FileType.java | 58 +-
.../apache/sis/storage/isobmff/base/FreeSpace.java | 32 +-
.../sis/storage/isobmff/base/GeneralType.java | 53 --
.../apache/sis/storage/isobmff/base/GroupList.java | 40 +-
.../sis/storage/isobmff/base/HandlerReference.java | 58 +-
.../apache/sis/storage/isobmff/base/HeaderBox.java | 102 +++
.../sis/storage/isobmff/base/ISO14496_12.java | 115 ----
.../storage/isobmff/base/IdentifiedMediaData.java | 60 +-
.../apache/sis/storage/isobmff/base/ItemData.java | 70 ++-
.../sis/storage/isobmff/base/ItemFullProperty.java | 28 -
.../apache/sis/storage/isobmff/base/ItemInfo.java | 86 ++-
.../sis/storage/isobmff/base/ItemInfoEntry.java | 184 +++++-
.../sis/storage/isobmff/base/ItemLocation.java | 332 +++++++---
.../sis/storage/isobmff/base/ItemProperties.java | 182 +++++-
.../sis/storage/isobmff/base/ItemProperty.java | 28 -
.../isobmff/base/ItemPropertyAssociation.java | 171 ++++-
.../isobmff/base/ItemPropertyContainer.java | 41 +-
.../sis/storage/isobmff/base/ItemReference.java | 61 +-
.../apache/sis/storage/isobmff/base/MediaData.java | 59 +-
.../org/apache/sis/storage/isobmff/base/Meta.java | 76 ++-
.../org/apache/sis/storage/isobmff/base/Movie.java | 37 +-
.../sis/storage/isobmff/base/MovieHeader.java | 55 +-
.../sis/storage/isobmff/base/OriginalFileType.java | 40 +-
.../sis/storage/isobmff/base/PrimaryItem.java | 48 +-
.../isobmff/base/ProgressiveDownloadInfo.java | 36 +-
.../isobmff/base/SingleItemTypeReference.java | 55 +-
.../isobmff/base/SingleItemTypeReferenceLarge.java | 38 --
.../org/apache/sis/storage/isobmff/base/Track.java | 39 +-
.../sis/storage/isobmff/base/TrackHeader.java | 100 ++-
.../apache/sis/storage/isobmff/base/UserData.java | 59 ++
.../sis/storage/isobmff/base/package-info.java | 11 +
.../org/apache/sis/storage/isobmff/gimi/GIMI.java | 70 ---
.../apache/sis/storage/isobmff/gimi/ModelCRS.java | 94 ++-
.../sis/storage/isobmff/gimi/ModelTiePoint.java | 87 ++-
.../storage/isobmff/gimi/ModelTransformation.java | 74 ++-
.../isobmff/gimi/TiledImageConfiguration.java | 28 +-
.../sis/storage/isobmff/gimi/UnknownProperty.java | 63 ++
.../sis/storage/isobmff/gimi/package-info.java | 7 +
.../sis/storage/isobmff/image/CreationTime.java | 69 +++
.../isobmff/image/DerivedImageReference.java | 27 +-
.../sis/storage/isobmff/image/ISO23008_12.java | 72 ---
.../sis/storage/isobmff/image/ImagePyramid.java | 105 +++-
.../storage/isobmff/image/ImageSpatialExtents.java | 64 +-
.../storage/isobmff/image/ModificationTime.java | 69 +++
.../storage/isobmff/image/PixelInformation.java | 50 +-
.../sis/storage/isobmff/image/UserDescription.java | 83 ++-
.../sis/storage/isobmff/image/package-info.java | 10 +
.../sis/storage/isobmff/mpeg/ChromaLocation.java | 34 +-
.../apache/sis/storage/isobmff/mpeg/Component.java | 138 +++++
.../storage/isobmff/mpeg/ComponentDefinition.java | 96 ++-
.../sis/storage/isobmff/mpeg/ComponentPalette.java | 146 ++++-
.../isobmff/mpeg/ComponentPatternDefinition.java | 71 ++-
.../isobmff/mpeg/ComponentReferenceLevel.java | 34 +-
.../sis/storage/isobmff/mpeg/ComponentType.java | 188 ++++++
.../isobmff/mpeg/DepthMappingInformation.java | 34 +-
.../storage/isobmff/mpeg/DisparityInformation.java | 34 +-
.../sis/storage/isobmff/mpeg/FieldInterlace.java | 34 +-
.../storage/isobmff/mpeg/FieldInterlaceType.java | 31 +-
.../isobmff/mpeg/FramePackingInformation.java | 34 +-
.../sis/storage/isobmff/mpeg/ISO23001_17.java | 93 ---
.../sis/storage/isobmff/mpeg/InterleavingMode.java | 101 +++
.../mpeg/PolarizationPatternDefinition.java | 34 +-
.../storage/isobmff/mpeg/SensorBadPixelsMap.java | 34 +-
.../mpeg/SensorNonUniformityCorrection.java | 34 +-
.../sis/storage/isobmff/mpeg/TAIClockInfo.java | 69 ++-
.../sis/storage/isobmff/mpeg/TAITimeStamp.java | 55 +-
.../isobmff/mpeg/UncompressedFrameConfig.java | 278 +++++++--
.../sis/storage/isobmff/mpeg/package-info.java | 10 +
.../apache/sis/storage/isobmff/package-info.java | 30 +
.../storage/isobmff/video/ContentDescribes.java | 31 +-
.../sis/storage/isobmff/video/ISO14496_10.java | 61 --
.../sis/storage/isobmff/video/package-info.java | 10 +
.../org/apache/sis/storage/geoheif/StoreTest.java | 21 -
.../org/apache/sis/storage/isobmff/BoxTest.java | 36 +-
.../sis/storage/isobmff/gimi/ExtensionTest.java | 19 +-
.../storage/isobmff/mpeg/ComponentTypeTest.java | 60 ++
netbeans-project/nbproject/project.properties | 2 +-
netbeans-project/nbproject/project.xml | 1 +
124 files changed, 7933 insertions(+), 3491 deletions(-)
delete mode 100644
incubator/src/org.apache.sis.storage.geoheif/main/META-INF/services/org.apache.sis.storage.geoheif.isobmff.BoxRegistry
create mode 100644
incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/geoheif/CoverageBuilder.java
delete mode 100644
incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/geoheif/GimiTile.java
delete mode 100644
incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/geoheif/GimiTileMatrix.java
delete mode 100644
incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/geoheif/GimiTileMatrixSet.java
delete mode 100644
incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/geoheif/MatrixGridRessource.java
create mode 100644
incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/geoheif/ResourceBuilder.java
delete mode 100644
incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/geoheif/ResourceUnknown.java
delete mode 100644
incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/geoheif/ScaleSortedMap.java
delete mode 100644
incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/geoheif/TileMatrices.java
create mode 100644
incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/ByteReader.java
create mode 100644
incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/ContainerBox.java
create mode 100644
incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/MainBoxRegistry.java
create mode 100644
incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/Root.java
copy
incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/{FullBox.java
=> UnsupportedVersionException.java} (51%)
create mode 100644
incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/VectorReader.java
create mode 100644
incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/base/Copyright.java
delete mode 100644
incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/base/GeneralType.java
create mode 100644
incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/base/HeaderBox.java
delete mode 100644
incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/base/ISO14496_12.java
delete mode 100644
incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/base/ItemFullProperty.java
delete mode 100644
incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/base/ItemProperty.java
delete mode 100644
incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/base/SingleItemTypeReferenceLarge.java
create mode 100644
incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/base/UserData.java
delete mode 100644
incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/gimi/GIMI.java
create mode 100644
incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/gimi/UnknownProperty.java
create mode 100644
incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/image/CreationTime.java
delete mode 100644
incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/image/ISO23008_12.java
create mode 100644
incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/image/ModificationTime.java
create mode 100644
incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/mpeg/Component.java
create mode 100644
incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/mpeg/ComponentType.java
delete mode 100644
incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/mpeg/ISO23001_17.java
create mode 100644
incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/mpeg/InterleavingMode.java
delete mode 100644
incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/video/ISO14496_10.java
delete mode 100644
incubator/src/org.apache.sis.storage.geoheif/test/org/apache/sis/storage/geoheif/StoreTest.java
copy
endorsed/src/org.apache.sis.cloud.aws/test/org/apache/sis/cloud/aws/s3/ClientFileSystemTest.java
=>
incubator/src/org.apache.sis.storage.geoheif/test/org/apache/sis/storage/isobmff/BoxTest.java
(60%)
copy
endorsed/src/org.apache.sis.feature/test/org/apache/sis/image/ImageLayoutTest.java
=>
incubator/src/org.apache.sis.storage.geoheif/test/org/apache/sis/storage/isobmff/gimi/ExtensionTest.java
(68%)
create mode 100644
incubator/src/org.apache.sis.storage.geoheif/test/org/apache/sis/storage/isobmff/mpeg/ComponentTypeTest.java
