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

DoCanRead is protected in the base class, make it the same in derived classes.

Browse Source
This commit is contained in:
Robin Dunn
2020-03-24 16:25:00 -07:00
parent fea3d52505
commit eeedc14a58
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/wx/anidecod.h
View File

@@ -53,11 +53,12 @@ public:
wxAnimationType GetType() const wxOVERRIDE wxAnimationType GetType() const wxOVERRIDE
{ return wxANIMATION_TYPE_ANI; } { return wxANIMATION_TYPE_ANI; }
private: protected:
// wxAnimationDecoder pure virtual: // wxAnimationDecoder pure virtual:
virtual bool DoCanRead( wxInputStream& stream ) const wxOVERRIDE; virtual bool DoCanRead( wxInputStream& stream ) const wxOVERRIDE;
// modifies current stream position (see wxAnimationDecoder::CanRead) // modifies current stream position (see wxAnimationDecoder::CanRead)
private:
// frames stored as wxImage(s): ANI files are meant to be used mostly for animated // frames stored as wxImage(s): ANI files are meant to be used mostly for animated
// cursors and thus they do not use any optimization to encode differences between // cursors and thus they do not use any optimization to encode differences between
// two frames: they are just a list of images to display sequentially. // two frames: they are just a list of images to display sequentially.

3
include/wx/gifdecod.h
View File

@@ -85,11 +85,12 @@ public:
wxAnimationType GetType() const wxOVERRIDE wxAnimationType GetType() const wxOVERRIDE
{ return wxANIMATION_TYPE_GIF; } { return wxANIMATION_TYPE_GIF; }
private: protected:
// wxAnimationDecoder pure virtual // wxAnimationDecoder pure virtual
virtual bool DoCanRead( wxInputStream& stream ) const wxOVERRIDE; virtual bool DoCanRead( wxInputStream& stream ) const wxOVERRIDE;
// modifies current stream position (see wxAnimationDecoder::CanRead) // modifies current stream position (see wxAnimationDecoder::CanRead)
private:
int getcode(wxInputStream& stream, int bits, int abfin); int getcode(wxInputStream& stream, int bits, int abfin);
wxGIFErrorCode dgif(wxInputStream& stream, wxGIFErrorCode dgif(wxInputStream& stream,
GIFImage *img, int interl, int bits); GIFImage *img, int interl, int bits);