diff options
Diffstat (limited to 'filters')
-rw-r--r-- | filters/ConfigureChecks.cmake | 8 | ||||
-rw-r--r-- | filters/chalk/gmagick/kis_image_magick_converter.cpp | 24 | ||||
-rw-r--r-- | filters/chalk/magick/kis_image_magick_converter.cpp | 9 | ||||
-rw-r--r-- | filters/karbon/ai/ai88handler.cpp | 4 | ||||
-rw-r--r-- | filters/karbon/ai/aiparserbase.cpp | 4 | ||||
-rw-r--r-- | filters/karbon/ai/aiparserbase.h | 2 | ||||
-rw-r--r-- | filters/kword/pdf/xpdf/xpdf/BuiltinFontTables.cpp | 4 | ||||
-rw-r--r-- | filters/kword/pdf/xpdf/xpdf/FontEncodingTables.cpp | 4 | ||||
-rw-r--r-- | filters/kword/pdf/xpdf/xpdf/NameToUnicodeTable.h | 4 |
9 files changed, 33 insertions, 30 deletions
diff --git a/filters/ConfigureChecks.cmake b/filters/ConfigureChecks.cmake new file mode 100644 index 000000000..db6263cbd --- /dev/null +++ b/filters/ConfigureChecks.cmake @@ -0,0 +1,8 @@ +############################################################################### +# Trinity KOffice # +# --------------- # +# This file is licensed under the terms of GNU GPL v3 or later. # +# Improvements and feedback are welcome. # +############################################################################### + +# kate: indent-width 2; replace-tabs true;
\ No newline at end of file diff --git a/filters/chalk/gmagick/kis_image_magick_converter.cpp b/filters/chalk/gmagick/kis_image_magick_converter.cpp index 01e1ee141..5c9d8dc36 100644 --- a/filters/chalk/gmagick/kis_image_magick_converter.cpp +++ b/filters/chalk/gmagick/kis_image_magick_converter.cpp @@ -121,14 +121,14 @@ namespace { KisProfile * getProfileForProfileInfo(const Image * image) { size_t length; - + const unsigned char * profiledata = GetImageProfile(image, "ICM", &length); if( profiledata == NULL ) return 0; TQByteArray rawdata; rawdata.resize(length); memcpy(rawdata.data(), profiledata, length); - + KisProfile* p = new KisProfile(rawdata); return p; @@ -169,14 +169,14 @@ namespace { void setAnnotationsForImage(const Image * src, KisImageSP image) { size_t length; - + const unsigned char * profiledata = GetImageProfile(src, "IPTC", &length); if( profiledata != NULL ) { TQByteArray rawdata; rawdata.resize(length); memcpy(rawdata.data(), profiledata, length); - + KisAnnotation* annotation = new KisAnnotation(TQString("IPTC"), "", rawdata); TQ_CHECK_PTR(annotation); @@ -189,14 +189,14 @@ namespace { TQByteArray rawdata; rawdata.resize(length); memcpy(rawdata.data(), src->generic_profile[i].info, src->generic_profile[i].length); - + KisAnnotation* annotation = new KisAnnotation(TQString(src->generic_profile[i].name), "", rawdata); TQ_CHECK_PTR(annotation); image -> addAnnotation(annotation); } #endif - + const ImageAttribute* imgAttr = GetImageAttribute(src, NULL); while(imgAttr) { @@ -204,7 +204,7 @@ namespace { int len = strlen(imgAttr -> value) + 1; rawdata.resize(len); memcpy(rawdata.data(), imgAttr -> value, len); - + KisAnnotation* annotation = new KisAnnotation( TQString("chalk_attribute:%1").arg(TQString(imgAttr -> key)), "", rawdata ); TQ_CHECK_PTR(annotation); @@ -310,7 +310,6 @@ namespace { if (!init) { TDEApplication *app = tdeApp; - InitializeMagick(*app -> argv()); atexit(DestroyMagick); init = true; @@ -331,7 +330,6 @@ namespace { MagickBooleanType monitor(const char *text, const ExtendedSignedIntegralType, const ExtendedUnsignedIntegralType, ExceptionInfo *) { TDEApplication *app = tdeApp; - Q_ASSERT(app); if (app -> hasPendingEvents()) @@ -408,7 +406,7 @@ KisImageBuilder_Result KisImageMagickConverter::decode(const KURL& uri, bool isB kdDebug(41008) << "Exceptions happen when loading" << endl; return KisImageBuilder_RESULT_FAILURE; } - + if (images == 0) { DestroyImageInfo(ii); @@ -447,7 +445,7 @@ KisImageBuilder_Result KisImageMagickConverter::decode(const KURL& uri, bool isB } kdDebug(41008) << "image has " << csName << " colorspace\n"; - + KisProfile * profile = getProfileForProfileInfo(image); if (profile) { @@ -472,7 +470,7 @@ KisImageBuilder_Result KisImageMagickConverter::decode(const KURL& uri, bool isB m_img = new KisImage(m_doc->undoAdapter(), image -> columns, image -> rows, cs, "built image"); TQ_CHECK_PTR(m_img); m_img->blockSignals(true); // Don't send out signals while we're building the image - + // XXX I'm assuming seperate layers won't have other profile things like EXIF setAnnotationsForImage(image, m_img); } @@ -562,7 +560,7 @@ KisImageBuilder_Result KisImageMagickConverter::decode(const KURL& uri, bool isB while(! hiter.isDone()) { TQ_UINT16 *ptr = reinterpret_cast<TQ_UINT16 *>(hiter.rawData()); - + *(ptr++) = ScaleQuantumToShort(pp->red); *(ptr++) = ScaleQuantumToShort(pp->green); *(ptr++) = ScaleQuantumToShort(pp->blue); diff --git a/filters/chalk/magick/kis_image_magick_converter.cpp b/filters/chalk/magick/kis_image_magick_converter.cpp index 5ea939e44..0c79e1f5f 100644 --- a/filters/chalk/magick/kis_image_magick_converter.cpp +++ b/filters/chalk/magick/kis_image_magick_converter.cpp @@ -258,7 +258,6 @@ namespace { if (!init) { TDEApplication *app = tdeApp; - InitializeMagick(*app -> argv()); atexit(DestroyMagick); init = true; @@ -279,7 +278,6 @@ namespace { MagickBooleanType monitor(const char *text, const ExtendedSignedIntegralType, const ExtendedUnsignedIntegralType, ExceptionInfo *) { TDEApplication *app = tdeApp; - Q_ASSERT(app); if (app -> hasPendingEvents()) @@ -292,7 +290,6 @@ namespace { unsigned int monitor(const char *text, const ExtendedSignedIntegralType, const ExtendedUnsignedIntegralType, ExceptionInfo *) { TDEApplication *app = tdeApp; - Q_ASSERT(app); if (app -> hasPendingEvents()) @@ -389,7 +386,7 @@ KisImageBuilder_Result KisImageMagickConverter::decode(const KURL& uri, bool isB } kdDebug(41008) << "image has " << csName << " colorspace\n"; - + KisProfile * profile = getProfileForProfileInfo(image); if (profile) { @@ -414,7 +411,7 @@ KisImageBuilder_Result KisImageMagickConverter::decode(const KURL& uri, bool isB m_img = new KisImage(m_doc->undoAdapter(), image -> columns, image -> rows, cs, "built image"); TQ_CHECK_PTR(m_img); m_img->blockSignals(true); // Don't send out signals while we're building the image - + // XXX I'm assuming seperate layers won't have other profile things like EXIF setAnnotationsForImage(image, m_img); } @@ -504,7 +501,7 @@ KisImageBuilder_Result KisImageMagickConverter::decode(const KURL& uri, bool isB while(! hiter.isDone()) { TQ_UINT16 *ptr = reinterpret_cast<TQ_UINT16 *>(hiter.rawData()); - + *(ptr++) = ScaleQuantumToShort(pp->red); *(ptr++) = ScaleQuantumToShort(pp->green); *(ptr++) = ScaleQuantumToShort(pp->blue); diff --git a/filters/karbon/ai/ai88handler.cpp b/filters/karbon/ai/ai88handler.cpp index 87a937ae9..acc2ff679 100644 --- a/filters/karbon/ai/ai88handler.cpp +++ b/filters/karbon/ai/ai88handler.cpp @@ -1,5 +1,5 @@ /* This file is part of the KDE project - Copyright (C) 2002, Dirk Schönberger <dirk.schoenberger@sz-online.de> + Copyright (C) 2002, Dirk Sch�nberger <dirk.schoenberger@sz-online.de> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public @@ -281,7 +281,7 @@ bool AI88Handler::handleAIOperation (AIOperation op) { _handleTextBlock (TO_Fill); return true; break; - case AIO_TextBlockAppend : + case AIO_TextBloctdeAppend : _handleTextBlock (TO_Append); return true; break; diff --git a/filters/karbon/ai/aiparserbase.cpp b/filters/karbon/ai/aiparserbase.cpp index 24f9920e7..bb28d1cf7 100644 --- a/filters/karbon/ai/aiparserbase.cpp +++ b/filters/karbon/ai/aiparserbase.cpp @@ -87,7 +87,7 @@ static AIOperationMapping aiMappings[] = { { "z", AIO_SetCurrentText }, { "a", AIO_TextBlockFillStroke }, { "e", AIO_TextBlockFill }, - { "I", AIO_TextBlockAppend }, + { "I", AIO_TextBloctdeAppend }, { "o", AIO_TextBlockIgnore }, { "r", AIO_TextBlockStroke }, { "t", AIO_TextOutput }, @@ -1303,7 +1303,7 @@ const void aiotoa (AIOperation &data) case AIO_SetCurrentText : tqDebug ("AIO_SetCurrentText"); break; case AIO_TextBlockFillStroke : tqDebug ("AIO_TextBlockFillStroke"); break; case AIO_TextBlockFill : tqDebug ("AIO_TextBlockFill"); break; - case AIO_TextBlockAppend : tqDebug ("AIO_TextBlockAppend"); break; + case AIO_TextBloctdeAppend : tqDebug ("AIO_TextBloctdeAppend"); break; case AIO_TextBlockIgnore : tqDebug ("AIO_TextBlockIgnore"); break; case AIO_TextBlockStroke : tqDebug ("AIO_TextBlockStroke"); break; case AIO_TextOutput : tqDebug ("AIO_TextOutput"); break; diff --git a/filters/karbon/ai/aiparserbase.h b/filters/karbon/ai/aiparserbase.h index 14c00a14e..6f95e501c 100644 --- a/filters/karbon/ai/aiparserbase.h +++ b/filters/karbon/ai/aiparserbase.h @@ -100,7 +100,7 @@ typedef enum { AIO_SetCurrentText, AIO_TextBlockFillStroke, AIO_TextBlockFill, - AIO_TextBlockAppend, + AIO_TextBloctdeAppend, AIO_TextBlockIgnore, AIO_TextBlockStroke, AIO_TextOutput, diff --git a/filters/kword/pdf/xpdf/xpdf/BuiltinFontTables.cpp b/filters/kword/pdf/xpdf/xpdf/BuiltinFontTables.cpp index 3120d0852..18a771b07 100644 --- a/filters/kword/pdf/xpdf/xpdf/BuiltinFontTables.cpp +++ b/filters/kword/pdf/xpdf/xpdf/BuiltinFontTables.cpp @@ -2157,7 +2157,7 @@ static BuiltinFontWidth symbolWidthsTab[] = { { "Xi", 645, NULL }, { "theta1", 631, NULL }, { "logicalnot", 713, NULL }, - { "Kappa", 722, NULL }, + { "tdeAppa", 722, NULL }, { "similar", 549, NULL }, { "bar", 200, NULL }, { "fraction", 167, NULL }, @@ -2173,7 +2173,7 @@ static BuiltinFontWidth symbolWidthsTab[] = { { "arrowright", 987, NULL }, { "greater", 549, NULL }, { "bracketlefttp", 384, NULL }, - { "kappa", 549, NULL }, + { "tdeAppa", 549, NULL }, { "gradient", 713, NULL }, { "integral", 274, NULL }, { "arrowboth", 1042, NULL }, diff --git a/filters/kword/pdf/xpdf/xpdf/FontEncodingTables.cpp b/filters/kword/pdf/xpdf/xpdf/FontEncodingTables.cpp index 83774bf87..fa498254a 100644 --- a/filters/kword/pdf/xpdf/xpdf/FontEncodingTables.cpp +++ b/filters/kword/pdf/xpdf/xpdf/FontEncodingTables.cpp @@ -1381,7 +1381,7 @@ const char *symbolEncoding[256] = { "Eta", "Iota", "theta1", - "Kappa", + "tdeAppa", "Lambda", "Mu", "Nu", @@ -1413,7 +1413,7 @@ const char *symbolEncoding[256] = { "eta", "iota", "phi1", - "kappa", + "tdeAppa", "lambda", "mu", "nu", diff --git a/filters/kword/pdf/xpdf/xpdf/NameToUnicodeTable.h b/filters/kword/pdf/xpdf/xpdf/NameToUnicodeTable.h index c32289a4f..80053444a 100644 --- a/filters/kword/pdf/xpdf/xpdf/NameToUnicodeTable.h +++ b/filters/kword/pdf/xpdf/xpdf/NameToUnicodeTable.h @@ -162,7 +162,7 @@ static struct { {0x0134, "Jcircumflex"}, {0x004a, "Jsmall"}, {0x004b, "K"}, - {0x039a, "Kappa"}, + {0x039a, "tdeAppa"}, {0x0136, "Kcommaaccent"}, {0x004b, "Ksmall"}, {0x004c, "L"}, @@ -831,7 +831,7 @@ static struct { {0x006a, "j"}, {0x0135, "jcircumflex"}, {0x006b, "k"}, - {0x03ba, "kappa"}, + {0x03ba, "tdeAppa"}, {0x0137, "kcommaaccent"}, {0x0138, "kgreenlandic"}, {0x006c, "l"}, |