← Back to branch summary

~ubuntu-branches/ubuntu/precise/koffice/precise

« back to all changes in this revision

Viewing changes to krita/plugins/formats/psd/psd_colormode_block.h

  • 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_colormode_block.h
32
32
    bool write(QIODevice* io);
33
33
    bool valid();
34
34
 
35
 
    quint32 m_blocksize;
36
 
    PSDColorMode m_colormode;
37
 
    QByteArray m_data;
 
35
    quint32 blocksize;
 
36
    PSDColorMode colormode;
 
37
    QByteArray data;
38
38
 
39
39
    QString error;
40
40
};