Egor00f/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

kernel: fix regression r5164 which broke blitter in 24bpp mode

Browse Source 
git-svn-id: svn://kolibrios.org@7474 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kirill Lipatov (Leency) 2018-10-17 16:43:37 +00:00
parent 4c3f6d21d8
commit 03386fe9f4
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/common/settings/app_plus.ini
View File

@ -22,7 +22,7 @@ Calc+=/kolibrios/utils/calcplus,4
TinyBasic=/kolibrios/develop/TinyBasic/TinyBasic,91 TinyBasic=/kolibrios/develop/TinyBasic/TinyBasic,91
Notes=/sys/notes,117 Notes=/sys/notes,117
FtpClient=/sys/network/ftpc,45 FtpClient=/sys/network/ftpc,45
VncViewer=/sys/network/ftpc,77 VncViewer=/sys/network/vncc,77
Timer=/sys/demos/timer,119 Timer=/sys/demos/timer,119
ASCII View=/sys/asciivju,118 ASCII View=/sys/asciivju,118

4
kernel/trunk/video/blitter.inc
View File

@ -457,12 +457,12 @@ align 4
;-------------------------------------- ;--------------------------------------
align 4 align 4
.skip_1: .skip_1:
mov edi, [esp+.extra_var1]
inc ecx inc ecx
dec edx dec edx
jnz .inner24 jnz .inner24
add esi, [esp+BLITTER.stride] add esi, [esp+BLITTER.stride]
mov edi, [esp+.extra_var1]
add edi, [_display.lfb_pitch] add edi, [_display.lfb_pitch]
add ebp, [_display.width] add ebp, [_display.width]
@ -519,12 +519,12 @@ align 4
pop eax pop eax
;-------------------------------------- ;--------------------------------------
.skip_2: .skip_2:
mov edi, [esp+.extra_var1]
inc ecx inc ecx
dec edx dec edx
jnz .inner16 jnz .inner16
add esi, [esp+BLITTER.stride] add esi, [esp+BLITTER.stride]
mov edi, [esp+.extra_var1]
add edi, [_display.lfb_pitch] add edi, [_display.lfb_pitch]
add ebp, [_display.width] add ebp, [_display.width]

2
programs/cmm/txtread/txtread.c
View File

@ -51,7 +51,7 @@ dword color_schemes[] = {
0xF0F0F0, 0, 0xF0F0F0, 0,
0xE9E5DA, 0, 0xE9E5DA, 0,
0xF0F0C7, 0, 0xF0F0C7, 0,
0xFCF0DA, 0x574531, 0xFCF0DA, 0x171501,
0xFDF6E3, 0x101A21, 0xFDF6E3, 0x101A21,
0x282C34, 0xABB2BF, 0x282C34, 0xABB2BF,
0x282923, 0xD8D8D2 0x282923, 0xD8D8D2