summaryrefslogtreecommitdiff
path: root/kms++/inc
diff options
context:
space:
mode:
authorTomi Valkeinen <tomi.valkeinen@ti.com>2019-11-18 12:07:36 +0200
committerTomi Valkeinen <tomi.valkeinen@ti.com>2019-11-18 12:12:39 +0200
commitf824cccac7311647a8bd22d193d3aac2b961a1dd (patch)
tree3fd742c256fe0acd92d4a21b0e06944fb2256e14 /kms++/inc
parent7a52c7d720398da7df242aeef7be652b54290e94 (diff)
fbs: use std::array and .at()
Use std::array and .at() to get bounds checking. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'kms++/inc')
-rw-r--r--kms++/inc/kms++/dmabufframebuffer.h10
-rw-r--r--kms++/inc/kms++/dumbframebuffer.h10
-rw-r--r--kms++/inc/kms++/extframebuffer.h10
3 files changed, 15 insertions, 15 deletions
diff --git a/kms++/inc/kms++/dmabufframebuffer.h b/kms++/inc/kms++/dmabufframebuffer.h
index 73c6d21..2a9182d 100644
--- a/kms++/inc/kms++/dmabufframebuffer.h
+++ b/kms++/inc/kms++/dmabufframebuffer.h
@@ -20,10 +20,10 @@ public:
PixelFormat format() const override { return m_format; }
unsigned num_planes() const override { return m_num_planes; }
- uint32_t handle(unsigned plane) const { return m_planes[plane].handle; }
- uint32_t stride(unsigned plane) const override { return m_planes[plane].stride; }
- uint32_t size(unsigned plane) const override { return m_planes[plane].size; }
- uint32_t offset(unsigned plane) const override { return m_planes[plane].offset; }
+ uint32_t handle(unsigned plane) const { return m_planes.at(plane).handle; }
+ uint32_t stride(unsigned plane) const override { return m_planes.at(plane).stride; }
+ uint32_t size(unsigned plane) const override { return m_planes.at(plane).size; }
+ uint32_t offset(unsigned plane) const override { return m_planes.at(plane).offset; }
uint8_t* map(unsigned plane) override;
int prime_fd(unsigned plane) override;
@@ -41,7 +41,7 @@ private:
};
unsigned m_num_planes;
- struct FramebufferPlane m_planes[4];
+ std::array<FramebufferPlane, 4> m_planes;
PixelFormat m_format;
diff --git a/kms++/inc/kms++/dumbframebuffer.h b/kms++/inc/kms++/dumbframebuffer.h
index b722615..f450b2c 100644
--- a/kms++/inc/kms++/dumbframebuffer.h
+++ b/kms++/inc/kms++/dumbframebuffer.h
@@ -19,10 +19,10 @@ public:
PixelFormat format() const override { return m_format; }
unsigned num_planes() const override { return m_num_planes; }
- uint32_t handle(unsigned plane) const { return m_planes[plane].handle; }
- uint32_t stride(unsigned plane) const override { return m_planes[plane].stride; }
- uint32_t size(unsigned plane) const override { return m_planes[plane].size; }
- uint32_t offset(unsigned plane) const override { return m_planes[plane].offset; }
+ uint32_t handle(unsigned plane) const { return m_planes.at(plane).handle; }
+ uint32_t stride(unsigned plane) const override { return m_planes.at(plane).stride; }
+ uint32_t size(unsigned plane) const override { return m_planes.at(plane).size; }
+ uint32_t offset(unsigned plane) const override { return m_planes.at(plane).offset; }
uint8_t* map(unsigned plane) override;
int prime_fd(unsigned plane) override;
@@ -37,7 +37,7 @@ private:
};
unsigned m_num_planes;
- struct FramebufferPlane m_planes[4];
+ std::array<FramebufferPlane, 4> m_planes;
PixelFormat m_format;
};
diff --git a/kms++/inc/kms++/extframebuffer.h b/kms++/inc/kms++/extframebuffer.h
index 0b9d08a..5239a3d 100644
--- a/kms++/inc/kms++/extframebuffer.h
+++ b/kms++/inc/kms++/extframebuffer.h
@@ -20,10 +20,10 @@ public:
PixelFormat format() const override { return m_format; }
unsigned num_planes() const override { return m_num_planes; }
- uint32_t handle(unsigned plane) const { return m_planes[plane].handle; }
- uint32_t stride(unsigned plane) const override { return m_planes[plane].stride; }
- uint32_t size(unsigned plane) const override { return m_planes[plane].size; }
- uint32_t offset(unsigned plane) const override { return m_planes[plane].offset; }
+ uint32_t handle(unsigned plane) const { return m_planes.at(plane).handle; }
+ uint32_t stride(unsigned plane) const override { return m_planes.at(plane).stride; }
+ uint32_t size(unsigned plane) const override { return m_planes.at(plane).size; }
+ uint32_t offset(unsigned plane) const override { return m_planes.at(plane).offset; }
private:
struct FramebufferPlane {
@@ -35,7 +35,7 @@ private:
};
unsigned m_num_planes;
- struct FramebufferPlane m_planes[4];
+ std::array<FramebufferPlane, 4> m_planes;
PixelFormat m_format;
};