~ubuntu-branches/ubuntu/saucy/digikam/saucy

« back to all changes in this revision

Viewing changes to utilities/queuemanager/basetools/convert/convert2jp2.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Scott Kitterman
  • Date: 2010-12-21 23:19:11 UTC
  • mfrom: (1.2.33 upstream) (3.1.7 experimental)
  • Revision ID: james.westby@ubuntu.com-20101221231911-z9jip7s5aht1jqn9
Tags: 2:1.7.0-1ubuntu1
* Merge from Debian Experimental. Remaining Ubuntu changes:
  - Export .pot name and copy to plugins in debian/rules
  - Version build-depends on kipi-plugins-dev to ensure build is against the
    same version on all archs
* Drop debian/patches/kubuntu_01_linker.diff, incoporated upstream
* Remove patches directory and unused patches

Show diffs side-by-side

added added

removed removed

Lines of Context:
44
44
{
45
45
 
46
46
Convert2JP2::Convert2JP2(QObject* parent)
47
 
           : BatchTool("Convert2JP2", ConvertTool, parent)
 
47
    : BatchTool("Convert2JP2", ConvertTool, parent)
48
48
{
49
49
    setToolTitle(i18n("Convert To JP2"));
50
50
    setToolDescription(i18n("A tool to convert images to JPEG-2000 format."));
94
94
 
95
95
bool Convert2JP2::toolOperations()
96
96
{
97
 
    if (!loadToDImg()) return false;
 
97
    if (!loadToDImg())
 
98
    {
 
99
        return false;
 
100
    }
98
101
 
99
102
    bool lossless = settings()["lossless"].toBool();
100
103
    image().setAttribute("quality", lossless ? 100 : settings()["quality"].toInt());