diff --git a/CHANGES.md b/CHANGES.md index 9fd3cc1c8..f44ec29ef 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -36,9 +36,16 @@ - +- Added `GdalTypeDescriptor` to provide access to metadata and supporting routines around `GDALDataType` ordinals. +- **Breaking**: `GDALDataType` is no longer `pub use` in `gdal::raster`, + as `GdalType` and `GdalTypeDescriptor` sufficiently cover use cases in safe code. + Still accessible via `gdal_sys::GDALDataType`. + + - + ## 0.13 -- Add prebuild bindings for GDAL 3.5 +- Add prebuilt bindings for GDAL 3.5 - diff --git a/src/raster/mod.rs b/src/raster/mod.rs index 92d7b4290..4c9e76a93 100644 --- a/src/raster/mod.rs +++ b/src/raster/mod.rs @@ -91,7 +91,7 @@ pub use rasterband::{ StatisticsMinMax, }; pub use rasterize::{rasterize, BurnSource, MergeAlgorithm, OptimizeMode, RasterizeOptions}; -pub use types::{AdjustedValue, GDALDataType, GdalType, GdalTypeDescriptor}; +pub use types::{AdjustedValue, GdalType, GdalTypeDescriptor}; pub use warp::reproject; /// Key/value pair for passing driver-specific creation options to diff --git a/src/raster/rasterband.rs b/src/raster/rasterband.rs index 7ba1e246f..57a51c226 100644 --- a/src/raster/rasterband.rs +++ b/src/raster/rasterband.rs @@ -1,13 +1,14 @@ use crate::dataset::Dataset; use crate::gdal_major_object::MajorObject; use crate::metadata::Metadata; -use crate::raster::{GDALDataType, GdalType}; +use crate::raster::GdalType; use crate::utils::{_last_cpl_err, _last_null_pointer_err, _string}; use gdal_sys::{ self, CPLErr, GDALColorEntry, GDALColorInterp, GDALColorTableH, GDALComputeRasterMinMax, - GDALCreateColorRamp, GDALCreateColorTable, GDALDestroyColorTable, GDALGetPaletteInterpretation, - GDALGetRasterStatistics, GDALMajorObjectH, GDALPaletteInterp, GDALRIOResampleAlg, GDALRWFlag, - GDALRasterBandH, GDALRasterIOExtraArg, GDALSetColorEntry, GDALSetRasterColorTable, + GDALCreateColorRamp, GDALCreateColorTable, GDALDataType, GDALDestroyColorTable, + GDALGetPaletteInterpretation, GDALGetRasterStatistics, GDALMajorObjectH, GDALPaletteInterp, + GDALRIOResampleAlg, GDALRWFlag, GDALRasterBandH, GDALRasterIOExtraArg, GDALSetColorEntry, + GDALSetRasterColorTable, }; use libc::c_int; use std::ffi::CString; diff --git a/src/raster/types.rs b/src/raster/types.rs index ded597d05..b264715c3 100644 --- a/src/raster/types.rs +++ b/src/raster/types.rs @@ -1,8 +1,7 @@ use crate::errors::{GdalError, Result}; use crate::utils::{_last_null_pointer_err, _string}; -pub use gdal_sys::GDALDataType; use gdal_sys::{ - GDALAdjustValueToDataType, GDALDataTypeIsConversionLossy, GDALDataTypeIsFloating, + GDALAdjustValueToDataType, GDALDataType, GDALDataTypeIsConversionLossy, GDALDataTypeIsFloating, GDALDataTypeIsInteger, GDALDataTypeIsSigned, GDALDataTypeUnion, GDALFindDataTypeForValue, GDALGetDataTypeByName, GDALGetDataTypeName, GDALGetDataTypeSizeBits, GDALGetDataTypeSizeBytes, };