← Back to branch summary

~smartboyhw/ubuntu/raring/calligra/2.6.0-0ubuntu1

« back to all changes in this revision

Viewing changes to krita/plugins/paintops/libbrush/kis_brush.cpp

  • Committer: Package Import Robot
  • Author(s): Philip Muškovac
  • Date: 2012-10-23 21:09:16 UTC
  • mfrom: (1.1.13)
  • Revision ID: package-import@ubuntu.com-20121023210916-m82w6zxnxhaxz7va
Tags: 1:2.5.90-0ubuntu1
https://launchpad.net/bugs/1070436
https://launchpad.net/bugs/1071686
* New upstream alpha release (LP: #1070436)
  - Add libkactivities-dev and libopenimageio-dev to build-depends
  - Add kubuntu_build_calligraactive.diff to build calligraactive by default
  - Add package for calligraauthor and move files that are shared between
    calligrawords and calligraauthor to calligrawords-common
* Document the patches
* Remove numbers from patches so they follow the same naming scheme as
  the rest of our patches.
* calligra-data breaks replaces krita-data (<< 1:2.5.3) (LP: #1071686)

Show diffs side-by-side

added added

removed removed

Lines of Context:
krita/plugins/paintops/libbrush/kis_brush.cpp
575
575
        dab2->initialize();
576
576
        dabPointer = dab->data();
577
577
        quint8* dabPointer2 = dab2->data();
578
 
        KoColorSpaceRegistry::instance()->rgb8()->convertPixelsTo(dabPointer, dabPointer2, colorSpace, outputWidth * outputHeight);
 
578
        KoColorSpaceRegistry::instance()->rgb8()->convertPixelsTo(dabPointer, dabPointer2, colorSpace, outputWidth * outputHeight, KoColorConversionTransformation::IntentPerceptual, KoColorConversionTransformation::BlackpointCompensation);
579
579
        dab = dab2;
580
580
    }
581
581
    return dab;
598
598
 
599
599
    // Construct a series of brushes where each one's dimensions are
600
600
    // half the size of the previous one.
601
 
    // IMORTANT: and make sure that a brush with a size > MAXIMUM_MIPMAP_SIZE
 
601
    // IMPORTANT: and make sure that a brush with a size > MAXIMUM_MIPMAP_SIZE
602
602
    // will not get scaled up anymore or the memory consumption gets too high
603
603
    // also don't scale the brush up more then MAXIMUM_MIPMAP_SCALE times
604
604
    int scale  = qBound(1, MAXIMUM_MIPMAP_SIZE*2 / qMax(image().width(),image().height()), MAXIMUM_MIPMAP_SCALE);