← Back to branch summary

~ubuntu-branches/ubuntu/vivid/digikam/vivid

« back to all changes in this revision

Viewing changes to extra/kipi-plugins/printimages/tools/layouttree.cpp

  • Committer: Package Import Robot
  • Author(s): Philip Muškovac
  • Date: 2012-02-14 19:29:29 UTC
  • mfrom: (1.2.38) (3.1.16 experimental)
  • Revision ID: package-import@ubuntu.com-20120214192929-cx2zia3b2nt67lvz
Tags: 4:2.5.0-1ubuntu1
* Merge from debian unstable, remaining changes:
  - keep seperate binary packages:
    + libkface1, libkface-data, libkface-dev
    + libkgeomap1, libkgeomap-data, libkgeomap-dev
    + libvkontakte1, libkvkontakte-dev
    + libmediawiki1, libmediawiki-dev
  - keep patches:
    + kubuntu_mysqld_executable_name.diff
  - don't fail on missing files in dh_install
  - install oxygen icons for kipi-plugins
  - build-depend on mysql 5.5 instead of 5.1
  - update install files
* digikam breaks/replaces kipi-plugins-common << 4:2.5.0~
* digikam-doc breaks/replaces digikam-data << 4:2.5.0~
* digikam-data breaks/replaces kipi-plugins << 4:2.5.0~
* kipi-plugins-common breaks/replaces kipi-plugins << 4:2.5.0~

Show diffs side-by-side

added added

removed removed

Lines of Context:
extra/kipi-plugins/printimages/tools/layouttree.cpp
22
22
 
23
23
#include "layouttree.h"
24
24
 
25
 
// C++ includes.
 
25
// C++ includes
26
26
 
27
27
#include <cmath>
28
28
 
29
 
// Qt includes.
 
29
// Qt includes
30
30
 
31
31
#include <QList>
32
32
 
188
188
 
189
189
LayoutTree &LayoutTree::operator=(const LayoutTree& other)
190
190
{
191
 
    // FIXME: this line might contain a possible memory leak, since the pointer is not deleted before it is re-allocated.
 
191
    delete m_root;
192
192
    m_root             = new LayoutNode(*(other.m_root));
193
193
    m_count            = other.m_count;
194
194
    m_aspectRatioPage  = other.m_aspectRatioPage;