rpms/openoffice.org/devel workspace.cmcfixes70.patch,1.1,1.2
Caolan McNamara
caolanm at fedoraproject.org
Thu Jan 14 17:47:29 UTC 2010
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15942
Modified Files:
workspace.cmcfixes70.patch
Log Message:
defuzz
workspace.cmcfixes70.patch:
binfilter/bf_svtools/source/filter.vcl/jpeg/makefile.mk | 4 -
binfilter/bf_svtools/source/filter.vcl/jpeg/svt_jpeg.cxx | 36 ----------
binfilter/bf_svtools/source/filter.vcl/jpeg/svt_jpegc.c | 54 ++++++++++++---
solenv/inc/libs.mk | 2
svtools/source/filter.vcl/jpeg/jpeg.cxx | 36 ----------
svtools/source/filter.vcl/jpeg/jpegc.c | 54 ++++++++++++---
svtools/source/filter.vcl/jpeg/makefile.mk | 4 -
7 files changed, 96 insertions(+), 94 deletions(-)
Index: workspace.cmcfixes70.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.cmcfixes70.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- workspace.cmcfixes70.patch 14 Jan 2010 17:05:47 -0000 1.1
+++ workspace.cmcfixes70.patch 14 Jan 2010 17:47:29 -0000 1.2
@@ -209,144 +209,10 @@ diff -r b9c9dd11b0a1 -r ab0345143841 bin
Exit:
-diff -r b9c9dd11b0a1 -r ab0345143841 jpeg/jpeg-6b.patch
---- a/jpeg/jpeg-6b.patch Thu Jan 07 15:14:24 2010 +0100
-+++ b/jpeg/jpeg-6b.patch Thu Jan 14 13:47:52 2010 +0000
-@@ -18,111 +18,6 @@
- +#undef RIGHT_SHIFT_IS_UNSIGNED
- +#define NO_GETENV
- +#endif
----- misc/jpeg-6b/jdcolor.c 1997-08-04 01:39:16.000000000 +0200
--+++ misc/build/jpeg-6b/jdcolor.c 2009-03-19 11:30:30.000000000 +0100
--@@ -284,6 +284,90 @@
-- }
-- }
--
--+METHODDEF(void)
--+ycck_rgb_convert (j_decompress_ptr cinfo,
--+ JSAMPIMAGE input_buf, JDIMENSION input_row,
--+ JSAMPARRAY output_buf, int num_rows)
--+{
--+ my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert;
--+ JDIMENSION num_cols = cinfo->output_width;
--+ long cc, cm, cy, ck;
--+ long y, cb, cr;
--+ register JSAMPROW outptr;
--+ register JSAMPROW inptr0, inptr1, inptr2, inptr3;
--+ register JDIMENSION col;
--+ register JSAMPLE* range_limit = cinfo->sample_range_limit;
--+ register int* Crrtab = cconvert->Cr_r_tab;
--+ register int* Cbbtab = cconvert->Cb_b_tab;
--+ register INT32* Crgtab = cconvert->Cr_g_tab;
--+ register INT32* Cbgtab = cconvert->Cb_g_tab;
--+ SHIFT_TEMPS
--+
--+ while( --num_rows >= 0 )
--+ {
--+ inptr0 = input_buf[0][input_row];
--+ inptr1 = input_buf[1][input_row];
--+ inptr2 = input_buf[2][input_row];
--+ inptr3 = input_buf[3][input_row++];
--+
--+ for( col = 0, outptr = *output_buf++; col < num_cols; col++ )
--+ {
--+ y = GETJSAMPLE(inptr0[col]);
--+ cb = GETJSAMPLE(inptr1[col]);
--+ cr = GETJSAMPLE(inptr2[col]);
--+
--+ // YCCK => CMYK
--+ cc = 255L - range_limit[MAXJSAMPLE - (y + Crrtab[cr])];
--+ cm = 255L - range_limit[MAXJSAMPLE - (y + ((int) RIGHT_SHIFT(Cbgtab[cb] + Crgtab[cr], SCALEBITS)))];
--+ cy = 255L - range_limit[MAXJSAMPLE - (y + Cbbtab[cb])];
--+ ck = 255L - inptr3[col];
--+
--+ // CMYK => RGB
--+ outptr[ RGB_RED ] = range_limit[ 255L - ( cc + ck ) ];
--+ outptr[ RGB_GREEN ] = range_limit[ 255L - ( cm + ck ) ];
--+ outptr[ RGB_BLUE ] = range_limit[ 255L - ( cy + ck ) ];
--+ outptr += RGB_PIXELSIZE;
--+ }
--+ }
--+}
--+
--+METHODDEF(void)
--+cmyk_rgb_convert (j_decompress_ptr cinfo,
--+ JSAMPIMAGE input_buf, JDIMENSION input_row,
--+ JSAMPARRAY output_buf, int num_rows)
--+{
--+ my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert;
--+ JDIMENSION num_cols = cinfo->output_width;
--+ long cc, cm, cy, ck;
--+ long y, cb, cr;
--+ register JSAMPROW outptr;
--+ register JSAMPROW inptr0, inptr1, inptr2, inptr3;
--+ register JDIMENSION col;
--+ register JSAMPLE* range_limit = cinfo->sample_range_limit;
--+ SHIFT_TEMPS
--+
--+ while( --num_rows >= 0 )
--+ {
--+ inptr0 = input_buf[0][input_row];
--+ inptr1 = input_buf[1][input_row];
--+ inptr2 = input_buf[2][input_row];
--+ inptr3 = input_buf[3][input_row++];
--+
--+ for( col = 0, outptr = *output_buf++; col < num_cols; col++ )
--+ {
--+ cc = 255 - GETJSAMPLE(inptr0[col]);
--+ cm = 255 - GETJSAMPLE(inptr1[col]);
--+ cy = 255 - GETJSAMPLE(inptr2[col]);
--+ ck = 255 - GETJSAMPLE(inptr3[col]);
--+
--+ // CMYK => RGB
--+ outptr[ RGB_RED ] = range_limit[ 255L - ( cc + ck ) ];
--+ outptr[ RGB_GREEN ] = range_limit[ 255L - ( cm + ck ) ];
--+ outptr[ RGB_BLUE ] = range_limit[ 255L - ( cy + ck ) ];
--+ outptr += RGB_PIXELSIZE;
--+ }
--+ }
--+}
--
-- /*
-- * Empty method for start_pass.
--@@ -364,6 +448,11 @@
-- cconvert->pub.color_convert = gray_rgb_convert;
-- } else if (cinfo->jpeg_color_space == JCS_RGB && RGB_PIXELSIZE == 3) {
-- cconvert->pub.color_convert = null_convert;
--+ } else if (cinfo->jpeg_color_space == JCS_YCCK) {
--+ cconvert->pub.color_convert = ycck_rgb_convert;
--+ build_ycc_rgb_table(cinfo);
--+ } else if (cinfo->jpeg_color_space == JCS_CMYK) {
--+ cconvert->pub.color_convert = cmyk_rgb_convert;
-- } else
-- ERREXIT(cinfo, JERR_CONVERSION_NOTIMPL);
-- break;
- --- misc/jpeg-6b/jmorecfg.h 1997-08-10 01:58:56.000000000 +0200
- +++ misc/build/jpeg-6b/jmorecfg.h 2009-03-19 11:30:30.000000000 +0100
- @@ -157,8 +157,8 @@
-@@ -136,18 +31,6 @@
- #endif
-
- /* Datatype used for image dimensions. The JPEG standard only supports
--@@ -311,9 +311,9 @@
-- * can't use color quantization if you change that value.
-- */
--
---#define RGB_RED 0 /* Offset of Red in an RGB scanline element */
--+#define RGB_RED 2 /* Offset of Red in an RGB scanline element */
-- #define RGB_GREEN 1 /* Offset of Green */
---#define RGB_BLUE 2 /* Offset of Blue */
--+#define RGB_BLUE 0 /* Offset of Blue */
-- #define RGB_PIXELSIZE 3 /* JSAMPLEs per RGB scanline element */
--
--
- --- misc/jpeg-6b/makefile.mk 2009-03-19 11:30:46.000000000 +0100
- +++ misc/build/jpeg-6b/makefile.mk 2009-03-19 11:30:30.000000000 +0100
- @@ -1 +1,82 @@
diff -r b9c9dd11b0a1 -r ab0345143841 solenv/inc/libs.mk
--- a/solenv/inc/libs.mk Thu Jan 07 15:14:24 2010 +0100
+++ b/solenv/inc/libs.mk Thu Jan 14 13:47:52 2010 +0000
-@@ -210,7 +210,7 @@
+@@ -209,7 +209,7 @@
#i34482# Blackdown/Sun jdk is in the libsearch patch and has a libjpeg :-(
.IF "$(OS)" == "FREEBSD"
JPEG3RDLIB=/usr/local/lib/libjpeg.so
@@ -563,6 +429,6 @@ diff -r b9c9dd11b0a1 -r ab0345143841 svt
-CFLAGS+=-DSYSTEM_JPEG
-.ENDIF
-
- SOLARINC+=-I../../inc
-
# --- Files --------------------------------------------------------
+
+ SLOFILES= $(SLO)$/jpegc.obj \
More information about the scm-commits
mailing list