Re: [dib.c] 3. Remove identity colormap changing for monochrome bitmaps
Oldrich Jedlicka <oldium.pro(a)seznam.cz> writes:
This fixes colors in monochrome bitmaps that were overwritten by identity colormap every time.
Changelog:
* Remove the identity color map overwriting on all monochrome bitmaps
This breaks the tests: bitmap.c:399: Test failed: lower left pixel is 00ff00ff bitmap.c:400: Test failed: bottom but one, left pixel is 0000ff00 -- Alexandre Julliard julliard(a)winehq.org
Thanks Alexandre, I will have a look at it more closely as the inverted colors in monochrome bitmaps are maybe a more general problem - if BitBlt is using palette of both bitmaps and in copying from XImage into DIB it is inverted again - I will check it. Actually I discovered this first time as the palette is set to NULL (descr.palentry = NULL) in X11DRV_DIB_DoCopyDIBSection. Oldrich. Dne Thursday 01 of December 2005 18:37 Alexandre Julliard napsal(a):
Oldrich Jedlicka <oldium.pro(a)seznam.cz> writes:
This fixes colors in monochrome bitmaps that were overwritten by identity colormap every time.
Changelog:
* Remove the identity color map overwriting on all monochrome bitmaps
This breaks the tests:
bitmap.c:399: Test failed: lower left pixel is 00ff00ff bitmap.c:400: Test failed: bottom but one, left pixel is 0000ff00
Hi again, I did not find the problem, but I found different solution - for consideration: There is problem that with pixmap_depth we loose the color information - there can be workaround found for this (what I suggested in the second patch). I removed now all the pixmap_depth stuff (just to test it) and received what I expected - tests are running correctly (and some todos passed) and the game Neighbours from Hell is also working correctly - I know that this doesn't mean that it is the correct way to do it. So there are two ways: * Find a solution with monochrome bitmaps * Change monochrome bitmaps to use pixmap_depth=screen as other DIBs Any hint - which way to go? I think I do not have time during the weekend, so I will probably look at it next week on Monday. Used patch for "colored" monochrome bitmaps is attached. Cheers, Oldrich. Dne Thursday 01 of December 2005 18:37 Alexandre Julliard napsal(a):
Oldrich Jedlicka <oldium.pro(a)seznam.cz> writes:
This fixes colors in monochrome bitmaps that were overwritten by identity colormap every time.
Changelog:
* Remove the identity color map overwriting on all monochrome bitmaps
This breaks the tests:
bitmap.c:399: Test failed: lower left pixel is 00ff00ff bitmap.c:400: Test failed: bottom but one, left pixel is 0000ff00
I have to read my emails four times before sending :-) So what I meant: I did not find exactly the solution for the problem with failed tests (which keeps my second path in the game), but completely different approach by removing pixmap_depth=1 (and also my second patch that is unneeded then). Regards, Oldrich.
participants (2)
-
Alexandre Julliard -
Oldrich Jedlicka