| 1 |
vapier 09/09/29 19:54:22 |
| 2 |
|
| 3 |
Modified: netpbm-10.46.00-min_DCT_v_scaled_size.patch |
| 4 |
netpbm-10.26.64-min_DCT_v_scaled_size.patch |
| 5 |
Log: |
| 6 |
Use jpeg patch from upstream which supports jpeg-6+, and go stable so that jpeg-7 stabilization isnt blocked. |
| 7 |
(Portage version: 2.2_rc40/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.3 media-libs/netpbm/files/netpbm-10.46.00-min_DCT_v_scaled_size.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/netpbm/files/netpbm-10.46.00-min_DCT_v_scaled_size.patch?rev=1.3&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/netpbm/files/netpbm-10.46.00-min_DCT_v_scaled_size.patch?rev=1.3&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/netpbm/files/netpbm-10.46.00-min_DCT_v_scaled_size.patch?r1=1.2&r2=1.3 |
| 15 |
|
| 16 |
Index: netpbm-10.46.00-min_DCT_v_scaled_size.patch |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/netpbm/files/netpbm-10.46.00-min_DCT_v_scaled_size.patch,v |
| 19 |
retrieving revision 1.2 |
| 20 |
retrieving revision 1.3 |
| 21 |
diff -u -r1.2 -r1.3 |
| 22 |
--- netpbm-10.46.00-min_DCT_v_scaled_size.patch 29 Sep 2009 19:32:35 -0000 1.2 |
| 23 |
+++ netpbm-10.46.00-min_DCT_v_scaled_size.patch 29 Sep 2009 19:54:22 -0000 1.3 |
| 24 |
@@ -1,11 +1,35 @@ |
| 25 |
-jpeg-7 compability |
| 26 |
+support for jpeg-7 |
| 27 |
|
| 28 |
--- netpbm-10.46.00/converter/ppm/ppmtompeg/jpeg.c |
| 29 |
-+++ netpbm-10.46.00/converter/ppm/ppmtompeg/jpeg.c |
| 30 |
-@@ -470,5 +470,5 @@ |
| 31 |
- buffer_height = 8; /* could be 2, 4,8 rows high */ |
| 32 |
- #else |
| 33 |
++++ netpbm-10.48.00/converter/ppm/ppmtompeg/jpeg.c |
| 34 |
+@@ -53,6 +53,17 @@ |
| 35 |
+ #define HEADER_SIZE 607 /*JFIF header size used on output images*/ |
| 36 |
+ |
| 37 |
+ |
| 38 |
++static int |
| 39 |
++minDctVScaledSize(struct jpeg_decompress_struct const cinfo) { |
| 40 |
++ |
| 41 |
++#if JPEG_LIB_VERSION >= 70 |
| 42 |
++ return cinfo.min_DCT_v_scaled_size; |
| 43 |
++#else |
| 44 |
++ return cinfo.min_DCT_scaled_size; |
| 45 |
++#endif |
| 46 |
++} |
| 47 |
++ |
| 48 |
++ |
| 49 |
+ |
| 50 |
+ /*=======================================================================* |
| 51 |
+ * * |
| 52 |
+@@ -467,11 +474,7 @@ |
| 53 |
+ /* Make an 8-row-high sample array that will go away when done |
| 54 |
+ with image |
| 55 |
+ */ |
| 56 |
+-#ifdef JPEG4 |
| 57 |
+- buffer_height = 8; /* could be 2, 4,8 rows high */ |
| 58 |
+-#else |
| 59 |
- buffer_height = cinfo.max_v_samp_factor * cinfo.min_DCT_scaled_size; |
| 60 |
-+ buffer_height = cinfo.max_v_samp_factor * cinfo.min_DCT_v_scaled_size; |
| 61 |
- #endif |
| 62 |
+-#endif |
| 63 |
++ buffer_height = cinfo.max_v_samp_factor * minDctVScaledSize(cinfo); |
| 64 |
|
| 65 |
+ for(cp=0,compptr = cinfo.comp_info;cp<cinfo.num_components; |
| 66 |
+ cp++,compptr++) { |
| 67 |
|
| 68 |
|
| 69 |
|
| 70 |
1.2 media-libs/netpbm/files/netpbm-10.26.64-min_DCT_v_scaled_size.patch |
| 71 |
|
| 72 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/netpbm/files/netpbm-10.26.64-min_DCT_v_scaled_size.patch?rev=1.2&view=markup |
| 73 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/netpbm/files/netpbm-10.26.64-min_DCT_v_scaled_size.patch?rev=1.2&content-type=text/plain |
| 74 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/netpbm/files/netpbm-10.26.64-min_DCT_v_scaled_size.patch?r1=1.1&r2=1.2 |
| 75 |
|
| 76 |
Index: netpbm-10.26.64-min_DCT_v_scaled_size.patch |
| 77 |
=================================================================== |
| 78 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/netpbm/files/netpbm-10.26.64-min_DCT_v_scaled_size.patch,v |
| 79 |
retrieving revision 1.1 |
| 80 |
retrieving revision 1.2 |
| 81 |
diff -u -r1.1 -r1.2 |
| 82 |
--- netpbm-10.26.64-min_DCT_v_scaled_size.patch 29 Sep 2009 19:31:58 -0000 1.1 |
| 83 |
+++ netpbm-10.26.64-min_DCT_v_scaled_size.patch 29 Sep 2009 19:54:22 -0000 1.2 |
| 84 |
@@ -1,11 +1,35 @@ |
| 85 |
-jpeg-7 compability |
| 86 |
+support for jpeg-7 |
| 87 |
|
| 88 |
--- netpbm-10.46.00/converter/ppm/ppmtompeg/jpeg.c |
| 89 |
-+++ netpbm-10.46.00/converter/ppm/ppmtompeg/jpeg.c |
| 90 |
-@@ -470,5 +470,5 @@ |
| 91 |
- buffer_height = 8; /* could be 2, 4,8 rows high */ |
| 92 |
- #else |
| 93 |
++++ netpbm-10.48.00/converter/ppm/ppmtompeg/jpeg.c |
| 94 |
+@@ -53,6 +53,17 @@ |
| 95 |
+ #define HEADER_SIZE 607 /*JFIF header size used on output images*/ |
| 96 |
+ |
| 97 |
+ |
| 98 |
++static int |
| 99 |
++minDctVScaledSize(struct jpeg_decompress_struct const cinfo) { |
| 100 |
++ |
| 101 |
++#if JPEG_LIB_VERSION >= 70 |
| 102 |
++ return cinfo.min_DCT_v_scaled_size; |
| 103 |
++#else |
| 104 |
++ return cinfo.min_DCT_scaled_size; |
| 105 |
++#endif |
| 106 |
++} |
| 107 |
++ |
| 108 |
++ |
| 109 |
+ |
| 110 |
+ /*=======================================================================* |
| 111 |
+ * * |
| 112 |
+@@ -467,11 +474,7 @@ |
| 113 |
+ max_v_samp = (temp_v<v_samp[2]) ? v_samp[2]:temp_v; |
| 114 |
+ |
| 115 |
+ /* Make an 8-row-high sample array that will go away when done with image */ |
| 116 |
+-#ifdef JPEG4 |
| 117 |
+- buffer_height = 8; /* could be 2, 4,8 rows high */ |
| 118 |
+-#else |
| 119 |
- buffer_height = cinfo.max_v_samp_factor * cinfo.min_DCT_scaled_size; |
| 120 |
-+ buffer_height = cinfo.max_v_samp_factor * cinfo.min_DCT_v_scaled_size; |
| 121 |
- #endif |
| 122 |
+-#endif |
| 123 |
++ buffer_height = cinfo.max_v_samp_factor * minDctVScaledSize(cinfo); |
| 124 |
|
| 125 |
+ for(cp=0,compptr = cinfo.comp_info;cp<cinfo.num_components; |
| 126 |
+ cp++,compptr++) { |
Archives