rev 3388 - in trunk/packages/koffice/debian: . patches

[Isaac Clerencia]

Author: isaac
Date: 2006-03-29 09:32:26 +0000 (Wed, 29 Mar 2006)
New Revision: 3388

Added:
   trunk/packages/koffice/debian/patches/29_krita_tiff_fix_final.diff
Modified:
   trunk/packages/koffice/debian/krita-data.install
   trunk/packages/koffice/debian/krita.install
Log:
Cubism filter has been disabled
Apply patch to fix enable-final problem in krita


Modified: trunk/packages/koffice/debian/krita-data.install
===================================================================
--- trunk/packages/koffice/debian/krita-data.install	2006-03-29 03:54:05 UTC (rev 3387)
+++ trunk/packages/koffice/debian/krita-data.install	2006-03-29 09:32:26 UTC (rev 3388)
@@ -229,7 +229,6 @@
 debian/tmp/usr/share/services/kritacolorsfilter.desktop
 debian/tmp/usr/share/services/kritacolorspaceconversion.desktop
 debian/tmp/usr/share/services/kritaconvolutionfilters.desktop
-debian/tmp/usr/share/services/kritacubismfilter.desktop
 debian/tmp/usr/share/services/kritadefaultpaintops.desktop
 debian/tmp/usr/share/services/kritadefaulttools.desktop
 debian/tmp/usr/share/services/kritadropshadow.desktop

Modified: trunk/packages/koffice/debian/krita.install
===================================================================
--- trunk/packages/koffice/debian/krita.install	2006-03-29 03:54:05 UTC (rev 3387)
+++ trunk/packages/koffice/debian/krita.install	2006-03-29 09:32:26 UTC (rev 3388)
@@ -32,8 +32,6 @@
 debian/tmp/usr/lib/kde3/kritaconvolutionfilters.la
 debian/tmp/usr/lib/kde3/kritaconvolutionfilters.so
 debian/tmp/usr/lib/kde3/kritaconvolutionfilters.so
-debian/tmp/usr/lib/kde3/kritacubismfilter.la
-debian/tmp/usr/lib/kde3/kritacubismfilter.so
 debian/tmp/usr/lib/kde3/kritadefaultpaintops.la
 debian/tmp/usr/lib/kde3/kritadefaultpaintops.so
 debian/tmp/usr/lib/kde3/kritadefaulttools.la

Added: trunk/packages/koffice/debian/patches/29_krita_tiff_fix_final.diff
===================================================================
--- trunk/packages/koffice/debian/patches/29_krita_tiff_fix_final.diff	2006-03-29 03:54:05 UTC (rev 3387)
+++ trunk/packages/koffice/debian/patches/29_krita_tiff_fix_final.diff	2006-03-29 09:32:26 UTC (rev 3388)
@@ -0,0 +1,83 @@
+Index: filters/krita/tiff/kis_ycbcr_u8_colorspace.cpp
+===================================================================
+--- filters/krita/tiff/kis_ycbcr_u8_colorspace.cpp	(revision 523114)
++++ filters/krita/tiff/kis_ycbcr_u8_colorspace.cpp	(revision 523115)
+@@ -26,8 +26,8 @@
+ #include <kis_integer_maths.h>
+ 
+ namespace {
+-    const Q_INT32 MAX_CHANNEL_YCbCr = 3;
+-    const Q_INT32 MAX_CHANNEL_YCbCrA = 4;
++    const Q_INT32 MAX_CHANNEL_YCbCr_U8 = 3;
++    const Q_INT32 MAX_CHANNEL_YCbCrA_U8 = 4;
+ }
+ 
+ KisYCbCrU8ColorSpace::KisYCbCrU8ColorSpace(KisColorSpaceFactoryRegistry* parent, KisProfile* p)
+@@ -169,15 +169,15 @@
+ }
+ 
+ Q_UINT32 KisYCbCrU8ColorSpace::nChannels() const {
+-    return MAX_CHANNEL_YCbCrA;
++    return MAX_CHANNEL_YCbCrA_U8;
+ }
+ 
+ Q_UINT32 KisYCbCrU8ColorSpace::nColorChannels() const {
+-    return MAX_CHANNEL_YCbCr;
++    return MAX_CHANNEL_YCbCr_U8;
+ }
+ 
+ Q_UINT32 KisYCbCrU8ColorSpace::pixelSize() const {
+-    return MAX_CHANNEL_YCbCrA*sizeof(Q_UINT8);
++    return MAX_CHANNEL_YCbCrA_U8*sizeof(Q_UINT8);
+ }
+ 
+ 
+@@ -192,7 +192,7 @@
+     Q_INT32 i = 0;
+     uchar *j = img.bits();
+ 
+-    while ( i < width * height * MAX_CHANNEL_YCbCrA) {
++    while ( i < width * height * MAX_CHANNEL_YCbCrA_U8) {
+         Q_UINT8 Y = *( data + i + PIXEL_Y );
+         Q_UINT8 Cb = *( data + i + PIXEL_Cb );
+         Q_UINT8 Cr = *( data + i + PIXEL_Cr );
+@@ -210,8 +210,8 @@
+         *( j + 1 ) = Cb;
+         *( j + 0 ) = Cr;*/
+ #endif
+-        i += MAX_CHANNEL_YCbCrA;
+-        j += MAX_CHANNEL_YCbCrA;
++        i += MAX_CHANNEL_YCbCrA_U8;
++        j += MAX_CHANNEL_YCbCrA_U8;
+     }
+     return img;
+ }
+@@ -265,7 +265,7 @@
+                 }
+ 
+                 if (srcAlpha == OPACITY_OPAQUE) {
+-                    memcpy(dst, src, MAX_CHANNEL_YCbCrA * sizeof(Q_UINT8));
++                    memcpy(dst, src, MAX_CHANNEL_YCbCrA_U8 * sizeof(Q_UINT8));
+                 } else {
+                     Q_UINT8 dstAlpha = dst[PIXEL_ALPHA];
+ 
+@@ -285,7 +285,7 @@
+                     }
+ 
+                     if (srcBlend == OPACITY_OPAQUE) {
+-                        memcpy(dst, src, MAX_CHANNEL_YCbCr * sizeof(Q_UINT8));
++                        memcpy(dst, src, MAX_CHANNEL_YCbCr_U8 * sizeof(Q_UINT8));
+                     } else {
+                         dst[PIXEL_Y] = UINT8_BLEND(src[PIXEL_Y], dst[PIXEL_Y], srcBlend);
+                         dst[PIXEL_Cb] = UINT8_BLEND(src[PIXEL_Cb], dst[PIXEL_Cb], srcBlend);
+@@ -295,8 +295,8 @@
+             }
+ 
+             columns--;
+-            src += MAX_CHANNEL_YCbCrA;
+-            dst += MAX_CHANNEL_YCbCrA;
++            src += MAX_CHANNEL_YCbCrA_U8;
++            dst += MAX_CHANNEL_YCbCrA_U8;
+         }
+ 
+         rows--;