diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2009-09-29 19:54:22 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2009-09-29 19:54:22 +0000 |
| commit | 8804c121b916be2362738bb3b33b3b23d9aab6c8 (patch) | |
| tree | 32bce397dc16c748b0bb5ae7a3aef080f5dd3183 /media-libs/netpbm/files | |
| parent | gnome-extra/gnome-art removal (pending 2009-09-29), see #245145 for reference (diff) | |
| download | historical-8804c121b916be2362738bb3b33b3b23d9aab6c8.tar.gz historical-8804c121b916be2362738bb3b33b3b23d9aab6c8.tar.bz2 historical-8804c121b916be2362738bb3b33b3b23d9aab6c8.zip | |
Use jpeg patch from upstream which supports jpeg-6+, and go stable so that jpeg-7 stabilization isnt blocked.
Package-Manager: portage-2.2_rc40/cvs/Linux x86_64
Diffstat (limited to 'media-libs/netpbm/files')
| -rw-r--r-- | media-libs/netpbm/files/netpbm-10.26.64-min_DCT_v_scaled_size.patch | 38 | ||||
| -rw-r--r-- | media-libs/netpbm/files/netpbm-10.46.00-min_DCT_v_scaled_size.patch | 38 |
2 files changed, 62 insertions, 14 deletions
diff --git a/media-libs/netpbm/files/netpbm-10.26.64-min_DCT_v_scaled_size.patch b/media-libs/netpbm/files/netpbm-10.26.64-min_DCT_v_scaled_size.patch index 5ba5c555d2f8..c3e629be955b 100644 --- a/media-libs/netpbm/files/netpbm-10.26.64-min_DCT_v_scaled_size.patch +++ b/media-libs/netpbm/files/netpbm-10.26.64-min_DCT_v_scaled_size.patch @@ -1,11 +1,35 @@ -jpeg-7 compability +support for jpeg-7 --- netpbm-10.46.00/converter/ppm/ppmtompeg/jpeg.c -+++ netpbm-10.46.00/converter/ppm/ppmtompeg/jpeg.c -@@ -470,5 +470,5 @@ - buffer_height = 8; /* could be 2, 4,8 rows high */ - #else ++++ netpbm-10.48.00/converter/ppm/ppmtompeg/jpeg.c +@@ -53,6 +53,17 @@ + #define HEADER_SIZE 607 /*JFIF header size used on output images*/ + + ++static int ++minDctVScaledSize(struct jpeg_decompress_struct const cinfo) { ++ ++#if JPEG_LIB_VERSION >= 70 ++ return cinfo.min_DCT_v_scaled_size; ++#else ++ return cinfo.min_DCT_scaled_size; ++#endif ++} ++ ++ + + /*=======================================================================* + * * +@@ -467,11 +474,7 @@ + max_v_samp = (temp_v<v_samp[2]) ? v_samp[2]:temp_v; + + /* Make an 8-row-high sample array that will go away when done with image */ +-#ifdef JPEG4 +- buffer_height = 8; /* could be 2, 4,8 rows high */ +-#else - buffer_height = cinfo.max_v_samp_factor * cinfo.min_DCT_scaled_size; -+ buffer_height = cinfo.max_v_samp_factor * cinfo.min_DCT_v_scaled_size; - #endif +-#endif ++ buffer_height = cinfo.max_v_samp_factor * minDctVScaledSize(cinfo); + for(cp=0,compptr = cinfo.comp_info;cp<cinfo.num_components; + cp++,compptr++) { diff --git a/media-libs/netpbm/files/netpbm-10.46.00-min_DCT_v_scaled_size.patch b/media-libs/netpbm/files/netpbm-10.46.00-min_DCT_v_scaled_size.patch index cff4c83e2c08..89948dceb432 100644 --- a/media-libs/netpbm/files/netpbm-10.46.00-min_DCT_v_scaled_size.patch +++ b/media-libs/netpbm/files/netpbm-10.46.00-min_DCT_v_scaled_size.patch @@ -1,11 +1,35 @@ -jpeg-7 compability +support for jpeg-7 --- netpbm-10.46.00/converter/ppm/ppmtompeg/jpeg.c -+++ netpbm-10.46.00/converter/ppm/ppmtompeg/jpeg.c -@@ -470,5 +470,5 @@ - buffer_height = 8; /* could be 2, 4,8 rows high */ - #else ++++ netpbm-10.48.00/converter/ppm/ppmtompeg/jpeg.c +@@ -53,6 +53,17 @@ + #define HEADER_SIZE 607 /*JFIF header size used on output images*/ + + ++static int ++minDctVScaledSize(struct jpeg_decompress_struct const cinfo) { ++ ++#if JPEG_LIB_VERSION >= 70 ++ return cinfo.min_DCT_v_scaled_size; ++#else ++ return cinfo.min_DCT_scaled_size; ++#endif ++} ++ ++ + + /*=======================================================================* + * * +@@ -467,11 +474,7 @@ + /* Make an 8-row-high sample array that will go away when done + with image + */ +-#ifdef JPEG4 +- buffer_height = 8; /* could be 2, 4,8 rows high */ +-#else - buffer_height = cinfo.max_v_samp_factor * cinfo.min_DCT_scaled_size; -+ buffer_height = cinfo.max_v_samp_factor * cinfo.min_DCT_v_scaled_size; - #endif +-#endif ++ buffer_height = cinfo.max_v_samp_factor * minDctVScaledSize(cinfo); + for(cp=0,compptr = cinfo.comp_info;cp<cinfo.num_components; + cp++,compptr++) { |