TDE
/
koffice
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/koffice
0
0
Fork 0
Code Issues Releases Wiki Activity

Fix chalk graphicsmagick filter FTBFS

Browse Source 
This closes Bug 353
pull/1/head
Timothy Pearson 14 years ago
parent c91e96258b
commit c1904c6066
1 changed files with 28 additions and 26 deletions
Show Stats Download Patch File Download Diff File

54
filters/chalk/gmagick/kis_image_magick_converter.cc
Unescape Escape View File

@ -182,6 +182,8 @@ namespace {
image -> addAnnotation(annotation); image -> addAnnotation(annotation);
} }
/* This code is no longer needed or supported by graphicsmagick */
#if 0
for(int i = 0; i < src->generic_profiles; i++) for(int i = 0; i < src->generic_profiles; i++)
{ {
TQByteArray rawdata; TQByteArray rawdata;
@ -193,6 +195,7 @@ namespace {
image -> addAnnotation(annotation); image -> addAnnotation(annotation);
} }
#endif
const ImageAttribute* imgAttr = GetImageAttribute(src, NULL); const ImageAttribute* imgAttr = GetImageAttribute(src, NULL);
while(imgAttr) while(imgAttr)
@ -480,7 +483,7 @@ KisImageBuilder_Result KisImageMagickConverter::decode(const KURL& uri, bool isB
TQ_UINT8 opacity = OPACITY_OPAQUE; TQ_UINT8 opacity = OPACITY_OPAQUE;
const ImageAttribute * attr = GetImageAttribute(image, "[layer-opacity]"); const ImageAttribute * attr = GetImageAttribute(image, "[layer-opacity]");
if (attr != 0) { if (attr != 0) {
opacity = TQ_UINT8_MAX - Downscale(TQString(attr->value).toInt()); opacity = TQ_UINT8_MAX - ScaleQuantumToChar(TQString(attr->value).toInt());
} }
KisPaintLayerSP layer = 0; KisPaintLayerSP layer = 0;
@ -534,17 +537,17 @@ KisImageBuilder_Result KisImageMagickConverter::decode(const KURL& uri, bool isB
while (!hiter.isDone()) while (!hiter.isDone())
{ {
TQ_UINT8 *ptr= hiter.rawData(); TQ_UINT8 *ptr= hiter.rawData();
*(ptr++) = Downscale(pp->red); // cyan *(ptr++) = ScaleQuantumToChar(pp->red); // cyan
*(ptr++) = Downscale(pp->green); // magenta *(ptr++) = ScaleQuantumToChar(pp->green); // magenta
*(ptr++) = Downscale(pp->blue); // yellow *(ptr++) = ScaleQuantumToChar(pp->blue); // yellow
*(ptr++) = Downscale(indexes[x]); // Black *(ptr++) = ScaleQuantumToChar(indexes[x]); // Black
// XXX: Warning! This ifdef messes up the paren matching big-time! // XXX: Warning! This ifdef messes up the paren matching big-time!
#ifdef HAVE_MAGICK6 #ifdef HAVE_MAGICK6
if (image->matte != MagickFalse) { if (image->matte != MagickFalse) {
#else #else
if (image->matte == true) { if (image->matte == true) {
#endif #endif
*(ptr++) = OPACITY_OPAQUE - Downscale(pp->opacity); *(ptr++) = OPACITY_OPAQUE - ScaleQuantumToChar(pp->opacity);
} }
else { else {
*(ptr++) = OPACITY_OPAQUE; *(ptr++) = OPACITY_OPAQUE;
@ -578,10 +581,10 @@ KisImageBuilder_Result KisImageMagickConverter::decode(const KURL& uri, bool isB
{ {
TQ_UINT8 *ptr= hiter.rawData(); TQ_UINT8 *ptr= hiter.rawData();
// XXX: not colorstrategy and bitdepth independent // XXX: not colorstrategy and bitdepth independent
*(ptr++) = Downscale(pp->blue); *(ptr++) = ScaleQuantumToChar(pp->blue);
*(ptr++) = Downscale(pp->green); *(ptr++) = ScaleQuantumToChar(pp->green);
*(ptr++) = Downscale(pp->red); *(ptr++) = ScaleQuantumToChar(pp->red);
*(ptr++) = OPACITY_OPAQUE - Downscale(pp->opacity); *(ptr++) = OPACITY_OPAQUE - ScaleQuantumToChar(pp->opacity);
pp++; pp++;
++hiter; ++hiter;
@ -608,8 +611,8 @@ KisImageBuilder_Result KisImageMagickConverter::decode(const KURL& uri, bool isB
{ {
TQ_UINT8 *ptr= hiter.rawData(); TQ_UINT8 *ptr= hiter.rawData();
// XXX: not colorstrategy and bitdepth independent // XXX: not colorstrategy and bitdepth independent
*(ptr++) = Downscale(pp->blue); *(ptr++) = ScaleQuantumToChar(pp->blue);
*(ptr++) = OPACITY_OPAQUE - Downscale(pp->opacity); *(ptr++) = OPACITY_OPAQUE - ScaleQuantumToChar(pp->opacity);
pp++; pp++;
++hiter; ++hiter;
@ -812,13 +815,12 @@ KisImageBuilder_Result KisImageMagickConverter::decode(const KURL& uri, bool isB
while (!it.isDone()) { while (!it.isDone()) {
TQ_UINT8 * d = it.rawData(); TQ_UINT8 * d = it.rawData();
pp -> red = Upscale(d[PIXEL_CYAN]); pp -> red = ScaleCharToQuantum(d[PIXEL_CYAN]);
pp -> green = Upscale(d[PIXEL_MAGENTA]); pp -> green = ScaleCharToQuantum(d[PIXEL_MAGENTA]);
pp -> blue = Upscale(d[PIXEL_YELLOW]); pp -> blue = ScaleCharToQuantum(d[PIXEL_YELLOW]);
if (alpha) if (alpha)
pp -> opacity = Upscale(OPACITY_OPAQUE - d[PIXEL_CMYK_ALPHA]); pp -> opacity = ScaleCharToQuantum(OPACITY_OPAQUE - d[PIXEL_CMYK_ALPHA]);
indexes[x]= ScaleCharToQuantum(d[PIXEL_BLACK]);
indexes[x]= Upscale(d[PIXEL_BLACK]);
x++; x++;
pp++; pp++;
@ -848,11 +850,11 @@ KisImageBuilder_Result KisImageMagickConverter::decode(const KURL& uri, bool isB
while (!it.isDone()) { while (!it.isDone()) {
TQ_UINT8 * d = it.rawData(); TQ_UINT8 * d = it.rawData();
pp -> red = Upscale(d[PIXEL_RED]); pp -> red = ScaleCharToQuantum(d[PIXEL_RED]);
pp -> green = Upscale(d[PIXEL_GREEN]); pp -> green = ScaleCharToQuantum(d[PIXEL_GREEN]);
pp -> blue = Upscale(d[PIXEL_BLUE]); pp -> blue = ScaleCharToQuantum(d[PIXEL_BLUE]);
if (alpha) if (alpha)
pp -> opacity = Upscale(OPACITY_OPAQUE - d[PIXEL_ALPHA]); pp -> opacity = ScaleCharToQuantum(OPACITY_OPAQUE - d[PIXEL_ALPHA]);
pp++; pp++;
++it; ++it;
@ -879,11 +881,11 @@ KisImageBuilder_Result KisImageMagickConverter::decode(const KURL& uri, bool isB
else { else {
while (!it.isDone()) { while (!it.isDone()) {
TQ_UINT8 * d = it.rawData(); TQ_UINT8 * d = it.rawData();
pp -> red = Upscale(d[PIXEL_GRAY]); pp -> red = ScaleCharToQuantum(d[PIXEL_GRAY]);
pp -> green = Upscale(d[PIXEL_GRAY]); pp -> green = ScaleCharToQuantum(d[PIXEL_GRAY]);
pp -> blue = Upscale(d[PIXEL_GRAY]); pp -> blue = ScaleCharToQuantum(d[PIXEL_GRAY]);
if (alpha) if (alpha)
pp -> opacity = Upscale(OPACITY_OPAQUE - d[PIXEL_GRAY_ALPHA]); pp -> opacity = ScaleCharToQuantum(OPACITY_OPAQUE - d[PIXEL_GRAY_ALPHA]);
pp++; pp++;
++it; ++it;

Write Preview
Loading…
Cancel
Save