← Back to branch summary

~ubuntu-branches/ubuntu/natty/inkscape/natty

« back to all changes in this revision

Viewing changes to src/color.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Alex Valavanis
  • Date: 2010-09-12 19:44:58 UTC
  • mfrom: (1.1.12 upstream) (45.1.3 maverick)
  • Revision ID: james.westby@ubuntu.com-20100912194458-4sjwmbl7dlsrk5dc
Tags: 0.48.0-1ubuntu1
https://launchpad.net/bugs/628048
https://launchpad.net/bugs/401567
https://launchpad.net/bugs/456248
https://launchpad.net/bugs/463602
https://launchpad.net/bugs/591986
https://launchpad.net/bugs/513319
* Merge with Debian unstable (LP: #628048, LP: #401567, LP: #456248, 
  LP: #463602, LP: #591986)
* debian/control: 
  - Ubuntu maintainers
  - Promote python-lxml, python-numpy, python-uniconvertor to Recommends.
  - Demote pstoedit to Suggests (universe package).
  - Suggests ttf-dejavu instead of ttf-bitstream-vera (LP: #513319)
* debian/rules:
  - Run intltool-update on build (Ubuntu-specific).
  - Add translation domain to .desktop files (Ubuntu-specific).
* debian/dirs:
  - Add usr/share/pixmaps.  Allow inkscape.xpm installation
* drop 50-poppler-API.dpatch (now upstream)
* drop 51-paste-in-unwritable-directory.dpatch (now upstream) 

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/color.cpp
63
63
 
64
64
SPColor& SPColor::operator= (SPColor const& other)
65
65
{
66
 
    SVGICCColor* tmp = other.icc ? new SVGICCColor(*other.icc) : 0;
 
66
    SVGICCColor* tmp_icc = other.icc ? new SVGICCColor(*other.icc) : 0;
 
67
 
67
68
    v.c[0] = other.v.c[0];
68
69
    v.c[1] = other.v.c[1];
69
70
    v.c[2] = other.v.c[2];
70
71
    if ( icc ) {
71
72
        delete icc;
72
73
    }
73
 
    icc = tmp;
 
74
    icc = tmp_icc;
74
75
 
75
76
    return *this;
76
77
}