← Back to branch summary

~ubuntu-branches/ubuntu/trusty/digikam/trusty

« back to all changes in this revision

Viewing changes to libs/dimg/dimgscale.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Luka Renko
  • Date: 2010-02-04 07:46:57 UTC
  • mfrom: (3.2.10 sid)
  • Revision ID: james.westby@ubuntu.com-20100204074657-hqzwjn4timlfw265
Tags: 2:1.1.0-1ubuntu1
https://launchpad.net/bugs/501135
https://launchpad.net/bugs/500581
https://launchpad.net/bugs/350280
https://launchpad.net/bugs/510346
* New upstream release:
  - Rename in BQM fails with multi dot names (LP: #501135)
  - Add collection with similar name fails (LP: #500581)
  - Add SMB folder error message (LP: #350280)
  - Zoom indicators indicate wrong magnification (LP: #510346)
* Merge with Debian, remaining changes:
  - Export .pot name and copy to plugins in debian/rules
  - Build-depend on libkipi7-dev, libkexiv2-8-dev and 
    libkdcraw8-dev (KDE 4.3 -> 4.4)
  - Build-depend on libmarble-dev (was disabled temporarily 
    in Debian due to 4.3.4 regression)

Show diffs side-by-side

added added

removed removed

Lines of Context:
libs/dimg/dimgscale.cpp
69
69
        int      xup_yup;
70
70
    } DImgScaleInfo;
71
71
 
72
 
    uint**   dimgCalcYPoints(uint *src, int sw, int sh, int dh);
 
72
    uint**   dimgCalcYPoints(unsigned int *src, int sw, int sh, int dh);
73
73
    ullong** dimgCalcYPoints16(ullong *src, int sw, int sh, int dh);
74
74
    int*     dimgCalcXPoints(int sw, int dw);
75
75
    int*     dimgCalcApoints(int s, int d, int up);