diff --git a/common/2d/pixel.cpp b/common/2d/pixel.cpp
index 2f39ffdf8..dc0164c3e 100644
--- a/common/2d/pixel.cpp
+++ b/common/2d/pixel.cpp
@@ -47,11 +47,11 @@ void gr_upixel(grs_bitmap &cv_bitmap, const unsigned x, const unsigned y, const
 	}
 }
 
-void gr_pixel(grs_canvas &canvas, const unsigned x, const unsigned y, const uint8_t color)
+void gr_pixel(grs_bitmap &cv_bitmap, const unsigned x, const unsigned y, const uint8_t color)
 {
-	if (unlikely(x >= canvas.cv_bitmap.bm_w || y >= canvas.cv_bitmap.bm_h))
+	if (unlikely(x >= cv_bitmap.bm_w || y >= cv_bitmap.bm_h))
 		return;
-	gr_upixel(canvas.cv_bitmap, x, y, color);
+	gr_upixel(cv_bitmap, x, y, color);
 }
 
 #if !DXX_USE_OGL
diff --git a/common/include/fwd-gr.h b/common/include/fwd-gr.h
index 0d2760748..9192297bc 100644
--- a/common/include/fwd-gr.h
+++ b/common/include/fwd-gr.h
@@ -192,7 +192,7 @@ namespace dcx {
 void gr_settransblend(grs_canvas &, int fade_level, uint8_t blend_func);
 
 // Draws a point into the current canvas in the current color and drawmode.
-void gr_pixel(grs_canvas &, unsigned x, unsigned y, uint8_t color);
+void gr_pixel(grs_bitmap &, unsigned x, unsigned y, uint8_t color);
 void gr_upixel(grs_bitmap &, unsigned x, unsigned y, uint8_t color);
 
 // Gets a pixel;
diff --git a/similar/2d/font.cpp b/similar/2d/font.cpp
index 948b27f2f..1e9daf37d 100644
--- a/similar/2d/font.cpp
+++ b/similar/2d/font.cpp
@@ -1145,7 +1145,7 @@ static int gr_internal_string_clipped_template(grs_canvas &canvas, int x, int y,
 				if (underline)	{
 					for (uint_fast32_t i = width; i--;)
 					{
-						gr_pixel(canvas, x++, y, color);
+						gr_pixel(canvas.cv_bitmap, x++, y, color);
 					}
 				} else {
 					auto fp = proportional ? cv_font.ft_chars[letter] : cv_font.ft_data + letter * BITS_TO_BYTES(width) * cv_font.ft_h;
@@ -1175,7 +1175,7 @@ static int gr_internal_string_clipped_template(grs_canvas &canvas, int x, int y,
 							if (!bit_enabled)
 								continue;
 						}
-						gr_pixel(canvas, x, y, color);
+						gr_pixel(canvas.cv_bitmap, x, y, color);
 					}
 				}
 				}
diff --git a/similar/editor/meddraw.cpp b/similar/editor/meddraw.cpp
index c27123b80..eef332e14 100644
--- a/similar/editor/meddraw.cpp
+++ b/similar/editor/meddraw.cpp
@@ -140,7 +140,7 @@ static void check_segment(const vsegptridx_t seg)
 #endif
 		{
 		uint8_t color = 0;
-		gr_pixel(*grd_curcanv, Search_x, Search_y, color);	//set our search pixel to color zero
+		gr_pixel(grd_curcanv->cv_bitmap, Search_x, Search_y, color);	//set our search pixel to color zero
 		}
 #if DXX_USE_OGL
 		g3_start_frame(*grd_curcanv);
@@ -860,7 +860,7 @@ void find_segments(short x,short y,grs_canvas *screen_canvas,editor_view *v,cons
 	g3_end_frame();
 #endif
 	uint8_t color = 0;
-	gr_pixel(*grd_curcanv, x, y, color);	//set our search pixel to color zero
+	gr_pixel(grd_curcanv->cv_bitmap, x, y, color);	//set our search pixel to color zero
 #if DXX_USE_OGL
 	g3_start_frame(*grd_curcanv);
 #endif
diff --git a/similar/main/endlevel.cpp b/similar/main/endlevel.cpp
index c6458a271..d0a6aaf93 100644
--- a/similar/main/endlevel.cpp
+++ b/similar/main/endlevel.cpp
@@ -1064,7 +1064,7 @@ void draw_stars()
 
 			g3_project_point(p);
 #if !DXX_USE_OGL
-			gr_pixel(*grd_curcanv, f2i(p.p3_sx), f2i(p.p3_sy), color);
+			gr_pixel(grd_curcanv->cv_bitmap, f2i(p.p3_sx), f2i(p.p3_sy), color);
 #else
 			g3_draw_sphere(*grd_curcanv, p, F1_0 * 3, color);
 #endif
diff --git a/similar/main/render.cpp b/similar/main/render.cpp
index e9ef89466..f1c6e9809 100644
--- a/similar/main/render.cpp
+++ b/similar/main/render.cpp
@@ -402,7 +402,7 @@ static void check_face(const vsegidx_t segnum, const unsigned sidenum, const uns
 #endif
 		{
 		uint8_t color = 0;
-		gr_pixel(*grd_curcanv, _search_x, _search_y, color);	//set our search pixel to color zero
+		gr_pixel(grd_curcanv->cv_bitmap, _search_x, _search_y, color);	//set our search pixel to color zero
 		}
 #if DXX_USE_OGL
 		ogl_start_frame(*grd_curcanv);
@@ -587,7 +587,7 @@ static void render_object_search(const vobjptridx_t obj)
 
 	ogl_start_frame(*grd_curcanv);
 #else
-	gr_pixel(*grd_curcanv, _search_x, _search_y, color);
+	gr_pixel(grd_curcanv->cv_bitmap, _search_x, _search_y, color);
 #endif
 	}
 	render_object(obj);
@@ -601,7 +601,7 @@ static void render_object_search(const vobjptridx_t obj)
 	gr_rect(*grd_curcanv, _search_x - 1, _search_y - 1, _search_x + 1, _search_y + 1, color);
 	ogl_start_frame(*grd_curcanv);
 #else
-	gr_pixel(*grd_curcanv, _search_x, _search_y, color);
+	gr_pixel(grd_curcanv->cv_bitmap, _search_x, _search_y, color);
 #endif
 	}
 	render_object(obj);