Author: malat-guest Date: 2009-08-07 09:46:23 +0000 (Fri, 07 Aug 2009) New Revision: 3743
Modified: trunk/packages/pvrg-jpeg/trunk/debian/patches/jpeg.1.patch trunk/packages/pvrg-jpeg/trunk/debian/patches/pvrg-jpeg-etb.patch trunk/packages/pvrg-jpeg/trunk/debian/patches/series Log: merge patch Modified: trunk/packages/pvrg-jpeg/trunk/debian/patches/jpeg.1.patch =================================================================== --- trunk/packages/pvrg-jpeg/trunk/debian/patches/jpeg.1.patch 2009-08-07 09:35:45 UTC (rev 3742) +++ trunk/packages/pvrg-jpeg/trunk/debian/patches/jpeg.1.patch 2009-08-07 09:46:23 UTC (rev 3743) @@ -1,8 +1,8 @@ Replace jpeg with pvrg-jpeg. Properly escape all - with \ --- pvrg.orig/jpeg.1 2009-08-07 11:27:32.000000000 +0200 -+++ pvrg/jpeg.1 2009-08-07 11:30:21.000000000 +0200 -@@ -1,35 +1,35 @@ ++++ pvrg/jpeg.1 2009-08-07 11:42:54.000000000 +0200 +@@ -1,35 +1,43 @@ -.TH JPEG 1 "14 June 1993" +.TH PVRG\-JPEG 1 "14 June 1993" .UC 4 @@ -48,10 +48,18 @@ +.I pvrg\-jpeg +is a still\-image compression/decompression program that performs +JPEG encoding and decoding of multiple raster\-scanned files. ++.PP ++These ``raster\-scanned files'' are basically PGM (portable graymap) files ++without the PGM header. A typical JPEG image is made of three of these ++files representing the Y, Cr, and Cb color channels. Usually the Y (lumience) ++channel is full size, while the two chroma channels are half width and ++half height. But no particular channel really needs to be full size, so ++.I pvrg\-jpeg ++will need to know the dimensions of the original image when creating jpegs. .PP .SH OPTIONS .TP -@@ -44,78 +44,78 @@ +@@ -44,78 +52,88 @@ specifies the height of the tallest component. This corresponds to the height of the ``original image''. .TP @@ -92,6 +100,9 @@ .TP -.B -k predictortype -The lossless predictor type, specified as an integer between 1-7. ++.B \-g ++This option will put PGM headers on output files when decoding. ++.TP +.B \-k predictortype +The lossless predictor type, specified as an integer between 1\-7. If specified, then lossless mode is used. @@ -102,7 +113,10 @@ interleaved format. .TP -.B -o -+.B \-o ++.B \-o OutBaseName ++This will use specified string as a base name for output files when decoding. ++.TP ++.B \-O signals that the command interpreter will read from the standard input. .TP @@ -115,6 +129,10 @@ msb first). Not aggressively checked. .TP -.B -t pointtransform ++.B \-s JPEGStreamName ++When encoding, this will be used as the output file. When decoding, this ++will be used as the input file. ++.TP +.B \-t pointtransform Specifies the shifting (right) upon loading input and shifting (left) upon writing input. Generally used by the lossless mode only. Can @@ -152,7 +170,7 @@ .B ComponentFile1.jpg. .br -@@ -129,7 +129,7 @@ +@@ -129,7 +147,7 @@ 1; U is in 2; V is in 3. The file specfications, if left undisturbed, will result in component location of 1 for the first component file, 2 for the second component file, and so on. If @@ -161,7 +179,7 @@ is specified for the previous component file, then the next component index defaults to the previous component index plus 1. -@@ -152,12 +152,11 @@ +@@ -152,12 +170,11 @@ FrameWidth, this should equal the file size of the component. See the above discussion on the actual specification. .TP @@ -176,7 +194,7 @@ specifies the block sampling frequency of the component in the vertical direction. When multiplied together with the Horizontal frequency, it corresponds to the number of blocks of -@@ -168,7 +167,7 @@ +@@ -168,7 +185,7 @@ represents the directory path location of the \fIn\fRth component file. .PP .SH EXAMPLES @@ -185,7 +203,7 @@ 128x128 in .B image.Y; 64x128 in -@@ -181,7 +180,7 @@ +@@ -181,7 +198,7 @@ .br .B @@ -194,7 +212,7 @@ .br In order to decode a compressed file in -@@ -190,7 +189,7 @@ +@@ -190,7 +207,7 @@ .br .B @@ -203,7 +221,7 @@ .br The three output files will be in -@@ -212,11 +211,6 @@ +@@ -212,17 +229,11 @@ .I doc.ps for more details. .PP @@ -215,3 +233,10 @@ .SH BUGS Somewhat slower than many commercial implementations, some bugs are probably lurking around. + Lossless coding and decoding are especially slow. +-Please inform the author at [email protected] if any bugs +-are found. ++This program can produce jpeg files that other programs cannot understand. + .PP + .SH AUTHOR + .PP Modified: trunk/packages/pvrg-jpeg/trunk/debian/patches/pvrg-jpeg-etb.patch =================================================================== --- trunk/packages/pvrg-jpeg/trunk/debian/patches/pvrg-jpeg-etb.patch 2009-08-07 09:35:45 UTC (rev 3742) +++ trunk/packages/pvrg-jpeg/trunk/debian/patches/pvrg-jpeg-etb.patch 2009-08-07 09:46:23 UTC (rev 3743) @@ -1,6 +1,6 @@ Patch from http://www.panix.com/~eli/jpeg/ -Add support for PGM output. +Add support for PGM output. Remove jpeg.1 patch, see jpeg.1.patch instead This web page and the etb patch to the PVRG JPEG code is by Eli the Bearded / Benjamin Elijah Griffin. Reproduction of code is permitted under the Creative Commons Attribution-ShareAlike License. @@ -175,129 +175,6 @@ +} /*END*/ ---- jpegdir.orig/jpeg.1 2005-02-03 15:06:00.000000000 -0800 -+++ jpegdir/jpeg.1 2005-02-03 14:55:54.000000000 -0800 -@@ -4,15 +4,15 @@ - jpeg \- JPEG compression and decompression - .SH SYNOPSIS - .B - jpeg -iw ImageWidth -ih ImageHeight [-JFIF] [-q(l) Q-Factor] - .B -- [-a] [-b] [-d] [-k predictortype] [-n] [-o] [-y] [-z] -+ [-a] [-b] [-d] [-k predictortype] [-n] [-O] [-y] [-z] [-g] - .B - [-p PrecisionValue] [-t pointtransform] - .B -- [-r ResyncInterval] [-s StreamName] -+ [-r ResyncInterval] [-s StreamName] [-o OutBaseName] - .B - [[-ci ComponentIndex1] [-fw FrameWidth1] [-fh FrameHeight1] - .B - [-hf HorizontalFrequency1] [-vf VerticalFrequency1] - .B -@@ -29,10 +29,18 @@ - .SH DESCRIPTION - .I jpeg - is a still-image compression/decompression program that performs - JPEG encoding and decoding of multiple raster-scanned files. - .PP -+These ``raster-scanned files'' are basically PGM (portable graymap) files -+without the PGM header. A typical JPEG image is made of three of these -+files representing the Y, Cr, and Cb color channels. Usually the Y (lumience) -+channel is full size, while the two chroma channels are half width and -+half height. But no particular channel really needs to be full size, so -+.I jpeg -+will need to know the dimensions of the original image when creating jpegs. -+.PP - .SH OPTIONS - .TP - .B ImageWidth - specifies the width of the original image. This should correspond to - the width of the widest component and, thus, the width of the -@@ -68,28 +76,38 @@ - enables the Lee DCT. (Default is Chen DCT.) - .TP - .B -d - enables decoding. See below. - .TP -+.B -g -+This option will put PGM headers on output files when decoding. -+.TP - .B -k predictortype - The lossless predictor type, specified as an integer between 1-7. - If specified, then lossless mode is used. - .TP - .B -n - This option specifies that the files should not be transmitted in - interleaved format. - .TP --.B -o -+.B -o OutBaseName -+This will use specified string as a base name for output files when decoding. -+.TP -+.B -O - signals that the command interpreter will read from the standard - input. - .TP - .B -p - Specifies the precision. Normally should be between 2-16 for - lossless; 8 or 12 for DCT. If it is specified as a number greater - than 8 then the input is considered to be unsigned shorts (16 bits, - msb first). Not aggressively checked. - .TP -+.B -s JPEGStreamName -+When encoding, this will be used as the output file. When decoding, this -+will be used as the input file. -+.TP - .B -t pointtransform - Specifies the shifting (right) upon loading input and shifting (left) - upon writing input. Generally used by the lossless mode only. Can - be used by the DCT mode to add or subtract bits. - .TP -@@ -194,36 +212,31 @@ - .br - - The three output files will be in - .B - image.jpg.1 image.jpg.2 image.jpg.3. --The images can be displayed by the --.I cv --program. -+.br - The images can also be converted to ppm and back through - the programs - .I cyuv2ppm - and - .I ppm2cyuv --Those utility programs available by anonymous ftp from --.I havefun.stanford.edu:pub/cv/CVv1.2.1.tar.Z. - .br - There are many more options within an internal command interpreter. - Please see the accompanying documentation in - .I doc.ps - for more details. - .PP --.SH FTP --.I jpeg --is available by anonymous ftp from --.I havefun.stanford.edu:pub/jpeg/JPEGv1.2.tar.Z. --.PP - .SH BUGS - Somewhat slower than many commercial implementations, - some bugs are probably lurking around. - Lossless coding and decoding are especially slow. --Please inform the author at [email protected] if any bugs --are found. -+This program can produce jpeg files that other programs cannot understand. - .PP - .SH AUTHOR - .PP - Andy Hung -+.PP -+.SH SEE ALSO -+.BR ppm2cyuv (1), -+.BR cyuv2ppm (1), -+.BR pgm (5). --- jpegdir.orig/jpeg.c 2005-02-03 15:06:00.000000000 -0800 +++ jpegdir/jpeg.c 2005-02-03 14:35:45.000000000 -0800 @@ -212,11 +212,17 @@ Modified: trunk/packages/pvrg-jpeg/trunk/debian/patches/series =================================================================== --- trunk/packages/pvrg-jpeg/trunk/debian/patches/series 2009-08-07 09:35:45 UTC (rev 3742) +++ trunk/packages/pvrg-jpeg/trunk/debian/patches/series 2009-08-07 09:46:23 UTC (rev 3743) @@ -2,3 +2,4 @@ cmakelists.txt.patch marker_o_rdwr.patch pvrg-jpeg-etb.patch +jpeg.1.patch _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/debian-med-commit
