This is an automated email from the ASF dual-hosted git repository.

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

commit 0a0451285d9059324eba0c09de3cc6e5c21d4ac8
Merge: 65cb13ffb1 f5ba1784c7
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Wed Feb 26 18:09:00 2025 +0100

    Merge branch 'geoapi-3.1': renaming of GeoHEIF classes and module.

 .../main/module-info.java                          |  2 +-
 .../org.apache.sis.storage/main/module-info.java   |  4 +-
 incubator/build.gradle.kts                         |  2 +-
 .../org.apache.sis.storage.DataStoreProvider       |  2 +-
 ...apache.sis.storage.geoheif.isobmff.BoxRegistry} |  6 ++-
 .../main/module-info.java                          | 20 +++----
 .../apache/sis/storage/geoheif/FromImageIO.java}   |  6 +--
 .../apache/sis/storage/geoheif/GeoHeifStore.java}  | 62 +++++++++++-----------
 .../sis/storage/geoheif/GeoHeifStoreProvider.java} | 10 ++--
 .../org/apache/sis/storage/geoheif}/GimiTile.java  |  6 +--
 .../sis/storage/geoheif}/GimiTileMatrix.java       |  7 ++-
 .../sis/storage/geoheif}/GimiTileMatrixSet.java    |  7 ++-
 .../org/apache/sis/storage/geoheif}/Group.java     |  8 +--
 .../org/apache/sis/storage/geoheif/Image.java}     | 34 ++++++------
 .../apache/sis/storage/geoheif/ImageResource.java} | 35 ++++++------
 .../sis/storage/geoheif}/MatrixGridRessource.java  |  4 +-
 .../org/apache/sis/storage/geoheif/Pyramid.java}   | 42 +++++++--------
 .../sis/storage/geoheif}/ResourceUnknown.java      |  8 +--
 .../sis/storage/geoheif}/ScaleSortedMap.java       |  4 +-
 .../apache/sis/storage/geoheif}/TileMatrices.java  |  4 +-
 .../sis/storage/geoheif/UncompressedImage.java}    | 54 +++++++++----------
 .../apache/sis/storage/geoheif}/package-info.java  |  2 +-
 .../main/org/apache/sis/storage}/isobmff/Box.java  | 13 +++--
 .../apache/sis/storage}/isobmff/BoxRegistry.java   |  2 +-
 .../org/apache/sis/storage/isobmff}/Extension.java |  4 +-
 .../org/apache/sis/storage}/isobmff/FullBox.java   |  2 +-
 .../org/apache/sis/storage/isobmff/Reader.java}    |  9 ++--
 .../org/apache/sis/storage/isobmff/TreeNode.java}  |  7 +--
 .../storage/isobmff/base}/ColourInformation.java   |  8 +--
 .../sis/storage/isobmff/base}/CombinaisonType.java |  8 +--
 .../sis/storage/isobmff/base}/EntityToGroup.java   |  8 +--
 .../sis/storage/isobmff/base}/ExtendedType.java    |  4 +-
 .../storage/isobmff/base}/FDItemInfoExtension.java |  8 +--
 .../apache/sis/storage/isobmff/base}/FileType.java |  2 +-
 .../sis/storage/isobmff/base}/FreeSpace.java       |  4 +-
 .../sis/storage/isobmff/base}/GeneralType.java     |  8 +--
 .../sis/storage/isobmff/base}/GroupList.java       |  4 +-
 .../storage/isobmff/base}/HandlerReference.java    |  8 +--
 .../sis/storage/isobmff/base}/ISO14496_12.java     |  6 +--
 .../storage/isobmff/base}/IdentifiedMediaData.java |  8 +--
 .../apache/sis/storage/isobmff/base}/ItemData.java |  4 +-
 .../storage/isobmff/base}/ItemFullProperty.java    |  4 +-
 .../apache/sis/storage/isobmff/base}/ItemInfo.java |  8 +--
 .../sis/storage/isobmff/base}/ItemInfoEntry.java   | 10 ++--
 .../sis/storage/isobmff/base}/ItemLocation.java    | 10 ++--
 .../sis/storage/isobmff/base}/ItemProperties.java  |  4 +-
 .../sis/storage/isobmff/base}/ItemProperty.java    |  4 +-
 .../isobmff/base}/ItemPropertyAssociation.java     | 10 ++--
 .../isobmff/base}/ItemPropertyContainer.java       |  4 +-
 .../sis/storage/isobmff/base}/ItemReference.java   | 10 ++--
 .../sis/storage/isobmff/base}/MediaData.java       |  4 +-
 .../org/apache/sis/storage/isobmff/base}/Meta.java |  4 +-
 .../apache/sis/storage/isobmff/base}/Movie.java    |  4 +-
 .../sis/storage/isobmff/base}/MovieHeader.java     |  8 +--
 .../storage/isobmff/base}/OriginalFileType.java    |  4 +-
 .../sis/storage/isobmff/base}/PrimaryItem.java     |  8 +--
 .../isobmff/base}/ProgressiveDownloadInfo.java     |  8 +--
 .../isobmff/base}/SingleItemTypeReference.java     |  8 +--
 .../base}/SingleItemTypeReferenceLarge.java        |  6 +--
 .../apache/sis/storage/isobmff/base}/Track.java    |  4 +-
 .../sis/storage/isobmff/base}/TrackHeader.java     |  8 +--
 .../sis/storage/isobmff/base/package-info.java}    |  5 +-
 .../org/apache/sis/storage}/isobmff/gimi/GIMI.java | 22 ++++----
 .../apache/sis/storage/isobmff/gimi/ModelCRS.java} | 10 ++--
 .../sis/storage/isobmff/gimi/ModelTiePoint.java}   | 12 ++---
 .../storage/isobmff/gimi/ModelTransformation.java} | 10 ++--
 .../isobmff/gimi/TiledImageConfiguration.java}     | 10 ++--
 .../sis/storage/isobmff/gimi/package-info.java}    |  5 +-
 .../isobmff/image}/DerivedImageReference.java      |  4 +-
 .../sis/storage/isobmff/image}/ISO23008_12.java    | 18 +++----
 .../sis/storage/isobmff/image/ImagePyramid.java}   | 12 ++---
 .../isobmff/image}/ImageSpatialExtents.java        |  8 +--
 .../storage/isobmff/image/PixelInformation.java}   | 10 ++--
 .../storage/isobmff/image/UserDescription.java}    | 10 ++--
 .../sis/storage/isobmff/image/package-info.java}   |  5 +-
 .../sis/storage/isobmff/mpeg}/ChromaLocation.java  |  8 +--
 .../storage/isobmff/mpeg}/ComponentDefinition.java |  8 +--
 .../storage/isobmff/mpeg}/ComponentPalette.java    |  8 +--
 .../isobmff/mpeg}/ComponentPatternDefinition.java  |  8 +--
 .../isobmff/mpeg}/ComponentReferenceLevel.java     |  8 +--
 .../isobmff/mpeg}/DepthMappingInformation.java     |  8 +--
 .../isobmff/mpeg}/DisparityInformation.java        |  8 +--
 .../sis/storage/isobmff/mpeg/FieldInterlace.java}  | 10 ++--
 .../storage/isobmff/mpeg}/FieldInterlaceType.java  |  8 +--
 .../isobmff/mpeg}/FramePackingInformation.java     |  8 +--
 .../sis/storage/isobmff/mpeg}/ISO23001_17.java     | 10 ++--
 .../mpeg}/PolarizationPatternDefinition.java       |  8 +--
 .../storage/isobmff/mpeg}/SensorBadPixelsMap.java  |  8 +--
 .../mpeg}/SensorNonUniformityCorrection.java       |  8 +--
 .../sis/storage/isobmff/mpeg}/TAIClockInfo.java    |  8 +--
 .../sis/storage/isobmff/mpeg}/TAITimeStamp.java    |  8 +--
 .../isobmff/mpeg}/UncompressedFrameConfig.java     | 10 ++--
 .../sis/storage/isobmff/mpeg/package-info.java}    |  5 +-
 .../apache/sis/storage/isobmff/package-info.java}  |  5 +-
 .../storage/isobmff/video}/ContentDescribes.java   |  4 +-
 .../sis/storage/isobmff/video}/ISO14496_10.java    |  6 +--
 .../sis/storage/isobmff/video/package-info.java}   |  5 +-
 .../org/apache/sis/storage/geoheif}/StoreTest.java |  2 +-
 ...org.apache.sis.storage.gimi.isobmff.BoxRegistry |  8 ---
 99 files changed, 434 insertions(+), 460 deletions(-)


Reply via email to