don't cache the result of IsAlwaysConnected() and don't call IsOnline() unnecessarily...

[wxWidgets.git] / src / html / m_image.cpp

diff --git a/src/html/m_image.cpp b/src/html/m_image.cpp
index 9fb42a9500eca256ded77b2ac52d31d79a524cec..7458ddf79210de712fd2f441bd36717c696b9aa4 100644 (file)
--- a/src/html/m_image.cpp
+++ b/src/html/m_image.cpp
@@ -34,6 +34,7 @@
 #include "wx/image.h"
 #include "wx/gifdecod.h"
 #include "wx/dynarray.h"
+#include "wx/log.h"
 
 #include <math.h>
 #include <float.h>
@@ -276,8 +277,8 @@ class wxHtmlImageCell : public wxHtmlCell
 {
 public:
     wxHtmlImageCell(wxWindow *window,
-                    wxFSFile *input, int w = -1, int h = -1, 
-                    double scale = 1.0, int align = wxHTML_ALIGN_BOTTOM, 
+                    wxFSFile *input, int w = -1, int h = -1,
+                    double scale = 1.0, int align = wxHTML_ALIGN_BOTTOM,
                     const wxString& mapname = wxEmptyString);
     ~wxHtmlImageCell();
     void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2);
@@ -327,13 +328,13 @@ class wxGIFTimer : public wxTimer
 /* XPM */
 static const char * broken_image_xpm[] = {
 "29 31 7 1",
-"      c None",
-".     c #808080",
-"+     c #FFFFFF",
-"@     c #C0C0C0",
-"#     c #000000",
-"$     c #333366",
-"%     c #B2B2B2",
+"   c None",
+".  c #808080",
+"+  c #FFFFFF",
+"@  c #C0C0C0",
+"#  c #000000",
+"$  c #333366",
+"%  c #B2B2B2",
 ".....................        ",
 ".+++++++++++++++++++..       ",
 ".+++++++++++++++++++.@.      ",
@@ -366,8 +367,8 @@ static const char * broken_image_xpm[] = {
 ".++++++++++++++++++++++++++#.",
 "############################."};
 
-wxHtmlImageCell::wxHtmlImageCell(wxWindow *window, wxFSFile *input, 
-                                 int w, int h, double scale, int align, 
+wxHtmlImageCell::wxHtmlImageCell(wxWindow *window, wxFSFile *input,
+                                 int w, int h, double scale, int align,
                                  const wxString& mapname) : wxHtmlCell()
 {
     m_window = window ? wxStaticCast(window, wxScrolledWindow) : NULL;
@@ -385,64 +386,71 @@ wxHtmlImageCell::wxHtmlImageCell(wxWindow *window, wxFSFile *input,
     m_physX = m_physY = -1;
 #endif
 
-    if ( input )
+    if ( m_bmpW && m_bmpH )
     {
-        wxInputStream *s = input->GetStream();
-
-        if ( s )
+        if ( input )
         {
-            bool readImg = TRUE;
+            wxInputStream *s = input->GetStream();
 
-#if wxUSE_GIF && wxUSE_TIMER
-            if ( (input->GetLocation().Matches(wxT("*.gif")) ||
-                  input->GetLocation().Matches(wxT("*.GIF"))) && m_window )
+            if ( s )
             {
-                m_gifDecoder = new wxGIFDecoder(s, TRUE);
-                if ( m_gifDecoder->ReadGIF() == wxGIF_OK )
+                bool readImg = TRUE;
+
+#if wxUSE_GIF && wxUSE_TIMER
+                if ( (input->GetLocation().Matches(wxT("*.gif")) ||
+                      input->GetLocation().Matches(wxT("*.GIF"))) && m_window )
                 {
-                    wxImage img;
-                    if ( m_gifDecoder->ConvertToImage(&img) )
-                        SetImage(img);
+                    m_gifDecoder = new wxGIFDecoder(s, TRUE);
+                    if ( m_gifDecoder->ReadGIF() == wxGIF_OK )
+                    {
+                        wxImage img;
+                        if ( m_gifDecoder->ConvertToImage(&img) )
+                            SetImage(img);
 
-                    readImg = FALSE;
+                        readImg = FALSE;
 
-                    if ( m_gifDecoder->IsAnimation() )
-                    {
-                        m_gifTimer = new wxGIFTimer(this);
-                        m_gifTimer->Start(m_gifDecoder->GetDelay(), TRUE);
+                        if ( m_gifDecoder->IsAnimation() )
+                        {
+                            m_gifTimer = new wxGIFTimer(this);
+                            m_gifTimer->Start(m_gifDecoder->GetDelay(), TRUE);
+                        }
+                        else
+                        {
+                            wxDELETE(m_gifDecoder);
+                        }
                     }
                     else
                     {
                         wxDELETE(m_gifDecoder);
                     }
                 }
-                else
+
+                if ( readImg )
+#endif // wxUSE_GIF && wxUSE_TIMER
                 {
-                    wxDELETE(m_gifDecoder);
+                    wxImage image(*s, wxBITMAP_TYPE_ANY);
+                    if ( image.Ok() )
+                        SetImage(image);
                 }
             }
-
-            if ( readImg )
-#endif
-            {
-                SetImage(wxImage(*s, wxBITMAP_TYPE_ANY));
-            }
         }
-    }
-    else // input==NULL, use "broken image" bitmap
-    {
-        if ( m_bmpW == -1 && m_bmpH == -1 )
-        {
-            m_bmpW == 29, m_bmpH = 31;            
-        }
-        else
+        else // input==NULL, use "broken image" bitmap
         {
-            m_showFrame = TRUE;
-            if ( m_bmpW == -1 ) m_bmpW = 31;
-            if ( m_bmpH == -1 ) m_bmpH = 33;
+            if ( m_bmpW == -1 && m_bmpH == -1 )
+            {
+                m_bmpW = 29;
+                m_bmpH = 31;
+            }
+            else
+            {
+                m_showFrame = TRUE;
+                if ( m_bmpW == -1 ) m_bmpW = 31;
+                if ( m_bmpH == -1 ) m_bmpH = 33;
+            }
+            m_bitmap = new wxBitmap(broken_image_xpm);
         }
-        m_bitmap = new wxBitmap(broken_image_xpm);
     }
+    //else: ignore the 0-sized images used sometimes on the Web pages
 
     m_Width = (int)(scale * (double)m_bmpW);
     m_Height = (int)(scale * (double)m_bmpH);
@@ -508,7 +516,7 @@ void wxHtmlImageCell::AdvanceAnimation(wxTimer *timer)
     m_window->CalcScrolledPosition(m_physX, m_physY, &x, &y);
     wxRect rect(x, y, m_Width, m_Height);
 
-    if ( m_window->GetClientRect().Intersects(rect) && 
+    if ( m_window->GetClientRect().Intersects(rect) &&
          m_gifDecoder->ConvertToImage(&img) )
     {
         if ( (int)m_gifDecoder->GetWidth() != m_Width ||
@@ -581,7 +589,7 @@ wxHtmlLinkInfo *wxHtmlImageCell::GetLink( int x, int y ) const
             p = p->GetParent();
         }
         p = op;
-        wxHtmlCell *cell = (wxHtmlCell*)p->Find(wxHTML_COND_ISIMAGEMAP, 
+        wxHtmlCell *cell = (wxHtmlCell*)p->Find(wxHTML_COND_ISIMAGEMAP,
                                                 (const void*)(&m_mapName));
         if (!cell)
         {
@@ -616,9 +624,9 @@ TAG_HANDLER_BEGIN(IMG, "IMG,MAP,AREA")
                 wxFSFile *str;
                 wxString tmp = tag.GetParam(wxT("SRC"));
                 wxString mn = wxEmptyString;
-                
+
                 str = m_WParser->OpenURL(wxHTML_URL_IMAGE, tmp);
-                
+
                 if (tag.HasParam(wxT("WIDTH")))
                     tag.GetParamAsInt(wxT("WIDTH"), &w);
                 if (tag.HasParam(wxT("HEIGHT")))
@@ -643,8 +651,8 @@ TAG_HANDLER_BEGIN(IMG, "IMG,MAP,AREA")
                 }
                 wxHtmlImageCell *cel = new wxHtmlImageCell(
                                           m_WParser->GetWindow(),
-                                          str, w, h, 
-                                          m_WParser->GetPixelScale(), 
+                                          str, w, h,
+                                          m_WParser->GetPixelScale(),
                                           al, mn);
                 cel->SetLink(m_WParser->GetLink());
                 cel->SetId(tag.GetParam(wxT("id"))); // may be empty