Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix part of [ 1570325 ] wxAnimationCtrl for wxAdv library

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41940 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2006-10-11 16:09:39 +00:00
parent a51cb1e67b
commit 05a98b6d5d
9 changed files with 103 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/common/gifdecod.cpp
View File

@@ -125,7 +125,7 @@ bool wxGIFDecoder::ConvertToImage(size_t frame, wxImage *image) const
pal = GetPalette(frame);
src = GetData(frame);
dst = image->GetData();
transparent = GetTransparentColour(frame);
transparent = GetTransparentColourIndex(frame);
/* set transparent colour mask */
if (transparent != -1)
@@ -206,10 +206,22 @@ long wxGIFDecoder::GetDelay(size_t frame) const
return GetFrame(frame)->delay;
}
wxColour wxGIFDecoder::GetTransparentColour(size_t frame) const
{
unsigned char *pal = GetFrame(frame)->pal;
int n = GetFrame(frame)->transparent;
if (n == -1)
return wxNullColour;
return wxColour(pal[n*3 + 0],
pal[n*3 + 1],
pal[n*3 + 2]);
}
unsigned char* wxGIFDecoder::GetData(size_t frame) const { return (GetFrame(frame)->p); }
unsigned char* wxGIFDecoder::GetPalette(size_t frame) const { return (GetFrame(frame)->pal); }
unsigned int wxGIFDecoder::GetNcolours(size_t frame) const { return (GetFrame(frame)->ncolours); }
int wxGIFDecoder::GetTransparentColour(size_t frame) const { return (GetFrame(frame)->transparent); }
int wxGIFDecoder::GetTransparentColourIndex(size_t frame) const { return (GetFrame(frame)->transparent); }