From bd2fdefea21af2a5f41c173f2950a074ac28b1c2 Mon Sep 17 00:00:00 2001 From: Guillermo Rodriguez Garcia Date: Tue, 24 Aug 1999 22:10:51 +0000 Subject: [PATCH] Fixed CanRead(), which incorrectly forced version 89a, thus preventing valid GIFs with older version numbers (87a) to be loaded correctly. Also, CanRead() is now in gifdecod.cpp git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3473 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/imaggif.cpp | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/common/imaggif.cpp b/src/common/imaggif.cpp index c6a775e15c..c15f3bfc58 100644 --- a/src/common/imaggif.cpp +++ b/src/common/imaggif.cpp @@ -8,8 +8,8 @@ ///////////////////////////////////////////////////////////////////////////// /* -We don't put pragma implement in this file because it is already present in -src/common/image.cpp + We don't put pragma implement in this file because it is already present in + src/common/image.cpp */ // For compilers that support precompilation, includes "wx.h". @@ -24,7 +24,6 @@ src/common/image.cpp #endif #include "wx/image.h" -// #include "wx/imaggif.h" #include "wx/gifdecod.h" #include "wx/wfstream.h" #include "wx/module.h" @@ -68,11 +67,14 @@ bool wxGIFHandler::SaveFile( wxImage * WXUNUSED(image), bool wxGIFHandler::CanRead( wxInputStream& stream ) { - unsigned char hdr[5]; - - stream.Read(&hdr, 5); - stream.SeekI(-5, wxFromCurrent); - return (hdr[0] == 'G' && hdr[1] == 'I' && hdr[2] == 'F' && hdr[3] == '8' && hdr[4] == '9'); + wxGIFDecoder *decod; + bool ok; + + decod = new wxGIFDecoder(&stream); + ok = decod->CanRead(); + + delete decod; + return ok; } #endif -- 2.45.2