From fe0e433b212cac12dfba8ec1f205145dbd4cb095 Mon Sep 17 00:00:00 2001 From: Christophe Meneboeuf Date: Wed, 7 Dec 2016 23:49:58 +0100 Subject: [PATCH] Bug correction: wrong bit order for the pixel shared between two blocks --- .gitignore | 7 ++++--- src/HiRes.cpp | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 466178a..70b5ba8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ -./x64 -./x86 -./RgbToHiRes.vcxproj.user +x64 +x86 +RgbToHiRes.vcxproj.user +RgbToHiRes.VC.* *.sln *.bin *.asm diff --git a/src/HiRes.cpp b/src/HiRes.cpp index c0a52eb..32405fe 100644 --- a/src/HiRes.cpp +++ b/src/HiRes.cpp @@ -34,8 +34,8 @@ namespace RgbToHires { _data[1] |= (getDibit(source[6]) << 5); //Middle pixel auto byte = getDibit(source[3]); - _data[0] |= (((byte>>1) & 0x1) << 6); - _data[1] |= (byte & 0x1); + _data[0] |= ((byte & 0x1) << 6); + _data[1] |= ((byte >> 1) & 0x1); }