From eeedc14a5831f5ea86054e8328f20ac0ec41401a Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Tue, 24 Mar 2020 16:25:00 -0700 Subject: [PATCH] DoCanRead is protected in the base class, make it the same in derived classes. --- include/wx/anidecod.h | 3 ++- include/wx/gifdecod.h | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/include/wx/anidecod.h b/include/wx/anidecod.h index 4a112410c8..8e50d0a60c 100644 --- a/include/wx/anidecod.h +++ b/include/wx/anidecod.h @@ -53,11 +53,12 @@ public: wxAnimationType GetType() const wxOVERRIDE { return wxANIMATION_TYPE_ANI; } -private: +protected: // wxAnimationDecoder pure virtual: virtual bool DoCanRead( wxInputStream& stream ) const wxOVERRIDE; // modifies current stream position (see wxAnimationDecoder::CanRead) +private: // 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 // two frames: they are just a list of images to display sequentially. diff --git a/include/wx/gifdecod.h b/include/wx/gifdecod.h index b0de4669e6..4e878ba61e 100644 --- a/include/wx/gifdecod.h +++ b/include/wx/gifdecod.h @@ -85,11 +85,12 @@ public: wxAnimationType GetType() const wxOVERRIDE { return wxANIMATION_TYPE_GIF; } -private: +protected: // wxAnimationDecoder pure virtual virtual bool DoCanRead( wxInputStream& stream ) const wxOVERRIDE; // modifies current stream position (see wxAnimationDecoder::CanRead) +private: int getcode(wxInputStream& stream, int bits, int abfin); wxGIFErrorCode dgif(wxInputStream& stream, GIFImage *img, int interl, int bits);