fenix
/
cpdf-source
mirror of https://github.com/johnwhitington/cpdf-source.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Skeleton for JPEG2000 images

This commit is contained in:
John Whitington 2024-03-22 13:57:04 +00:00
parent ac6645da52
commit eb358a76af
5 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Changes
View File

@ -1,3 +1,9 @@
2.8 (To come)
New features:
o Build PDF files from JPEG2000 (.jp2, .jpx) files
2.7 (February 2024)
New features:

7
cpdfcommand.ml
View File

@ -1014,6 +1014,8 @@ let set_input_png s = set_input_image (fun () -> Cpdfimage.obj_of_png_data) s
let set_input_jpeg s = set_input_image (fun () -> Cpdfimage.obj_of_jpeg_data) s
let set_input_jpeg2000 s = set_input_image (fun () -> Cpdfimage.obj_of_jpeg2000_data) s
let set_input_jbig2 s =
set_input_image
(fun () -> Cpdfimage.obj_of_jbig2_data ?global:!jbig2_global) s;
@ -1059,6 +1061,8 @@ let anon_fun s =
| a::b::c::d::e::'.'::r when implode (map Char.uppercase_ascii [e; d; c; b; a]) = "JBIG2" -> set_input_jbig2 s
| a::b::c::d::'.'::r when implode (map Char.uppercase_ascii [d; c; b; a]) = "JPEG" -> set_input_jpeg s
| a::b::c::'.'::r when implode (map Char.uppercase_ascii [c; b; a]) = "JPG" -> set_input_jpeg s
| a::b::c::'.'::r when implode (map Char.uppercase_ascii [c; b; a]) = "JP2" -> set_input_jpeg2000 s
| a::b::c::'.'::r when implode (map Char.uppercase_ascii [c; b; a]) = "JPX" -> set_input_jpeg2000 s
| a::b::c::'.'::r when implode (map Char.uppercase_ascii [c; b; a]) = "PNG" -> set_input_png s
| _ -> args.inputs <- (InFile s, "all", "", "", ref false, None)::args.inputs
end;
@ -1872,6 +1876,9 @@ and specs =
("-jpeg",
Arg.String set_input_jpeg,
" Load from a JPEG file, converting to PDF");
("-jpeg2000",
Arg.String set_input_jpeg2000,
" Load from a JPEG2000 file, converting to PDF");
("-jbig2",
Arg.String set_input_jbig2,
" Load from a JBIG2 fragment, converting to PDF");

11
cpdfimage.ml
View File

@ -456,6 +456,17 @@ let obj_of_png_data data =
in
Pdf.Stream {contents = (Pdf.Dictionary d, Pdf.Got png.idat)}, []
let obj_of_jpeg2000_data data =
let w, h = Cpdfjpeg2000.jpeg2000_dimensions data in
let d =
["/Length", Pdf.Integer (Pdfio.bytes_size data);
"/Filter", Pdf.Name "/JPXDecode";
"/Subtype", Pdf.Name "/Image";
"/Width", Pdf.Integer w;
"/Height", Pdf.Integer h]
in
Pdf.Stream {contents = (Pdf.Dictionary d, Pdf.Got data)}, []
let jbig2_dimensions data =
(bget data 11 * 256 * 256 * 256 + bget data 12 * 256 * 256 + bget data 13 * 256 + bget data 14,
bget data 15 * 256 * 256 * 256 + bget data 16 * 256 * 256 + bget data 17 * 256 + bget data 18)

1
cpdfimage.mli
View File

@ -29,3 +29,4 @@ val image_of_input : (unit -> Pdfio.bytes -> Pdf.pdfobject * (int * Pdf.pdfobjec
val obj_of_jpeg_data : Pdfio.bytes -> Pdf.pdfobject * (int * Pdf.pdfobject) list
val obj_of_png_data : Pdfio.bytes -> Pdf.pdfobject * (int * Pdf.pdfobject) list
val obj_of_jbig2_data : ?global:Pdfio.bytes -> Pdfio.bytes -> Pdf.pdfobject * (int * Pdf.pdfobject) list
val obj_of_jpeg2000_data : Pdfio.bytes -> Pdf.pdfobject * (int * Pdf.pdfobject) list

4
cpdfjpeg2000.ml
View File

@ -1,5 +1,5 @@
open Pdfutil
open Pdfio
(* Return the width and height of a JPEG2000 image, per Michael Petrov's C version. *)
let jpeg2000_dimensions bs = (0, 0)
(* Return the width and height of a JPEG2000 image. *)
let jpeg2000_dimensions bs = (28, 30)