missing commit

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

diff --git a/src/html/m_image.cpp b/src/html/m_image.cpp
index 3a24f08ecbb15dfebea13fded371c3668db39435..6394fa1b2bec48061ff04142f6f15e2a164c12b8 100644 (file)
--- a/src/html/m_image.cpp
+++ b/src/html/m_image.cpp
@@ -1,43 +1,39 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        m_image.cpp
+// Name:        src/html/m_image.cpp

 // Purpose:     wxHtml module for displaying images
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vaclav Slavik, Joel Lucsy
 // Purpose:     wxHtml module for displaying images
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vaclav Slavik, Joel Lucsy

-// Licence:     wxWindows Licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation
-#endif
-

 #include "wx/wxprec.h"
 
 #include "wx/wxprec.h"
 

-#include "wx/defs.h"
-#if wxUSE_HTML && wxUSE_STREAMS
-

 #ifdef __BORLANDC__
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

-#ifndef WXPRECOMP
+#if wxUSE_HTML && wxUSE_STREAMS
+
+#ifndef WX_PRECOMP
+    #include "wx/dynarray.h"

     #include "wx/dc.h"
     #include "wx/scrolwin.h"
     #include "wx/timer.h"
     #include "wx/dcmemory.h"
     #include "wx/dc.h"
     #include "wx/scrolwin.h"
     #include "wx/timer.h"
     #include "wx/dcmemory.h"

+    #include "wx/log.h"
+    #include "wx/math.h"
+    #include "wx/image.h"
+    #include "wx/wxcrtvararg.h"

 #endif
 
 #include "wx/html/forcelnk.h"
 #include "wx/html/m_templ.h"
 #include "wx/html/htmlwin.h"
 
 #endif
 
 #include "wx/html/forcelnk.h"
 #include "wx/html/m_templ.h"
 #include "wx/html/htmlwin.h"
 

-#include "wx/image.h"

 #include "wx/gifdecod.h"
 #include "wx/gifdecod.h"

-#include "wx/dynarray.h"
-#include "wx/log.h"

 #include "wx/artprov.h"
 
 #include "wx/artprov.h"
 

-#include <math.h>

 #include <float.h>
 
 FORCE_LINK_ME(m_image)
 #include <float.h>
 
 FORCE_LINK_ME(m_image)


@@ -47,7 +43,7 @@ FORCE_LINK_ME(m_image)
 
 WX_DECLARE_OBJARRAY(int, CoordArray);
 #include "wx/arrimpl.cpp" // this is a magic incantation which must be done!
 
 WX_DECLARE_OBJARRAY(int, CoordArray);
 #include "wx/arrimpl.cpp" // this is a magic incantation which must be done!

-WX_DEFINE_OBJARRAY(CoordArray);
+WX_DEFINE_OBJARRAY(CoordArray)

 
 
 // ---------------------------------------------------------------------------
 
 
 // ---------------------------------------------------------------------------


@@ -71,6 +67,9 @@ class wxHtmlImageMapAreaCell : public wxHtmlCell
                   int WXUNUSED(x), int WXUNUSED(y),
                   int WXUNUSED(view_y1), int WXUNUSED(view_y2),
                   wxHtmlRenderingInfo& WXUNUSED(info)) {}
                   int WXUNUSED(x), int WXUNUSED(y),
                   int WXUNUSED(view_y1), int WXUNUSED(view_y2),
                   wxHtmlRenderingInfo& WXUNUSED(info)) {}

+
+
+    wxDECLARE_NO_COPY_CLASS(wxHtmlImageMapAreaCell);

 };
 
 
 };
 
 


