Skip to content

Commit ad8ee99

Browse files
corrected the inheritance tree
1 parent 29f1020 commit ad8ee99

File tree

2 files changed

+4
-31
lines changed

2 files changed

+4
-31
lines changed

src/RGBImage.cpp

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,6 @@
1919
#include "RGBImage.h"
2020
#include "Glyph.h"
2121

22-
#pragma mark RGBImageBase
23-
24-
RGBImageBase::RGBImageBase(int rows, int columns)
25-
: LEDImageBase<RGBColorType>( rows, columns )
26-
{
27-
}
28-
29-
RGBImageBase::RGBImageBase(const RGBImageBase& other)
30-
: LEDImageBase<RGBColorType>(other)
31-
{
32-
}
33-
34-
RGBImageBase::~RGBImageBase()
35-
{
36-
}
3722
#pragma mark RGBImage
3823

3924
RGBImage::RGBImage(
@@ -45,7 +30,7 @@ RGBImage::RGBImage(
4530
{
4631
}
4732

48-
RGBImage::RGBImage(const RGBImageBase& other)
33+
RGBImage::RGBImage(const LEDImageBase<RGBColorType>& other)
4934
: LEDImage<RGBColorType>(other)
5035
{
5136
}
@@ -70,7 +55,7 @@ MutableRGBImage::MutableRGBImage(
7055
{
7156
}
7257

73-
MutableRGBImage::MutableRGBImage(const RGBImageBase& other)
58+
MutableRGBImage::MutableRGBImage(const LEDImageBase<RGBColorType>& other)
7459
: MutableLEDImage<RGBColorType,BLACK_COLOR,TRANSPARENT_COLOR>(other)
7560
{
7661
}

src/RGBImage.h

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,6 @@
2222
#include "LEDImage.h"
2323
class GlyphBase;
2424

25-
class RGBImageBase : public LEDImageBase<RGBColorType> {
26-
27-
public:
28-
29-
RGBImageBase(
30-
int rows,
31-
int columns
32-
);
33-
RGBImageBase(const RGBImageBase& other);
34-
virtual ~RGBImageBase();
35-
};
36-
3725
class RGBImage : public LEDImage<RGBColorType> {
3826
public:
3927
RGBImage(
@@ -42,7 +30,7 @@ class RGBImage : public LEDImage<RGBColorType> {
4230
const RGBColorType* data,
4331
bool isFromProgramSpace = false
4432
);
45-
RGBImage(const RGBImageBase& other);
33+
RGBImage(const LEDImageBase<RGBColorType>& other);
4634
virtual ~RGBImage();
4735

4836
};
@@ -56,7 +44,7 @@ class MutableRGBImage : public MutableLEDImage<RGBColorType,BLACK_COLOR,TRANSPAR
5644
const RGBColorType* data,
5745
bool isFromProgramSpace = false
5846
);
59-
MutableRGBImage(const RGBImageBase& other);
47+
MutableRGBImage(const LEDImageBase<RGBColorType>& other);
6048
virtual ~MutableRGBImage();
6149

6250
void drawGlyph(

0 commit comments

Comments
 (0)