← Back to branch summary

~ubuntu-branches/ubuntu/precise/koffice/precise

« back to all changes in this revision

Viewing changes to libs/pigment/KoCompositeOp.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Jonathan Riddell
  • Date: 2010-09-21 15:36:35 UTC
  • mfrom: (1.4.1 upstream) (60.2.11 maverick)
  • Revision ID: james.westby@ubuntu.com-20100921153635-6tejqkiro2u21ydi
Tags: 1:2.2.2-0ubuntu3
Add kubuntu_03_fix-crash-on-closing-sqlite-connection-2.2.2.diff and
kubuntu_04_support-large-memo-values-for-msaccess-2.2.2.diff as
recommended by upstream http://kexi-
project.org/wiki/wikiview/index.php@Kexi2.2_Patches.html#sqlite_stab
ility

Show diffs side-by-side

added added

removed removed

Lines of Context:
libs/pigment/KoCompositeOp.cpp
22
22
#include "KoCompositeOp.h"
23
23
#include "KoColorSpace.h"
24
24
 
25
 
QString KoCompositeOp::categoryMix() {
 
25
QString KoCompositeOp::categoryMix()
 
26
{
26
27
    return i18n("Mix");
27
28
}
28
 
QString KoCompositeOp::categoryLight() {
 
29
QString KoCompositeOp::categoryLight()
 
30
{
29
31
    return i18n("Light");
30
32
}
31
 
QString KoCompositeOp::categoryArithmetic() {
 
33
QString KoCompositeOp::categoryArithmetic()
 
34
{
32
35
    return i18n("Arithmetic");
33
36
}
34
 
QString KoCompositeOp::categoryColor() {
 
37
QString KoCompositeOp::categoryColor()
 
38
{
35
39
    return i18n("Color");
36
40
}
37
 
QString KoCompositeOp::categoryMisc() {
 
41
QString KoCompositeOp::categoryMisc()
 
42
{
38
43
    return i18n("Misc");
39
44
}
40
45
 
58
63
}
59
64
 
60
65
KoCompositeOp::KoCompositeOp(const KoColorSpace * cs, const QString& id,  const QString& description, const QString & category, const bool userVisible)
61
 
    : d(new Private)
 
66
        : d(new Private)
62
67
{
63
68
    d->colorSpace = cs;
64
69
    d->id = id;
65
70
    d->description = description;
66
71
    d->userVisible = userVisible;
67
72
    d->category = category;
68
 
    if(d->category.isEmpty())
69
 
    {
 
73
    if (d->category.isEmpty()) {
70
74
        d->category = categoryMisc();
71
75
    }
72
76
}
77
81
                              qint32 rows, qint32 numColumns,
78
82
                              quint8 opacity) const
79
83
{
80
 
    composite( dstRowStart, dstRowStride,
81
 
               srcRowStart, srcRowStride,
82
 
               maskRowStart, maskRowStride,
83
 
               rows, numColumns,
84
 
               opacity, d->defaultChannelFlags);
 
84
    composite(dstRowStart, dstRowStride,
 
85
              srcRowStart, srcRowStride,
 
86
              maskRowStart, maskRowStride,
 
87
              rows, numColumns,
 
88
              opacity, d->defaultChannelFlags);
85
89
}
86
90
 
87
91
QString KoCompositeOp::category() const