← Back to branch summary

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

« back to all changes in this revision

Viewing changes to libs/dimg/filters/transform/contentawarefilter.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Alessandro Ghersi
  • Date: 2010-06-18 21:58:46 UTC
  • mfrom: (1.2.29 upstream) (3.2.13 sid)
  • Revision ID: james.westby@ubuntu.com-20100618215846-c95bk5aoysmu786d
Tags: 2:1.3.0-0ubuntu1
* Merge with Debian unstable, remaining changes:
  - Export .pot name and copy to plugins in debian/rules
  - Enable Nepomuk support in Digikam
    - Add shared-desktop-ontologies to build depends
* New upstream release:
  - Remove digikam-1.2.0-kde232628.patch fixed by upstream
  - Add mysql-server-5.1 to buil-depends

Show diffs side-by-side

added added

removed removed

Lines of Context:
libs/dimg/filters/transform/contentawarefilter.cpp
159
159
    // Liquid rescale
160
160
    lqr_carver_resize(d->carver, d->settings.width, d->settings.height);
161
161
    
162
 
    if (m_cancel) return;
 
162
    if (!runningFlag()) return;
163
163
 
164
164
    // Create a new image
165
165
    w           = lqr_carver_get_width(d->carver);
175
175
 
176
176
    if (m_orgImage.sixteenBit())
177
177
    {
178
 
        while(!m_cancel && lqr_carver_scan_ext(d->carver, (gint*)&x, (gint*)&y, &rgb))
 
178
        while(runningFlag() && lqr_carver_scan_ext(d->carver, (gint*)&x, (gint*)&y, &rgb))
179
179
        {
180
180
            rgbOut16 = (unsigned short*)rgb;
181
181
            m_destImage.setPixelColor(x, y, DColor(rgbOut16[2], rgbOut16[1], rgbOut16[0], 65535, true));
183
183
    }
184
184
    else
185
185
    {
186
 
        while(!m_cancel && lqr_carver_scan_ext(d->carver, (gint*)&x, (gint*)&y, &rgb))
 
186
        while(runningFlag() && lqr_carver_scan_ext(d->carver, (gint*)&x, (gint*)&y, &rgb))
187
187
        {
188
188
            rgbOut8 = (uchar*)rgb;
189
189
            m_destImage.setPixelColor(x, y, DColor(rgbOut8[2], rgbOut8[1], rgbOut8[0], 255, false));