← Back to branch summary

~ubuntu-branches/ubuntu/natty/inkscape/natty

« back to all changes in this revision

Viewing changes to src/display/nr-filter-convolve-matrix.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Alex Valavanis
  • Date: 2010-09-12 19:44:58 UTC
  • mfrom: (1.1.12 upstream) (45.1.3 maverick)
  • Revision ID: james.westby@ubuntu.com-20100912194458-4sjwmbl7dlsrk5dc
Tags: 0.48.0-1ubuntu1
https://launchpad.net/bugs/628048
https://launchpad.net/bugs/401567
https://launchpad.net/bugs/456248
https://launchpad.net/bugs/463602
https://launchpad.net/bugs/591986
https://launchpad.net/bugs/513319
* Merge with Debian unstable (LP: #628048, LP: #401567, LP: #456248, 
  LP: #463602, LP: #591986)
* debian/control: 
  - Ubuntu maintainers
  - Promote python-lxml, python-numpy, python-uniconvertor to Recommends.
  - Demote pstoedit to Suggests (universe package).
  - Suggests ttf-dejavu instead of ttf-bitstream-vera (LP: #513319)
* debian/rules:
  - Run intltool-update on build (Ubuntu-specific).
  - Add translation domain to .desktop files (Ubuntu-specific).
* debian/dirs:
  - Add usr/share/pixmaps.  Allow inkscape.xpm installation
* drop 50-poppler-API.dpatch (now upstream)
* drop 51-paste-in-unwritable-directory.dpatch (now upstream) 

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/display/nr-filter-convolve-matrix.cpp
2
2
 * feConvolveMatrix filter primitive renderer
3
3
 *
4
4
 * Authors:
5
 
 *   Felipe Corrêa da Silva Sanches <felipe.sanches@gmail.com>
 
5
 *   Felipe Corrêa da Silva Sanches <juca@members.fsf.org>
6
6
 *   Jasper van de Gronde <th.v.d.gronde@hccnet.nl>
7
7
 *
8
8
 * Copyright (C) 2007,2009 authors
41
41
    unsigned int jEnd   = X_UPPER ? width+targetX-x : orderX;
42
42
 
43
43
    for (unsigned int i=iBegin; i<iEnd; i++){
44
 
        for (int j=jBegin; j<jEnd; j++){
 
44
        for (unsigned int j=jBegin; j<jEnd; j++){
45
45
            unsigned int index = 4*( x - targetX + j + width*(y - targetY + i) );
46
46
            unsigned int kernel_index = orderX-j-1 + orderX*(orderY-i-1);
47
47
            double k = PREMULTIPLIED ? kernel[kernel_index] : in_data[index+3] * kernel[kernel_index];