Skip to content

Commit

Permalink
Merge pull request #1099 from jlewismith/fix-warnings
Browse files Browse the repository at this point in the history 
Fix compilation warnings and banner '4' bug
  • Loading branch information
@AnshumanMahato
AnshumanMahato authored Nov 13, 2023
2 parents 0107ede + 0008793 commit 2a64375
Show file tree
Hide file tree
Showing 9 changed files with 81 additions and 78 deletions.
2 changes: 1 addition & 1 deletion Ascii.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ namespace ascii

char **character = nullptr;

for (int i = 0; i < text.size(); i++)
for (size_t i = 0; i < text.size(); i++)
{
char c = text[i];

Expand Down
28 changes: 15 additions & 13 deletions Fonts/Boomer/boomer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ class Boomer : public Fonts
character[1][2] = character[1][6] = character[2][4] = character[2][6] = character[3][4] = character[3][6] = '|';
character[4][0] = character[4][4] = character[4][6] = character[5][5] = '/';
character[4][1] = character[5][0] = '\\';
character[4][2] = character[4][3] = character[5][1] = character[5][2] = character[5][3] = character[5][4] = character[0][3] = character[0][4] = character[0][5] = character[1][3] = character[0][5] = '_';
character[4][2] = character[4][3] = character[5][1] = character[5][2] = character[5][3] = character[5][4] = character[0][3] = character[0][4] = character[0][5] = character[1][3] = '_';

return character;
}
Expand All @@ -129,7 +129,7 @@ class Boomer : public Fonts
{

char **character = getCharGrid(6,7);
character[0][6] = character[0][1] = character[0][5] = character[0][6] = character[5][1] = character[5][5] = '_';
character[0][6] = character[0][1] = character[0][5] = character[5][1] = character[5][5] = '_';
character[1][4] = character[1][6] = character[2][5] = character[2][3] = character[5][6] = '/';
character[3][5] = character[4][6] = character[4][3] = character[5][4] = character[5][0] = '\\';
character[1][0] = character[2][0] = character[3][0] = character[4][0] = character[1][2] = character[2][2] = character[4][2] = character[5][2] = '|';
Expand Down Expand Up @@ -361,15 +361,15 @@ class Boomer : public Fonts

character[0][0] = character[0][1] = character[0][2] = character[0][3] = character[0][4] = character[0][6] = character[1][0] = character[1][1] = character[1][2] = character[1][3] = character[1][5] = character[2][0] = character[2][1] = character[2][2] = character[2][3] = character[2][5] = ' ';
character[0][5] = character[2][2] = character[2][3] = character[3][3] = character[4][3] = character[5][2] = character[5][3] = character[5][5] = '_';
character[1][4] = character[1][6] = character[2][4] = character[2][6] = character[3][6] = character[4][0] = character[4][4] = character[4][6] = character[4][6] = character[5][6] = '|';
character[1][4] = character[1][6] = character[2][4] = character[2][6] = character[3][6] = character[4][0] = character[4][4] = character[4][6] = character[5][6] = '|';
character[4][2] = '(';
character[5][4] = ',';
character[3][4] = '`';
character[5][1] = '\\';
character[3][1] = '/';
character[0][0] = character[0][1] = character[0][2] = character[0][3] = character[0][4] = character[0][6] = character[1][0] = character[1][1] = character[1][2] = character[1][3] = character[1][5] = character[2][0] = character[2][1] = character[2][2] = character[2][3] = character[2][5] = ' ';
character[0][5] = character[2][2] = character[2][3] = character[3][3] = character[4][3] = character[5][2] = character[5][3] = character[5][5] = '_';
character[1][4] = character[1][6] = character[2][4] = character[2][6] = character[3][6] = character[4][0] = character[4][4] = character[4][6] = character[4][6] = character[5][6] = '|';
character[1][4] = character[1][6] = character[2][4] = character[2][6] = character[3][6] = character[4][0] = character[4][4] = character[4][6] = character[5][6] = '|';
character[4][2] = '(';
character[5][4] = ',';
character[3][4] = '`';
Expand Down Expand Up @@ -406,7 +406,7 @@ class Boomer : public Fonts
char **character = getCharGrid(8, 7);

character[2][0] = character[2][1] = character[2][4] = character[2][6] = character[3][0] = character[3][2] = character[3][4] = character[3][5] = character[4][1] = character[4][5] = character[5][0] = character[5][5] = character[6][0] = character[6][1] = character[6][5] = character[7][0] = character[7][6] = ' ';
character[2][2] = character[2][3] = character[2][5] = character[3][3] = character[4][3] = character[5][2] = character[5][3] = character[6][2] = character[6][3] = character[4][3] = character[7][2] = character[7][3] = character[7][4] = '_';
character[2][2] = character[2][3] = character[2][5] = character[3][3] = character[4][3] = character[5][2] = character[5][3] = character[6][2] = character[6][3] = character[7][2] = character[7][3] = character[7][4] = '_';
character[3][6] = character[4][0] = character[4][4] = character[4][6] = character[5][6] = character[6][6] = character[7][1] = '|';
character[3][1] = character[6][4] = character[7][5] = '/';
character[5][1] = '\\';
Expand Down Expand Up @@ -488,7 +488,7 @@ class Boomer : public Fonts
char **character = getCharGrid(6,7);

character[2][1] = character[2][3] = character[2][4] = character[4][3] = character[4][5] = character[4][4] = character[3][3] = character[5][5] = character[5][1] = '_';
character[2][0] = character[2][2] = character[2][5] = character[2][6] = character[3][1] = character[4][1] = character[4][3] = character[4][5] = character[4][3] = ' ';
character[2][0] = character[2][2] = character[2][5] = character[2][6] = character[3][1] = character[4][1] = character[4][3] = character[4][5] = ' ';
character[3][0] = character[4][0] = character[4][2] = character[4][4] = character[4][6] = character[5][0] = character[5][2] = character[5][4] = character[5][6] = '|';
character[3][2] = '\'';
character[3][5] = '\\';
Expand Down Expand Up @@ -533,13 +533,10 @@ class Boomer : public Fonts
{
char **character = getCharGrid(8, 7);

// character[0][0] = character[0][1] = character[0][2] = character[0][3] = character[0][4] = character[0][5] = character[0][6]=' ';
// character[1][0] = character[1][1] = character[1][2] = character[1][3] = character[1][4] = character[1][5] = character[1][6]=' ';
// character[2][0] = character[2][1] = character[2][2] = character[2][3] = character[2][4] = character[2][5] = character[2][6]=' ';
character[2][2] = character[2][5] = character[2][3] = character[7][5] = '_';
character[3][3] = character[4][3] = character[5][3] = character[5][2] = '_';
character[4][0] = character[4][4] = character[6][4] = character[6][4] = character[7][6]=character[7][4]='|';
character[3][6] = character[4][6] = character[5][6] = character[6][6] = character[4][6] = '|';
character[4][0] = character[4][4] = character[6][4] = character[7][6] = character[7][4]='|';
character[3][6] = character[4][6] = character[5][6] = character[6][6] = '|';
character[4][2] = '(';
character[5][1] = '\\';
character[3][1] = '/';
Expand Down Expand Up @@ -749,7 +746,9 @@ class Boomer : public Fonts
char **five()
{
char **character = getCharGrid(6,7);
character[0][1] = character[0][2] = character[0][3] = character[0][4] = character[0][5] = character[1][3] = character[1][4] = character[1][5]=character[2][1]=character[2][2]=character[2][3]=character[4][2]=character[4][3]=character[5][1]=character[2][2]=character[5][3]=character[5][4] = '_';
character[0][1] = character[0][2] = character[0][3] = character[0][4] = character[0][5] = character[1][3]
= character[1][4] = character[1][5] = character[2][1] = character[2][2] = character[2][3] = character[4][2]
= character[4][3] = character[5][1] = character[5][3] = character[5][4] = '_';
character[1][0] = character[1][6] = character[2][0] = '|';
character[2][5] = character[3][4] = character[3][6] = character[4][1] = character[5][0] = '\\';
character[4][0] = character[4][4] = character[4][6] = character[5][5] = '/';
Expand Down Expand Up @@ -812,7 +811,10 @@ class Boomer : public Fonts
char **nine()
{
char **character = getCharGrid(6,7);
character[0][1] = character[0][2] = character[0][3] = character[0][4] = character[0][5] = character[1][3] = character[2][3] = character[3][1] = character[3][2] = character[3][3] = character[3][4] = character[4][1] = character[4][2] = character[4][3] = character[5][1] = character[5][2] = character[5][3] = character[5][4] = character[4][6] = character[5][3] = character[5][4] = '_';
character[0][1] = character[0][2] = character[0][3] = character[0][4] = character[0][5] = character[1][3]
= character[2][3] = character[3][1] = character[3][2] = character[3][3] = character[3][4] = character[4][1]
= character[4][2] = character[4][3] = character[5][1] = character[5][2] = character[5][3] = character[5][4]
= character[4][6] = '_';

character[1][0] = character[1][6] = character[2][0] = character[2][2] = character[2][4] = character[2][6] = character[3][6] = '|';

Expand Down
2 changes: 1 addition & 1 deletion Fonts/amongus/amongus.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -554,7 +554,7 @@ class Amongus : public Fonts
char **character = getCharGrid(4, 6);

// Enter the character grid in ROWS X COLS
character[0][1] = character[0][2] = character[0][3] = character[0][4] = character[1][3] = character[1][3] = character[3][1] = character[3][4] = '_';
character[0][1] = character[0][2] = character[0][3] = character[0][4] = character[1][3] = character[3][1] = character[3][4] = '_';
character[1][5] = character[3][3] = '\\';
character[3][5] = character[2][1] = character[3][2] = ')';
character[1][0] = character[3][0] = '(';
Expand Down
13 changes: 7 additions & 6 deletions Fonts/banner/banner.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class Banner : public Fonts
char **C()
{
char **character = getCharGrid(7, 7);
character[0][1] = character[0][2] = character[0][3] = character[0][4] = character[0][5] = character[0][5] = character[1][0] = character[1][6] = character[2][0] = character[3][0] = character[4][0] = character[5][0] = character[5][6] = character[6][1] = character[6][2] = character[6][3] = character[6][4] = character[6][5] = '#';
character[0][1] = character[0][2] = character[0][3] = character[0][4] = character[0][5] = character[1][0] = character[1][6] = character[2][0] = character[3][0] = character[4][0] = character[5][0] = character[5][6] = character[6][1] = character[6][2] = character[6][3] = character[6][4] = character[6][5] = '#';
return character;
}

Expand Down Expand Up @@ -264,7 +264,7 @@ class Banner : public Fonts
{
char **character = getCharGrid(7, 7);

character[0][0] = character[0][1] = character[0][2] = character[0][3] = character[0][4] = character[0][5] = character[0][6] = character[6][0] = character[6][1] = character[6][2] = character[6][3] = character[6][4] = character[6][5] = character[6][6] = character[0][3] = character[1][5] = character[2][4] = character[3][3] = character[4][2] = character[5][1] = '#';
character[0][0] = character[0][1] = character[0][2] = character[0][3] = character[0][4] = character[0][5] = character[0][6] = character[6][0] = character[6][1] = character[6][2] = character[6][3] = character[6][4] = character[6][5] = character[6][6] = character[1][5] = character[2][4] = character[3][3] = character[4][2] = character[5][1] = '#';

return character;
}
Expand Down Expand Up @@ -348,7 +348,7 @@ class Banner : public Fonts
{
char **character = getCharGrid(7, 3);

character[1][1] = character[3][1] = character[3][0] = character[4][1] = character[5][1] = character[6][0] = character[6][1] = character[6][0] = character[6][1] = character[6][2] = '#';
character[1][1] = character[3][1] = character[3][0] = character[4][1] = character[5][1] = character[6][0] = character[6][1] = character[6][2] = '#';

return character;
}
Expand Down Expand Up @@ -577,9 +577,10 @@ character[0][2] = character[0][3] = character[0][4] = character[1][1] = characte
char **four()
{
char **character = getCharGrid();
character[0][0] = character[1][0] = character[2][0] = character[3][0] = character[3][1] = character[3][2] = character[3][3] = '#';
character[1][5] = character[3][6] = character[3][5] = character[3][4] = '#';
character[2][5] = character[4][5] = character[5][5] = character[5][5] = '#';
character[0][0] = character[1][0] = character[2][0] = character[3][0] = '#';
character[1][5] = character[2][5] = character[3][5] = '#';
character[4][1] = character[4][2] = character[4][3] = character[4][4] = character[4][5] = character[4][6] = '#';
character[5][5] = character[6][5] = '#';
return character;
}

Expand Down
Loading

0 comments on commit 2a64375

Please sign in to comment.