Skip to content

Commit 4d22d0d

Browse files
Solved compilation error.
1 parent 617e069 commit 4d22d0d

File tree

3 files changed

+9
-11
lines changed

3 files changed

+9
-11
lines changed

color.cc

+4-4
Original file line numberDiff line numberDiff line change
@@ -406,19 +406,19 @@ namespace SDL {
406406
}
407407

408408
Color operator+(const Color bottom, const Color top) {
409-
return Color::blend(bottom, top, Color::BlendMode::add);
409+
return Color::blend(bottom, top, BlendMode::add);
410410
}
411411

412412
Color operator-(const Color bottom, const Color top) {
413-
return Color::blend(bottom, top, Color::BlendMode::subtract);
413+
return Color::blend(bottom, top, BlendMode::subtract);
414414
}
415415

416416
Color operator*(const Color bottom, const Color top) {
417-
return Color::blend(bottom, top, Color::BlendMode::multiply);
417+
return Color::blend(bottom, top, BlendMode::multiply);
418418
}
419419

420420
Color operator/(const Color bottom, const Color top) {
421-
return Color::blend(bottom, top, Color::BlendMode::divide);
421+
return Color::blend(bottom, top, BlendMode::divide);
422422
}
423423

424424
Color operator*(cfloat scalar, const Color c) {

color.hh

-2
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,6 @@ namespace SDL {
7272
Color with_alpha(cuchar alpha) const;
7373
Color opaque() const;
7474

75-
using BlendMode = _implementation::color::BlendMode;
76-
7775
static Color blend(
7876
const Color bottom,
7977
const Color top,

cursor.cc

+5-5
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ namespace SDL {
8787
while (!done) {
8888
size_t col = 0;
8989
bool line_done;
90-
Cursor::Pixel i;
90+
Pixel i;
9191
std::tie(line_done, i) = next_element(true);
9292

9393
while (!line_done) {
@@ -101,14 +101,14 @@ namespace SDL {
101101
++ col;
102102

103103
switch (i) {
104-
case Cursor::Pixel::_:
104+
case Pixel::_:
105105
break;
106-
case Cursor::Pixel::X:
106+
case Pixel::X:
107107
data[index] += 1; // sets the last bit to one.
108-
case Cursor::Pixel::O:
108+
case Pixel::O:
109109
mask[index] += 1;
110110
break;
111-
case Cursor::Pixel::Z:
111+
case Pixel::Z:
112112
data[index] += 1;
113113
break;
114114
}

0 commit comments

Comments
 (0)