Apple-2-Tools/AppleWin
1
0
Fork 0
mirror of https://github.com/AppleWin/AppleWin.git synced 2025-08-14 11:25:43 +00:00
Code Issues Projects Releases Wiki Activity

Fix scoping of variable

Browse Source
This commit is contained in:
tomcw
2016-03-28 18:02:08 +01:00
parent ad55b0f136
commit 80ad4df409
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/NTSC.cpp
View File

@@ -575,13 +575,14 @@ inline void updateFramebufferColorTVSingleScanline( uint16_t signal, bgra_t *pTa
const uint32_t color2 = *pLine2Address; const uint32_t color2 = *pLine2Address;
// const uint32_t color1 = color0 - ((color2 & 0x00fcfcfc) >> 2); // BUG? color0 - color0? not color0-color2? // const uint32_t color1 = color0 - ((color2 & 0x00fcfcfc) >> 2); // BUG? color0 - color0? not color0-color2?
// TC: The above operation "color0 - ((color2 & 0x00fcfcfc) >> 2)" causes underflow, so I've recoded to clamp on underflow: // TC: The above operation "color0 - ((color2 & 0x00fcfcfc) >> 2)" causes underflow, so I've recoded to clamp on underflow:
uint32_t color1;
{ {
int r=(color0>>16)&0xff, g=(color0>>8)&0xff, b=color0&0xff; int r=(color0>>16)&0xff, g=(color0>>8)&0xff, b=color0&0xff;
uint32_t color2_prime = (color2 & 0x00fcfcfc) >> 2; uint32_t color2_prime = (color2 & 0x00fcfcfc) >> 2;
r -= (color2_prime>>16)&0xff; if (r<0) r=0; // clamp to 0 on underflow r -= (color2_prime>>16)&0xff; if (r<0) r=0; // clamp to 0 on underflow
g -= (color2_prime>>8)&0xff; if (g<0) g=0; // clamp to 0 on underflow g -= (color2_prime>>8)&0xff; if (g<0) g=0; // clamp to 0 on underflow
b -= (color2_prime)&0xff; if (b<0) b=0; // clamp to 0 on underflow b -= (color2_prime)&0xff; if (b<0) b=0; // clamp to 0 on underflow
const uint32_t color1 = (r<<16)|(g<<8)|(b); color1 = (r<<16)|(g<<8)|(b);
} }
/* */ *pLine1Address = color1 | ALPHA32_MASK; /* */ *pLine1Address = color1 | ALPHA32_MASK;