Add default implementation of GenericImageView::dimensions

image-rs · Oct 17, 2023 · 5df1171 · 5df1171
1 parent b385ec0
commit 5df1171
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 17 deletions.
diff --git a/src/buffer.rs b/src/buffer.rs
@@ -1169,10 +1169,6 @@ where
 {
     type Pixel = P;
 
-    fn dimensions(&self) -> (u32, u32) {
-        self.dimensions()
-    }
-
     fn bounds(&self) -> (u32, u32, u32, u32) {
         (0, 0, self.width, self.height)
     }

diff --git a/src/flat.rs b/src/flat.rs
@@ -1386,13 +1386,8 @@ where
 {
     type Pixel = P;
 
-    fn dimensions(&self) -> (u32, u32) {
-        (self.inner.layout.width, self.inner.layout.height)
-    }
-
     fn bounds(&self) -> (u32, u32, u32, u32) {
-        let (w, h) = self.dimensions();
-        (0, 0, w, h)
+        (0, 0, self.inner.layout.width, self.inner.layout.height)
     }
 
     fn in_bounds(&self, x: u32, y: u32) -> bool {
@@ -1429,13 +1424,8 @@ where
 {
     type Pixel = P;
 
-    fn dimensions(&self) -> (u32, u32) {
-        (self.inner.layout.width, self.inner.layout.height)
-    }
-
     fn bounds(&self) -> (u32, u32, u32, u32) {
-        let (w, h) = self.dimensions();
-        (0, 0, w, h)
+        (0, 0, self.inner.layout.width, self.inner.layout.height)
     }
 
     fn in_bounds(&self, x: u32, y: u32) -> bool {

diff --git a/src/image.rs b/src/image.rs
@@ -945,7 +945,10 @@ pub trait GenericImageView {
     type Pixel: Pixel;
 
     /// The width and height of this image.
-    fn dimensions(&self) -> (u32, u32);
+    fn dimensions(&self) -> (u32, u32) {
+        let (_, _, w, h) = self.bounds();
+        (w, h)
+    }
 
     /// The width of this image.
     fn width(&self) -> u32 {