Apple-2-Tools/Rgb2Hires
1
0
Fork 0
mirror of https://github.com/Pixinn/Rgb2Hires.git synced 2024-06-02 07:41:33 +00:00
Code Issues Projects Releases Wiki Activity

Giving the best group to black and white

Browse Source
This commit is contained in:
Christophe Meneboeuf 2021-02-14 22:29:16 +01:00
parent 57b9ef69f5
commit c5408f7bee
3 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Loader_Apple2/disk.dsk
View File

Binary file not shown.

15
Rgb2Hires_PC/src/HiRes.cpp
View File

@ -58,10 +58,11 @@ namespace RgbToHires {
pair<BlockHr::eColorGroup, BlockHr::eColorGroup> BlockHr::getGroup(const BlockPixel& block) const pair<BlockHr::eColorGroup, BlockHr::eColorGroup> BlockHr::getGroup(const BlockPixel& block) const
{ {
pair<eColorGroup, eColorGroup> groups{ GROUP_1, GROUP_1 }; pair<eColorGroup, eColorGroup> groups{ UNDEF, UNDEF };
//1st block group, including the last semi-pixel //1st block group, including the last semi-pixel
for (auto i = 0u; i < 4u; ++i) { for (auto i = 0u; i < 4u; ++i) {
if (block[i] == GREEN || block[i] == VIOLET) { if (block[i] == GREEN || block[i] == VIOLET) {
groups.first = GROUP_1;
break; break;
} }
else if (block[i] == ORANGE || block[i] == BLUE) { else if (block[i] == ORANGE || block[i] == BLUE) {
@ -72,6 +73,7 @@ namespace RgbToHires {
//2nd block group, excluding the first semi-pixel //2nd block group, excluding the first semi-pixel
for (auto i = 4u; i < 7u; ++i) { for (auto i = 4u; i < 7u; ++i) {
if (block[i] == GREEN || block[i] == VIOLET) { if (block[i] == GREEN || block[i] == VIOLET) {
groups.second = GROUP_1;
break; break;
} }
else if (block[i] == ORANGE || block[i] == BLUE) { else if (block[i] == ORANGE || block[i] == BLUE) {
@ -79,6 +81,17 @@ namespace RgbToHires {
break; break;
} }
} }
// if only black or white pixel: groups are still undefined
if (groups.first == UNDEF) { // 1st 3.5-pixels were black or white
groups.first = groups.second;
}
if (groups.second == UNDEF) { // 2nd 35-pixels were black or white
groups.second = groups.first;
}
if (groups.first == UNDEF) { // all the 7-pixels were black or white
groups.first = GROUP_1;
groups.second = GROUP_1;
}
return groups; return groups;
} }

3
Rgb2Hires_PC/src/HiRes.h
View File

@ -63,7 +63,8 @@ namespace RgbToHires
/// @brief color group as defined in Apple's documentation /// @brief color group as defined in Apple's documentation
enum eColorGroup { enum eColorGroup {
GROUP_1, GROUP_1,
GROUP_2 GROUP_2,
UNDEF // black and white can be group1 or group2
}; };
/// @brief Returns the color group of these two 3.5 pixel blocks /// @brief Returns the color group of these two 3.5 pixel blocks
std::pair<eColorGroup, eColorGroup> getGroup(const BlockPixel&) const; std::pair<eColorGroup, eColorGroup> getGroup(const BlockPixel&) const;