Ticket #8428: drawLine.diff

graphics/surface.cpp

@@ -20 +20 @@
 
 #include "common/stdafx.h"
 #include "common/util.h"
+#include "graphics/primitives.h"
 #include "graphics/surface.h"
 
 namespace Graphics {
 
+static void plotPoint(int x, int y, int color, void *data) {
+        Surface *s = (Surface *)data;
+
+        if (s->bytesPerPixel == 1) {
+                byte *ptr = (byte *)s->getBasePtr(x, y);
+                *ptr = (byte)color;
+        } else if (s->bytesPerPixel == 2) {
+                uint16 *ptr = (uint16 *)s->getBasePtr(x, y);
+                *ptr = (uint16)color;
+        } else {
+                error("plotPoint: bytesPerPixel must be 1 or 2");
+        }
+}
+
+void Surface::drawLine(int x0, int y0, int x1, int y1, uint32 color) const {
+        Graphics::drawLine(x0, y0, x1, y1, color, &plotPoint, const_cast<Surface *>(this));
+}
+
 void Surface::hLine(int x, int y, int x2, uint32 color) const {
         // Clipping
         if (y < 0 || y >= h)

graphics/surface.h

@@ -42 +42 @@
         inline void *getBasePtr(int x, int y) const {
                 return (void *)((byte *)pixels + y * pitch + x * bytesPerPixel);
         }
-        
+
+        void drawLine(int x0, int y0, int x1, int y1, uint32 color) const;
         void hLine(int x, int y, int x2, uint32 color) const;
         void vLine(int x, int y, int y2, uint32 color) const;
         void fillRect(const Common::Rect &r, uint32 color) const;