@@ -83,7 +82,7 @@ wxHtmlImageMapAreaCell::wxHtmlImageMapAreaCell( wxHtmlImageMapAreaCell::celltype
     wxString x = incoords, y;
 
     type = t;
     wxString x = incoords, y;
 
     type = t;

-    while ((i = x.Find( ',' )) != -1)
+    while ((i = x.Find( ',' )) != wxNOT_FOUND)

     {
         coords.Add( (int)(pixel_scale * (double)wxAtoi( x.Left( i ).c_str())) );
         x = x.Mid( i + 1 );
     {
         coords.Add( (int)(pixel_scale * (double)wxAtoi( x.Left( i ).c_str())) );
         x = x.Mid( i + 1 );


@@ -247,6 +246,8 @@ class wxHtmlImageMapCell : public wxHtmlCell
                   int WXUNUSED(x), int WXUNUSED(y),
                   int WXUNUSED(view_y1), int WXUNUSED(view_y2),
                   wxHtmlRenderingInfo& WXUNUSED(info)) {}
                   int WXUNUSED(x), int WXUNUSED(y),
                   int WXUNUSED(view_y1), int WXUNUSED(view_y2),
                   wxHtmlRenderingInfo& WXUNUSED(info)) {}

+
+    wxDECLARE_NO_COPY_CLASS(wxHtmlImageMapCell);

 };
 
 
 };
 
 


@@ -285,16 +286,23 @@ const wxHtmlCell *wxHtmlImageMapCell::Find( int cond, const void *param ) const
 class wxHtmlImageCell : public wxHtmlCell
 {
 public:
 class wxHtmlImageCell : public wxHtmlCell
 {
 public:

-    wxHtmlImageCell(wxWindow *window,
-                    wxFSFile *input, int w = -1, int h = -1,
+    wxHtmlImageCell(wxHtmlWindowInterface *windowIface,
+                    wxFSFile *input,
+                    int w = wxDefaultCoord, bool wpercent = false,
+                    int h = wxDefaultCoord, bool hpresent = false,

                     double scale = 1.0, int align = wxHTML_ALIGN_BOTTOM,
                     const wxString& mapname = wxEmptyString);
                     double scale = 1.0, int align = wxHTML_ALIGN_BOTTOM,
                     const wxString& mapname = wxEmptyString);

-    ~wxHtmlImageCell();
+    virtual ~wxHtmlImageCell();

     void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2,
               wxHtmlRenderingInfo& info);
     virtual wxHtmlLinkInfo *GetLink(int x = 0, int y = 0) const;
 
     void SetImage(const wxImage& img);
     void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2,
               wxHtmlRenderingInfo& info);
     virtual wxHtmlLinkInfo *GetLink(int x = 0, int y = 0) const;
 
     void SetImage(const wxImage& img);

+
+    // If "alt" text is set, it will be used when converting this cell to text.
+    void SetAlt(const wxString& alt);
+    virtual wxString ConvertToText(wxHtmlSelection *sel) const;
+

 #if wxUSE_GIF && wxUSE_TIMER
     void AdvanceAnimation(wxTimer *timer);
     virtual void Layout(int w);
 #if wxUSE_GIF && wxUSE_TIMER
     void AdvanceAnimation(wxTimer *timer);
     virtual void Layout(int w);


@@ -302,19 +310,24 @@ public:
 
 private:
     wxBitmap           *m_bitmap;
 
 private:
     wxBitmap           *m_bitmap;

+    int                 m_align;

     int                 m_bmpW, m_bmpH;
     int                 m_bmpW, m_bmpH;

+    bool                m_bmpWpercent:1;
+    bool                m_bmpHpresent:1;

     bool                m_showFrame:1;
     bool                m_showFrame:1;

-    wxScrolledWindow   *m_window;
+    wxHtmlWindowInterface *m_windowIface;

 #if wxUSE_GIF && wxUSE_TIMER
     wxGIFDecoder       *m_gifDecoder;
     wxTimer            *m_gifTimer;
     int                 m_physX, m_physY;
 #if wxUSE_GIF && wxUSE_TIMER
     wxGIFDecoder       *m_gifDecoder;
     wxTimer            *m_gifTimer;
     int                 m_physX, m_physY;

+    size_t              m_nCurrFrame;

 #endif
     double              m_scale;
     wxHtmlImageMapCell *m_imageMap;
     wxString            m_mapName;
 #endif
     double              m_scale;
     wxHtmlImageMapCell *m_imageMap;
     wxString            m_mapName;

+    wxString            m_alt;

 
 

