diff options
| author | Ton Roosendaal <ton@blender.org> | 2011-02-14 20:09:02 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2011-02-14 20:09:02 +0300 |
| commit | c66ce21a86be1bf26abc20e5b25139153650c6ba (patch) | |
| tree | 764a913ac1758f5119937179498b8755acff1409 /source/blender/imbuf/intern/tiff.c | |
| parent | 8ee0c96f4b31df92f4a5e2887fbb4910cc79d75d (diff) | |
Bug fix #26021
Very nasty UI code issue: since every button is re-defined on a
redraw, having UI redraws while using a button was not possible.
This was solved long ago by copying over data from previous button.
However, this fails when buttons have callbacks with its own (or
a parent button) pointer.
This bug reporter found crashes in draw-overlap UI mode, this
draws entire UI over for every menu redraws, making previous button
pointers invalid. (for triple buffer, the UI is not redrawn, only
the menus).
In general: all systems falling back to old swapbuffers would have
suffered some instability because of this.
Fix is that now the old button gets lifted out from the previous
list and inserted in the new list. Works fine, but needs some tests!
Also in this commit: TIFF endian switching not needed for 16 bits tiff.
Diffstat (limited to 'source/blender/imbuf/intern/tiff.c')
| -rw-r--r-- | source/blender/imbuf/intern/tiff.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/source/blender/imbuf/intern/tiff.c b/source/blender/imbuf/intern/tiff.c index 5c3451fd6f4..35c1c372e71 100644 --- a/source/blender/imbuf/intern/tiff.c +++ b/source/blender/imbuf/intern/tiff.c @@ -435,9 +435,11 @@ static int imb_read_tiff_pixels(ImBuf *ibuf, TIFF *image, int premul) if(success) { ibuf->profile = (bitspersample==32)?IB_PROFILE_LINEAR_RGB:IB_PROFILE_SRGB; - - if(ENDIAN_ORDER == B_ENDIAN) - IMB_convert_rgba_to_abgr(tmpibuf); + +// Code seems to be not needed for 16 bits tif, on PPC G5 OSX (ton) + if(bitspersample < 16) + if(ENDIAN_ORDER == B_ENDIAN) + IMB_convert_rgba_to_abgr(tmpibuf); if(premul) { IMB_premultiply_alpha(tmpibuf); ibuf->flags |= IB_premul; |