Skip to content

Commit b604080

Browse files
committed
Make private layers members protected
1 parent b232fb0 commit b604080

File tree

7 files changed

+7
-7
lines changed

7 files changed

+7
-7
lines changed

src/Layer_Background.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ class SMLayerBackground : public SM_Layer {
8484
void setBrightness(uint8_t brightness);
8585
void enableColorCorrection(bool enabled);
8686

87-
private:
87+
protected:
8888
bool ccEnabled = true;
8989

9090
RGB *currentDrawBufferPtr;

src/Layer_BackgroundGfx.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ class SMLayerBackgroundGFX : public SM_Layer, public Adafruit_GFX {
121121
using Adafruit_GFX::drawFastVLine;
122122
using Adafruit_GFX::drawFastHLine;
123123

124-
private:
124+
protected:
125125
// Note we'd use a function template for the public functions but are keeping them fixed with rgb24/rgb48 parameters for backwards compatibility
126126
template <typename RGB_OUT>
127127
void fillRefreshRowTemplated(uint16_t hardwareY, RGB_OUT refreshRow[], int brightnessShifts);

src/Layer_Gfx_Mono.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ class SMLayerGFXMono : public SM_Layer, public Adafruit_GFX {
104104
inline void fillScreen(int color) { fillScreen((rgb1)(color > 0)); };
105105
inline void drawPixel(int16_t x, int16_t y, int color) { drawPixel(x, y, (rgb1)(color > 0)); };
106106

107-
private:
107+
protected:
108108
/* RGB specific */
109109
void handleBufferSwap(void);
110110

src/Layer_Indexed.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ class SMLayerIndexed : public SM_Layer {
5555
void drawString(int16_t x, int16_t y, uint8_t index, const char text []);
5656
void drawMonoBitmap(int16_t x, int16_t y, uint8_t width, uint8_t height, uint8_t index, uint8_t *bitmap);
5757

58-
private:
58+
protected:
5959
// todo: move somewhere else
6060
static bool getBitmapPixelAtXY(uint8_t x, uint8_t y, uint8_t width, uint8_t height, const uint8_t *bitmap);
6161

src/Layer_Indexed_Impl.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ SMLayerIndexed<RGB, optionFlags>::SMLayerIndexed(uint16_t width, uint16_t height
4242
#ifdef ESP32
4343
assert(indexedBitmap != NULL);
4444
#else
45-
this->assert(indexedBitmap != NULL);
45+
//this->assert(indexedBitmap != NULL);
4646
#endif
4747
memset(indexedBitmap, 0x00, 2 * width * (height / 8));
4848
this->matrixWidth = width;

src/Layer_Scrolling.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ class SMLayerScrolling : public SM_Layer {
6262
void setStartOffsetFromLeft(int offset);
6363
void enableColorCorrection(bool enabled);
6464

65-
private:
65+
protected:
6666
void redrawScrollingText(void);
6767
void setMinMax(void);
6868

src/Layer_Scrolling_Impl.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ SMLayerScrolling<RGB, optionFlags>::SMLayerScrolling(uint16_t width, uint16_t he
4040
#ifdef ESP32
4141
assert(scrollingBitmap != NULL);
4242
#else
43-
this->assert(scrollingBitmap != NULL);
43+
//this->assert(scrollingBitmap != NULL);
4444
#endif
4545
memset(scrollingBitmap, 0x00, width * (height / 8));
4646
this->matrixWidth = width;

0 commit comments

Comments
 (0)