-    DECLARE_NO_COPY_CLASS(wxHtmlImageCell)
+    wxDECLARE_NO_COPY_CLASS(wxHtmlImageCell);

 };
 
 #if wxUSE_GIF && wxUSE_TIMER
 };
 
 #if wxUSE_GIF && wxUSE_TIMER


@@ -330,7 +343,7 @@ class wxGIFTimer : public wxTimer
     private:
         wxHtmlImageCell *m_cell;
 
     private:
         wxHtmlImageCell *m_cell;
 

-    DECLARE_NO_COPY_CLASS(wxGIFTimer)
+    wxDECLARE_NO_COPY_CLASS(wxGIFTimer);

 };
 #endif
 
 };
 #endif
 


@@ -340,23 +353,28 @@ class wxGIFTimer : public wxTimer
 //----------------------------------------------------------------------------
 
 
 //----------------------------------------------------------------------------
 
 

-wxHtmlImageCell::wxHtmlImageCell(wxWindow *window, wxFSFile *input,
-                                 int w, int h, double scale, int align,
+wxHtmlImageCell::wxHtmlImageCell(wxHtmlWindowInterface *windowIface,
+                                 wxFSFile *input,
+                                 int w, bool wpercent, int h, bool hpresent, double scale, int align,

                                  const wxString& mapname) : wxHtmlCell()
 {
                                  const wxString& mapname) : wxHtmlCell()
 {

-    m_window = window ? wxStaticCast(window, wxScrolledWindow) : NULL;
+    m_windowIface = windowIface;

     m_scale = scale;
     m_scale = scale;

-    m_showFrame = FALSE;
+    m_showFrame = false;

     m_bitmap = NULL;
     m_bitmap = NULL;

-    m_bmpW = w;
-    m_bmpH = h;
+    m_bmpW   = w;
+    m_bmpH   = h;
+    m_align  = align;
+    m_bmpWpercent = wpercent;
+    m_bmpHpresent = hpresent;

     m_imageMap = NULL;
     m_mapName = mapname;
     m_imageMap = NULL;
     m_mapName = mapname;

-    SetCanLiveOnPagebreak(FALSE);
+    SetCanLiveOnPagebreak(false);

 #if wxUSE_GIF && wxUSE_TIMER
     m_gifDecoder = NULL;
     m_gifTimer = NULL;
 #if wxUSE_GIF && wxUSE_TIMER
     m_gifDecoder = NULL;
     m_gifTimer = NULL;

-    m_physX = m_physY = -1;
+    m_physX = m_physY = wxDefaultCoord;
+    m_nCurrFrame = 0;

 #endif
 
     if ( m_bmpW && m_bmpH )
 #endif
 
     if ( m_bmpW && m_bmpH )


@@ -367,25 +385,28 @@ wxHtmlImageCell::wxHtmlImageCell(wxWindow *window, wxFSFile *input,
 
             if ( s )
             {
 
             if ( s )
             {

-                bool readImg = TRUE;
-

 #if wxUSE_GIF && wxUSE_TIMER
 #if wxUSE_GIF && wxUSE_TIMER

-                if ( (input->GetLocation().Matches(wxT("*.gif")) ||
-                      input->GetLocation().Matches(wxT("*.GIF"))) && m_window )
+                bool readImg = true;
+                if ( m_windowIface &&
+                     (input->GetLocation().Matches(wxT("*.gif")) ||
+                      input->GetLocation().Matches(wxT("*.GIF"))) )

                 {
                 {

-                    m_gifDecoder = new wxGIFDecoder(s, TRUE);
-                    if ( m_gifDecoder->ReadGIF() == wxGIF_OK )
+                    m_gifDecoder = new wxGIFDecoder();
+                    if ( m_gifDecoder->LoadGIF(*s) == wxGIF_OK )

                     {
                         wxImage img;
                     {
                         wxImage img;

-                        if ( m_gifDecoder->ConvertToImage(&img) )
+                        if ( m_gifDecoder->ConvertToImage(0, &img) )

                             SetImage(img);
 
                             SetImage(img);
 

-                        readImg = FALSE;
+                        readImg = false;

 
                         if ( m_gifDecoder->IsAnimation() )
                         {
                             m_gifTimer = new wxGIFTimer(this);
 
                         if ( m_gifDecoder->IsAnimation() )
                         {
                             m_gifTimer = new wxGIFTimer(this);

-                            m_gifTimer->Start(m_gifDecoder->GetDelay(), TRUE);
+                            long delay = m_gifDecoder->GetDelay(0);
+                            if ( delay == 0 )
+                                delay = 1;
+                            m_gifTimer->Start(delay, true);

                         }
                         else
                         {
                         }
                         else
                         {


@@ -402,51 +423,36 @@ wxHtmlImageCell::wxHtmlImageCell(wxWindow *window, wxFSFile *input,
 #endif // wxUSE_GIF && wxUSE_TIMER
                 {
                     wxImage image(*s, wxBITMAP_TYPE_ANY);
 #endif // wxUSE_GIF && wxUSE_TIMER
                 {
                     wxImage image(*s, wxBITMAP_TYPE_ANY);

-                    if ( image.Ok() )
+                    if ( image.IsOk() )

                         SetImage(image);
                 }
             }
         }
         else // input==NULL, use "broken image" bitmap
         {
                         SetImage(image);
                 }
             }
         }
         else // input==NULL, use "broken image" bitmap
         {

-            if ( m_bmpW == -1 && m_bmpH == -1 )
+            if ( m_bmpW == wxDefaultCoord && m_bmpH == wxDefaultCoord )

             {
                 m_bmpW = 29;
                 m_bmpH = 31;
             }
             else
             {
             {
                 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_showFrame = true;
+                if ( m_bmpW == wxDefaultCoord ) m_bmpW = 31;
+                if ( m_bmpH == wxDefaultCoord ) m_bmpH = 33;

             }
             }

-            m_bitmap = 
+            m_bitmap =

                 new wxBitmap(wxArtProvider::GetBitmap(wxART_MISSING_IMAGE));
         }
     }
     //else: ignore the 0-sized images used sometimes on the Web pages
 
                 new wxBitmap(wxArtProvider::GetBitmap(wxART_MISSING_IMAGE));
         }
     }
     //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);
-
-    switch (align)
-    {
-        case wxHTML_ALIGN_TOP :
-            m_Descent = m_Height;
-            break;
-        case wxHTML_ALIGN_CENTER :
-            m_Descent = m_Height / 2;
-            break;
-        case wxHTML_ALIGN_BOTTOM :
-        default :
-            m_Descent = 0;
-            break;
-    }

  }
 
 void wxHtmlImageCell::SetImage(const wxImage& img)
 {
  }
 
 void wxHtmlImageCell::SetImage(const wxImage& img)
 {

-    if ( img.Ok() )
+#if !defined(__WXMSW__) || wxUSE_WXDIB
+    if ( img.IsOk() )

     {
         delete m_bitmap;
 
     {
         delete m_bitmap;
 


@@ -454,19 +460,34 @@ void wxHtmlImageCell::SetImage(const wxImage& img)
         ww = img.GetWidth();
         hh = img.GetHeight();
 
         ww = img.GetWidth();
         hh = img.GetHeight();
 

-        if ( m_bmpW == -1 )
+        if ( m_bmpW == wxDefaultCoord)

             m_bmpW = ww;
             m_bmpW = ww;

-        if ( m_bmpH == -1 )
+        if ( m_bmpH == wxDefaultCoord)

             m_bmpH = hh;
 
             m_bmpH = hh;
 

+        // Only scale the bitmap at the rendering stage,
+        // so we don't lose quality twice
+/*

         if ((m_bmpW != ww) || (m_bmpH != hh))
         {
             wxImage img2 = img.Scale(m_bmpW, m_bmpH);
             m_bitmap = new wxBitmap(img2);
         }
         else
         if ((m_bmpW != ww) || (m_bmpH != hh))
         {
             wxImage img2 = img.Scale(m_bmpW, m_bmpH);
             m_bitmap = new wxBitmap(img2);
         }
         else

+*/

             m_bitmap = new wxBitmap(img);
     }
             m_bitmap = new wxBitmap(img);
     }

+#endif
+}
+
+void wxHtmlImageCell::SetAlt(const wxString& alt)
+{
+    m_alt = alt;
+}
+
+wxString wxHtmlImageCell::ConvertToText(wxHtmlSelection* WXUNUSED(sel)) const
+{
+    return m_alt;

 }
 
 #if wxUSE_GIF && wxUSE_TIMER
 }
 
 #if wxUSE_GIF && wxUSE_TIMER


@@ -474,9 +495,12 @@ void wxHtmlImageCell::AdvanceAnimation(wxTimer *timer)
 {
     wxImage img;
 
 {
     wxImage img;
 

-    m_gifDecoder->GoNextFrame(TRUE);
+    // advance current frame
+    m_nCurrFrame++;
+    if (m_nCurrFrame == m_gifDecoder->GetFrameCount())
+        m_nCurrFrame = 0;

 
 

-    if ( m_physX == -1 )
+    if ( m_physX == wxDefaultCoord )

     {
         m_physX = m_physY = 0;
         for (wxHtmlCell *cell = this; cell; cell = cell->GetParent())
     {
         m_physX = m_physY = 0;
         for (wxHtmlCell *cell = this; cell; cell = cell->GetParent())


@@ -486,35 +510,69 @@ void wxHtmlImageCell::AdvanceAnimation(wxTimer *timer)
         }
     }
 
         }
     }
 

-    int x, y;
-    m_window->CalcScrolledPosition(m_physX, m_physY, &x, &y);
-    wxRect rect(x, y, m_Width, m_Height);
+    wxWindow *win = m_windowIface->GetHTMLWindow();
+    wxPoint pos =
+        m_windowIface->HTMLCoordsToWindow(this, wxPoint(m_physX, m_physY));
+    wxRect rect(pos, wxSize(m_Width, m_Height));

 
 

-    if ( m_window->GetClientRect().Intersects(rect) &&
-         m_gifDecoder->ConvertToImage(&img) )
+    if ( win->GetClientRect().Intersects(rect) &&
+         m_gifDecoder->ConvertToImage(m_nCurrFrame, &img) )

     {
     {

-        if ( (int)m_gifDecoder->GetWidth() != m_Width ||
-             (int)m_gifDecoder->GetHeight() != m_Height ||
-             m_gifDecoder->GetLeft() != 0 || m_gifDecoder->GetTop() != 0 )
+#if !defined(__WXMSW__) || wxUSE_WXDIB
+        if ( m_gifDecoder->GetFrameSize(m_nCurrFrame) != wxSize(m_Width, m_Height) ||
+             m_gifDecoder->GetFramePosition(m_nCurrFrame) != wxPoint(0, 0) )

         {
             wxBitmap bmp(img);
             wxMemoryDC dc;
             dc.SelectObject(*m_bitmap);
         {
             wxBitmap bmp(img);
             wxMemoryDC dc;
             dc.SelectObject(*m_bitmap);

-            dc.DrawBitmap(bmp, m_gifDecoder->GetLeft(), m_gifDecoder->GetTop(),
-                          TRUE /* use mask */);
+            dc.DrawBitmap(bmp, m_gifDecoder->GetFramePosition(m_nCurrFrame),
+                          true /* use mask */);

         }
         else
         }
         else

+#endif

             SetImage(img);
             SetImage(img);

-        m_window->Refresh(img.HasMask(), &rect);
+        win->Refresh(img.HasMask(), &rect);

     }
 
     }
 

-    timer->Start(m_gifDecoder->GetDelay(), TRUE);
+    long delay = m_gifDecoder->GetDelay(m_nCurrFrame);
+    if ( delay == 0 )
+        delay = 1;
+    timer->Start(delay, true);

 }
 
 void wxHtmlImageCell::Layout(int w)
 {
 }
 
 void wxHtmlImageCell::Layout(int w)
 {

+    if (m_bmpWpercent)
+    {
+
+        m_Width = w*m_bmpW/100;
+
+        if (!m_bmpHpresent && m_bitmap != NULL)
+            m_Height = m_bitmap->GetHeight()*m_Width/m_bitmap->GetWidth();
+        else
+            m_Height = static_cast<int>(m_scale*m_bmpH);
+    } else
+    {
+        m_Width  = static_cast<int>(m_scale*m_bmpW);
+        m_Height = static_cast<int>(m_scale*m_bmpH);
+    }
+
+    switch (m_align)
+    {
+        case wxHTML_ALIGN_TOP :
+            m_Descent = m_Height;
+            break;
+        case wxHTML_ALIGN_CENTER :
+            m_Descent = m_Height / 2;
+            break;
+        case wxHTML_ALIGN_BOTTOM :
+        default :
+            m_Descent = 0;
+            break;
+    }
+

     wxHtmlCell::Layout(w);
     wxHtmlCell::Layout(w);

-    m_physX = m_physY = -1;
+    m_physX = m_physY = wxDefaultCoord;

 }
 
 #endif
 }
 
 #endif


@@ -542,19 +600,28 @@ void wxHtmlImageCell::Draw(wxDC& dc, int x, int y,
     }
     if ( m_bitmap )
     {
     }
     if ( m_bitmap )
     {

+        // We add in the scaling from the desired bitmap width
+        // and height, so we only do the scaling once.
+        double imageScaleX = 1.0;
+        double imageScaleY = 1.0;
+        if (m_Width != m_bitmap->GetWidth())
+            imageScaleX = (double) m_Width / (double) m_bitmap->GetWidth();
+        if (m_Height != m_bitmap->GetHeight())
+            imageScaleY = (double) m_Height / (double) m_bitmap->GetHeight();
+

         double us_x, us_y;
         dc.GetUserScale(&us_x, &us_y);
         double us_x, us_y;
         dc.GetUserScale(&us_x, &us_y);

-        dc.SetUserScale(us_x * m_scale, us_y * m_scale);
+        dc.SetUserScale(us_x * imageScaleX, us_y * imageScaleY);

 
 

-        dc.DrawBitmap(*m_bitmap, (int) ((x + m_PosX) / m_scale),
-                                 (int) ((y + m_PosY) / m_scale), TRUE);
+        dc.DrawBitmap(*m_bitmap, (int) ((x + m_PosX) / (imageScaleX)),
+                                 (int) ((y + m_PosY) / (imageScaleY)), true);

         dc.SetUserScale(us_x, us_y);
     }
 }
 
 wxHtmlLinkInfo *wxHtmlImageCell::GetLink( int x, int y ) const
 {
         dc.SetUserScale(us_x, us_y);
     }
 }
 
 wxHtmlLinkInfo *wxHtmlImageCell::GetLink( int x, int y ) const
 {

-    if (m_mapName.IsEmpty())
+    if (m_mapName.empty())

         return wxHtmlCell::GetLink( x, y );
     if (!m_imageMap)
     {
         return wxHtmlCell::GetLink( x, y );
     if (!m_imageMap)
     {


@@ -589,6 +656,7 @@ wxHtmlLinkInfo *wxHtmlImageCell::GetLink( int x, int y ) const
 //--------------------------------------------------------------------------------
 
 TAG_HANDLER_BEGIN(IMG, "IMG,MAP,AREA")
 //--------------------------------------------------------------------------------
 
 TAG_HANDLER_BEGIN(IMG, "IMG,MAP,AREA")

+    TAG_HANDLER_CONSTR(IMG) { }

 
     TAG_HANDLER_PROC(tag)
     {
 
     TAG_HANDLER_PROC(tag)
     {


@@ -596,7 +664,9 @@ TAG_HANDLER_BEGIN(IMG, "IMG,MAP,AREA")
         {
             if (tag.HasParam(wxT("SRC")))
             {
         {
             if (tag.HasParam(wxT("SRC")))
             {

-                int w = -1, h = -1;
+                int w = wxDefaultCoord, h = wxDefaultCoord;
+                bool wpercent = false;
+                bool hpresent = false;

                 int al;
                 wxFSFile *str;
                 wxString tmp = tag.GetParam(wxT("SRC"));
                 int al;
                 wxFSFile *str;
                 wxString tmp = tag.GetParam(wxT("SRC"));


@@ -605,9 +675,25 @@ TAG_HANDLER_BEGIN(IMG, "IMG,MAP,AREA")
                 str = m_WParser->OpenURL(wxHTML_URL_IMAGE, tmp);
 
                 if (tag.HasParam(wxT("WIDTH")))
                 str = m_WParser->OpenURL(wxHTML_URL_IMAGE, tmp);
 
                 if (tag.HasParam(wxT("WIDTH")))

-                    tag.GetParamAsInt(wxT("WIDTH"), &w);
+                {
+                    if (tag.GetParamAsIntOrPercent(wxT("WIDTH"), &w, wpercent))
+                    {
+                        if (wpercent)
+                        {
+                            if (w < 0)
+                                w = 0;
+                            else if (w > 100)
+                                w = 100;
+                        }
+                    }
+                }
+

                 if (tag.HasParam(wxT("HEIGHT")))
                 if (tag.HasParam(wxT("HEIGHT")))

+                {

                     tag.GetParamAsInt(wxT("HEIGHT"), &h);
                     tag.GetParamAsInt(wxT("HEIGHT"), &h);

+                    hpresent = true;
+                }
+

                 al = wxHTML_ALIGN_BOTTOM;
                 if (tag.HasParam(wxT("ALIGN")))
                 {
                 al = wxHTML_ALIGN_BOTTOM;
                 if (tag.HasParam(wxT("ALIGN")))
                 {


@@ -621,18 +707,20 @@ TAG_HANDLER_BEGIN(IMG, "IMG,MAP,AREA")
                 if (tag.HasParam(wxT("USEMAP")))
                 {
                     mn = tag.GetParam( wxT("USEMAP") );
                 if (tag.HasParam(wxT("USEMAP")))
                 {
                     mn = tag.GetParam( wxT("USEMAP") );

-                    if (mn.GetChar(0) == wxT('#'))
+                    if ( !mn.empty() && *mn.begin() == '#' )

                     {
                         mn = mn.Mid( 1 );
                     }
                 }
                 wxHtmlImageCell *cel = new wxHtmlImageCell(
                     {
                         mn = mn.Mid( 1 );
                     }
                 }
                 wxHtmlImageCell *cel = new wxHtmlImageCell(

-                                          m_WParser->GetWindow(),
-                                          str, w, h,
+                                          m_WParser->GetWindowInterface(),
+                                          str, w, wpercent, h, hpresent,

                                           m_WParser->GetPixelScale(),
                                           al, mn);
                                           m_WParser->GetPixelScale(),
                                           al, mn);

-                cel->SetLink(m_WParser->GetLink());
+                m_WParser->ApplyStateToCell(cel);
+                m_WParser->StopCollapsingSpaces();

                 cel->SetId(tag.GetParam(wxT("id"))); // may be empty
                 cel->SetId(tag.GetParam(wxT("id"))); // may be empty

+                cel->SetAlt(tag.GetParam(wxT("alt")));

                 m_WParser->GetContainer()->InsertCell(cel);
                 if (str)
                     delete str;
                 m_WParser->GetContainer()->InsertCell(cel);
                 if (str)
                     delete str;


@@ -678,16 +766,17 @@ TAG_HANDLER_BEGIN(IMG, "IMG,MAP,AREA")
                 }
                 if (cel != NULL && tag.HasParam(wxT("HREF")))
                 {
                 }
                 if (cel != NULL && tag.HasParam(wxT("HREF")))
                 {

-                    wxString tmp = tag.GetParam(wxT("HREF"));
-                    wxString target = wxEmptyString;
-                    if (tag.HasParam(wxT("TARGET"))) target = tag.GetParam(wxT("TARGET"));
-                    cel->SetLink( wxHtmlLinkInfo(tmp, target));
+                    wxString target;
+                    if (tag.HasParam(wxT("TARGET")))
+                        target = tag.GetParam(wxT("TARGET"));
+                    cel->SetLink(wxHtmlLinkInfo(tag.GetParam(wxT("HREF")), target));

                 }
                 }

-                if (cel != NULL) m_WParser->GetContainer()->InsertCell( cel );
+                if (cel != NULL)
+                    m_WParser->GetContainer()->InsertCell( cel );

             }
         }
 
             }
         }
 

-        return FALSE;
+        return false;

     }
 
 TAG_HANDLER_END(IMG)
     }
 
 TAG_HANDLER_END(IMG)