← Back to branch summary

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

« back to all changes in this revision

Viewing changes to utilities/queuemanager/basetools/color/channelmixer.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:
utilities/queuemanager/basetools/color/channelmixer.cpp
45
45
{
46
46
 
47
47
ChannelMixer::ChannelMixer(QObject* parent)
48
 
            : BatchTool("ChannelMixer", ColorTool, parent)
 
48
    : BatchTool("ChannelMixer", ColorTool, parent)
49
49
{
50
50
    setToolTitle(i18n("Channel Mixer"));
51
51
    setToolDescription(i18n("A tool to mix color channel."));
175
175
 
176
176
bool ChannelMixer::toolOperations()
177
177
{
178
 
    if (!loadToDImg()) return false;
 
178
    if (!loadToDImg())
 
179
    {
 
180
        return false;
 
181
    }
179
182
 
180
183
    MixerContainer prm;
181
184