Move Buffer/ByteBuffer to raster::types

Author: julienr

src/raster/mod.rs

@@ -86,12 +86,11 @@ pub use mdarray::{
     Attribute, Dimension, ExtendedDataType, ExtendedDataTypeClass, Group, MDArray, MdStatisticsAll,
 };
 pub use rasterband::{
-    Buffer, ByteBuffer, CmykEntry, ColorEntry, ColorInterpretation, ColorTable, GrayEntry,
-    HlsEntry, PaletteInterpretation, RasterBand, RgbaEntry, StatisticsAll,
-    StatisticsMinMax,
+    CmykEntry, ColorEntry, ColorInterpretation, ColorTable, GrayEntry, HlsEntry,
+    PaletteInterpretation, RasterBand, RgbaEntry, StatisticsAll, StatisticsMinMax,
 };
 pub use rasterize::{rasterize, BurnSource, MergeAlgorithm, OptimizeMode, RasterizeOptions};
-pub use types::{AdjustedValue, GdalDataType, GdalType, ResampleAlg};
+pub use types::{AdjustedValue, Buffer, ByteBuffer, GdalDataType, GdalType, ResampleAlg};
 pub use warp::reproject;
 
 /// Key/value pair for passing driver-specific creation options to

src/raster/rasterband.rs

@@ -1,7 +1,7 @@
 use crate::dataset::Dataset;
 use crate::gdal_major_object::MajorObject;
 use crate::metadata::Metadata;
-use crate::raster::{GdalDataType, GdalType, ResampleAlg};
+use crate::raster::{Buffer, GdalDataType, GdalType, ResampleAlg};
 use crate::utils::{_last_cpl_err, _last_null_pointer_err, _string};
 use gdal_sys::{
     self, CPLErr, GDALColorEntry, GDALColorInterp, GDALColorTableH, GDALComputeRasterMinMax,
@@ -705,19 +705,6 @@ impl<'a> MajorObject for RasterBand<'a> {
 
 impl<'a> Metadata for RasterBand<'a> {}
 
-pub struct Buffer<T: GdalType> {
-    pub size: (usize, usize),
-    pub data: Vec<T>,
-}
-
-impl<T: GdalType> Buffer<T> {
-    pub fn new(size: (usize, usize), data: Vec<T>) -> Buffer<T> {
-        Buffer { size, data }
-    }
-}
-
-pub type ByteBuffer = Buffer<u8>;
-
 /// Represents a color interpretation of a RasterBand
 #[derive(Debug, PartialEq, Eq)]
 pub enum ColorInterpretation {

src/raster/types.rs

@@ -446,6 +446,19 @@ impl ResampleAlg {
     }
 }
 
+pub struct Buffer<T: GdalType> {
+    pub size: (usize, usize),
+    pub data: Vec<T>,
+}
+
+impl<T: GdalType> Buffer<T> {
+    pub fn new(size: (usize, usize), data: Vec<T>) -> Buffer<T> {
+        Buffer { size, data }
+    }
+}
+
+pub type ByteBuffer = Buffer<u8>;
+
 #[cfg(test)]
 mod tests {
     use super::*;