← Back to branch summary

~ubuntu-branches/ubuntu/maverick/wxwidgets2.8/maverick-proposed

« back to all changes in this revision

Viewing changes to src/html/m_image.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Devid Filoni
  • Date: 2008-06-30 22:02:17 UTC
  • mfrom: (1.1.5 upstream)
  • Revision ID: james.westby@ubuntu.com-20080630220217-vag3tkfp91t0453d
Tags: 2.8.8.0-0ubuntu1
https://launchpad.net/bugs/244355
https://launchpad.net/bugs/242164
https://launchpad.net/bugs/211553
https://launchpad.net/bugs/236876
* New upstream version, based on the upstream tarball
  wxPython-src-2.8.8.0.tar.bz2, remove upstream debian dir (LP: #244355).
* Add debian/watch file, LP: #242164.
* Edit get-orig-source target to provide a .orig.tar.gz with the same md5 for
  each .orig.tar.gz generated.
* debian/rules: remove get-orig-source from .PHONY target.
* debian/control.in: add python-wxtools in python-wxgtk=V=U Suggests field.
* Do not apply fix_from_upstream_svn_r52465 patch, not needed.
* Regenerate octave_oct, tcl_tk_tcl patches for the new version.
* Fix spelling-error-in-description lintian warning.
* Fix depends-on-obsolete-package lintian error.
* Fix executable-not-elf-or-script lintian warnings.
* Fix script-not-executable lintian warnings.
* Fix missing-dependency-on-libc lintian error.
* Fix dbg-package-missing-depends lintian warnings.
* Fix package-contains-empty-directory lintian warnings.
* Fix manpage-has-errors-from-man lintian warning.
* Fix image-file-in-usr-lib lintian warnings:
  - add editra_pixmaps patch
  - add xrced_bitmaps patch
* Fix unused-override lintian info.
* Fix malformed-override lintian errors.
* Fix extra-license-file lintian warnings.
* Install upstream wx.pth instead of generated file links (LP: #211553).
* Add editra.png, pyshell.png (encoded using uuencode) icons, LP: #236876:
  - debian/rules: use uudecode to decode .png icons.
* Add a new pyshell.xpm icon.
* Fix doc-base-file-references-missing-file lintian error.
* Fix doc-base-unknown-section lintian warning.
* Fix ruby-script-but-no-ruby-dep lintian errors.
* Fix wish-script-but-no-wish-dep lintian errors.
* Fix missing-dep-for-interpreter errors.
* Bump Standards-Version to 3.8.0.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/html/m_image.cpp
2
2
// Name:        src/html/m_image.cpp
3
3
// Purpose:     wxHtml module for displaying images
4
4
// Author:      Vaclav Slavik
5
 
// RCS-ID:      $Id: m_image.cpp 41819 2006-10-09 17:51:07Z VZ $
 
5
// RCS-ID:      $Id: m_image.cpp 52997 2008-04-03 18:55:46Z VS $
6
6
// Copyright:   (c) 1999 Vaclav Slavik, Joel Lucsy
7
7
// Licence:     wxWindows licence
8
8
/////////////////////////////////////////////////////////////////////////////
388
388
                        if ( m_gifDecoder->IsAnimation() )
389
389
                        {
390
390
                            m_gifTimer = new wxGIFTimer(this);
391
 
                            m_gifTimer->Start(m_gifDecoder->GetDelay(0), true);
 
391
                            long delay = m_gifDecoder->GetDelay(0);
 
392
                            if ( delay == 0 )
 
393
                                delay = 1;
 
394
                            m_gifTimer->Start(delay, true);
392
395
                        }
393
396
                        else
394
397
                        {
522
525
        win->Refresh(img.HasMask(), &rect);
523
526
    }
524
527
 
525
 
    timer->Start(m_gifDecoder->GetDelay(m_nCurrFrame), true);
 
528
    long delay = m_gifDecoder->GetDelay(m_nCurrFrame);
 
529
    if ( delay == 0 )
 
530
        delay = 1;
 
531
    timer->Start(delay, true);
526
532
}
527
533
 
528
534
void wxHtmlImageCell::Layout(int w)