← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/koffice/oneiric-updates

« back to all changes in this revision

Viewing changes to krita/plugins/formats/psd/psd_resource_section.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Alessandro Ghersi
  • Date: 2010-10-27 17:52:57 UTC
  • mfrom: (0.12.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20101027175257-s04zqqk5bs8ckm9o
Tags: 1:2.2.83-0ubuntu1
* Merge with Debian git remaining changes:
 - Add build-deps on librcps-dev, opengtl-dev, libqtgtl-dev, freetds-dev,
   create-resources, libspnav-dev
 - Remove needless build-dep on libwv2-dev
 - koffice-libs recommends create-resources
 - krita recommends pstoedit
 - Keep our patches
* New upstream release 2.3 beta 3
  - Remove debian/patches fixed by upstream
  - Update install files

Show diffs side-by-side

added added

removed removed

Lines of Context:
krita/plugins/formats/psd/psd_resource_section.cpp
32
32
 
33
33
PSDResourceSection::~PSDResourceSection()
34
34
{
35
 
    qDeleteAll(m_resources);
 
35
    qDeleteAll(resources);
36
36
}
37
37
 
38
38
bool PSDResourceSection::read(QIODevice* io)
61
61
            error = "Error reading block: " + block->error;
62
62
            return false;
63
63
        }
64
 
        dbgFile << "resource block created. Type:" << block->m_identifier << "size"
65
 
                << block->m_dataSize
 
64
        dbgFile << "resource block created. Type:" << block->identifier << "size"
 
65
                << block->dataSize
66
66
                << "," << buf.bytesAvailable() << "bytes to go";
67
 
        m_resources[(PSDResourceID)block->m_identifier] = block;
 
67
        resources[(PSDResourceID)block->identifier] = block;
68
68
    }
69
69
    return valid();
70
70
}