Fix prelude/imports

emmabritton · Dec 24, 2023 · 87670a6 · 87670a6
1 parent 4ec775f
commit 87670a6
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+### Version 0.12.6
+- Fix prelude/imports
+- Fix crash from offscreen drawing
+
 ### Version 0.12.5
 - Update shapes lib
 

diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "buffer-graphics-lib"
-version = "0.12.5"
+version = "0.12.6"
 edition = "2021"
 authors = ["Emma Britton <emmabritton@pm.me>"]
 description = "Simple graphics library for buffers"
@@ -18,7 +18,7 @@ ici = ["ici-files"]
 
 [dependencies]
 thiserror = "1.0.51"
-graphics-shapes = "0.2.5"
+graphics-shapes = {path="../graphics-shapes"}# "0.2.5"
 serde = { version = "1.0.193", features = ["derive"], optional = true }
 image = { version = "0.24.7", optional = true }
 log = "0.4.20"

diff --git a/README.md b/README.md
@@ -15,7 +15,7 @@ The `Graphics` struct needs a mutable slice to work on and so mostly likely you'
 
 In your `Cargo.toml` file add
 ```toml
-buffer-graphics-lib = "0.12.5"
+buffer-graphics-lib = "0.12.6"
 ```
 
 ### Code

diff --git a/src/drawing.rs b/src/drawing.rs
@@ -149,7 +149,7 @@ impl Graphics<'_> {
                 self.buffer,
                 &self.translate,
                 &self.clip,
-                self.width,
+                (self.width, self.height),
                 xy.x + x as isize,
                 xy.y + y,
                 Color {
@@ -182,7 +182,7 @@ impl Graphics<'_> {
                     self.buffer,
                     &self.translate,
                     &self.clip,
-                    self.width,
+                    (self.width, self.height),
                     x as isize + xy.x,
                     y as isize + xy.y,
                     color.to_color(),
@@ -207,7 +207,7 @@ impl Graphics<'_> {
                     self.buffer,
                     &self.translate,
                     &self.clip,
-                    self.width,
+                    (self.width, self.height),
                     x as isize + xy.x,
                     y as isize + xy.y,
                     color.to_color(),
@@ -231,7 +231,7 @@ impl Graphics<'_> {
                 self.buffer,
                 &self.translate,
                 &self.clip,
-                self.width,
+                (self.width, self.height),
                 px.x,
                 px.y,
                 color,
@@ -264,7 +264,7 @@ impl Graphics<'_> {
                     self.buffer,
                     &self.translate,
                     &self.clip,
-                    self.width,
+                    (self.width, self.height),
                     start.x,
                     y,
                     color,
@@ -276,7 +276,7 @@ impl Graphics<'_> {
                     self.buffer,
                     &self.translate,
                     &self.clip,
-                    self.width,
+                    (self.width, self.height),
                     x,
                     start.y,
                     color,
@@ -302,7 +302,7 @@ impl Graphics<'_> {
                         self.buffer,
                         &self.translate,
                         &self.clip,
-                        self.width,
+                        (self.width, self.height),
                         x,
                         y,
                         color,
@@ -323,7 +323,7 @@ impl Graphics<'_> {
                         self.buffer,
                         &self.translate,
                         &self.clip,
-                        self.width,
+                        (self.width, self.height),
                         x,
                         y,
                         color,
@@ -439,7 +439,7 @@ impl Graphics<'_> {
                         self.buffer,
                         &self.translate,
                         &self.clip,
-                        self.width,
+                        (self.width, self.height),
                         x as isize + pos.0,
                         y as isize + pos.1,
                         color,
@@ -523,7 +523,7 @@ impl Graphics<'_> {
             self.buffer,
             &self.translate,
             &self.clip,
-            self.width,
+            (self.width, self.height),
             x,
             y,
             color,
@@ -538,15 +538,15 @@ fn update_pixel(
     buffer: &mut [u8],
     translate: &Coord,
     clip: &Clip,
-    width: usize,
+    (width, height): (usize, usize),
     x: isize,
     y: isize,
     color: Color,
 ) {
     let x = x + translate.x;
     let y = y + translate.y;
     let idx = ((x + y * width as isize) * 4) as usize;
-    if x >= 0 && y >= 0 && x < width as isize && clip.is_valid((x, y)) {
+    if x >= 0 && y >= 0 && x < width as isize && y < height as isize && clip.is_valid((x, y)) {
         match color.a {
             255 => set_pixel(buffer, idx, color),
             0 => {}