From 6b4e88b51587153dceb8855e4f573694bf6a15c2 Mon Sep 17 00:00:00 2001
From: Andreas Kling <awesomekling@gmail.com>
Date: Sat, 12 Jan 2019 21:29:05 +0100
Subject: [PATCH] Give GraphicsBitmap a member for the pitch.

---
 Widgets/GraphicsBitmap.cpp | 8 ++++----
 Widgets/GraphicsBitmap.h   | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Widgets/GraphicsBitmap.cpp b/Widgets/GraphicsBitmap.cpp
index 6c7399c444..8bbd437954 100644
--- a/Widgets/GraphicsBitmap.cpp
+++ b/Widgets/GraphicsBitmap.cpp
@@ -13,6 +13,7 @@ RetainPtr<GraphicsBitmap> GraphicsBitmap::create_wrapper(const Size& size, RGBA3
 
 GraphicsBitmap::GraphicsBitmap(const Size& size)
     : m_size(size)
+    , m_pitch(size.width() * sizeof(RGBA32))
 {
     m_data = static_cast<RGBA32*>(kmalloc(size.width() * size.height() * sizeof(RGBA32)));
     memset(m_data, 0, size.width() * size.height() * sizeof(RGBA32));
@@ -22,6 +23,7 @@ GraphicsBitmap::GraphicsBitmap(const Size& size)
 GraphicsBitmap::GraphicsBitmap(const Size& size, RGBA32* data)
     : m_size(size)
     , m_data(data)
+    , m_pitch(size.width() * sizeof(RGBA32))
     , m_owned(false)
 {
 }
@@ -35,12 +37,10 @@ GraphicsBitmap::~GraphicsBitmap()
 
 RGBA32* GraphicsBitmap::scanline(int y)
 {
-    unsigned pitch = m_size.width() * sizeof(RGBA32);
-    return reinterpret_cast<RGBA32*>((((byte*)m_data) + (y * pitch)));
+    return reinterpret_cast<RGBA32*>((((byte*)m_data) + (y * m_pitch)));
 }
 
 const RGBA32* GraphicsBitmap::scanline(int y) const
 {
-    unsigned pitch = m_size.width() * sizeof(RGBA32);
-    return reinterpret_cast<RGBA32*>((((byte*)m_data) + (y * pitch)));
+    return reinterpret_cast<const RGBA32*>((((const byte*)m_data) + (y * m_pitch)));
 }
diff --git a/Widgets/GraphicsBitmap.h b/Widgets/GraphicsBitmap.h
index 19c271ad4a..64d68d2134 100644
--- a/Widgets/GraphicsBitmap.h
+++ b/Widgets/GraphicsBitmap.h
@@ -24,5 +24,6 @@ private:
 
     Size m_size;
     RGBA32* m_data { nullptr };
+    size_t m_pitch { 0 };
     bool m_owned { false };
 };