Merge pull request #62 from pimoroni/circle_fix

Circle fix
pimoroni · Nov 2, 2021 · 5322efe · 5322efe
2 parents 5b278e1 + 107fed2
commit 5322efe
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 71 deletions.
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
@@ -7,4 +7,4 @@ add_subdirectory(colour)
 #add_subdirectory(sfx)
 add_subdirectory(music)
 add_subdirectory(blend)
-add_subdirectory(blit)
+add_subdirectory(blit)
diff --git a/examples/bouncing_balls/CMakeLists.txt b/examples/bouncing_balls/CMakeLists.txt
diff --git a/examples/bouncing_balls/bouncing_balls.cpp b/examples/bouncing_balls/bouncing_balls.cpp
diff --git a/libraries/blend.cpp b/libraries/blend.cpp
@@ -11,7 +11,7 @@ namespace picosystem {
       if(uintptr_t(pd) & 0b11 && c) { *pd++ = *ps; c--; } // align to 32bits
       uint32_t *pda = (uint32_t *)pd; uint32_t s = *ps | (*ps << 16);
       while(c > 1) { *pda++ = s; c-=2; } // two pixel copy
-      if(c) { *pd++ = *ps; c--; } // finish if needed
+      if(c) { pd = (color_t *)pda; *pd = *ps; } // finish if needed
     }else if(ss == 1 << 16) {
       // optimised for source step == 1
       memcpy(pd, ps, c * 2);

diff --git a/libraries/primitives.cpp b/libraries/primitives.cpp
@@ -43,7 +43,7 @@ namespace picosystem {
     _camera_offset(false);
     hline(x, y, w);
     vline(x, y + 1, h - 1);
-    hline(x + 1, y + h - 1, w);
+    hline(x + 1, y + h - 1, w - 1);
     vline(x + w - 1, y, h - 1);
     _camera_offset(true);
   }