← Back to branch summary

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

« back to all changes in this revision

Viewing changes to libs/dimg/filters/fx/embossfilter.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:
libs/dimg/filters/fx/embossfilter.cpp
41
41
{
42
42
 
43
43
EmbossFilter::EmbossFilter(DImg* orgImage, QObject* parent, int depth)
44
 
            : DImgThreadedFilter(orgImage, parent, "Emboss")
 
44
    : DImgThreadedFilter(orgImage, parent, "Emboss")
45
45
{
46
46
    m_depth = depth;
47
47
    initFilter();
113
113
        }
114
114
 
115
115
        progress = (int) (((double)h * 100.0) / Height);
 
116
 
116
117
        if ( progress%5 == 0 )
 
118
        {
117
119
            postProgress( progress );
 
120
        }
118
121
    }
119
122
}
120
123
 
123
126
int EmbossFilter::Lim_Max (int Now, int Up, int Max)
124
127
{
125
128
    --Max;
 
129
 
126
130
    while (Now > Max - Up)
 
131
    {
127
132
        --Up;
 
133
    }
 
134
 
128
135
    return (Up);
129
136
}
130
137