mirror of
https://github.com/johnwhitington/cpdf-source.git
synced 2025-02-17 12:20:43 +01:00
Scaffolding for 1bpp reprocessing
This commit is contained in:
parent
2955a30c80
commit
b8aaf29420
@ -523,7 +523,8 @@ type args =
|
|||||||
mutable idir_only_pdfs : bool;
|
mutable idir_only_pdfs : bool;
|
||||||
mutable no_warn_rotate : bool;
|
mutable no_warn_rotate : bool;
|
||||||
mutable jpegquality : int;
|
mutable jpegquality : int;
|
||||||
mutable jpegqualitylossless : int}
|
mutable jpegqualitylossless : int;
|
||||||
|
mutable onebppmethod : string}
|
||||||
|
|
||||||
let args =
|
let args =
|
||||||
{op = None;
|
{op = None;
|
||||||
@ -647,7 +648,8 @@ let args =
|
|||||||
idir_only_pdfs = false;
|
idir_only_pdfs = false;
|
||||||
no_warn_rotate = false;
|
no_warn_rotate = false;
|
||||||
jpegquality = 100;
|
jpegquality = 100;
|
||||||
jpegqualitylossless = 100}
|
jpegqualitylossless = 100;
|
||||||
|
onebppmethod = ""}
|
||||||
|
|
||||||
let reset_arguments () =
|
let reset_arguments () =
|
||||||
args.op <- None;
|
args.op <- None;
|
||||||
@ -754,6 +756,7 @@ let reset_arguments () =
|
|||||||
args.idir_only_pdfs <- false;
|
args.idir_only_pdfs <- false;
|
||||||
args.jpegquality <- 100;
|
args.jpegquality <- 100;
|
||||||
args.jpegqualitylossless <- 100;
|
args.jpegqualitylossless <- 100;
|
||||||
|
args.onebppmethod <- "";
|
||||||
(* Do not reset original_filename or cpdflin or was_encrypted or
|
(* Do not reset original_filename or cpdflin or was_encrypted or
|
||||||
was_decrypted_with_owner or recrypt or producer or creator or path_to_* or
|
was_decrypted_with_owner or recrypt or producer or creator or path_to_* or
|
||||||
gs_malformed or gs_quiet or no-warn-rotate, since we want these to work
|
gs_malformed or gs_quiet or no-warn-rotate, since we want these to work
|
||||||
@ -1927,6 +1930,9 @@ let setjpegquality q =
|
|||||||
let setjpegqualitylossless q =
|
let setjpegqualitylossless q =
|
||||||
args.jpegqualitylossless <- q
|
args.jpegqualitylossless <- q
|
||||||
|
|
||||||
|
let set1bppmethod m =
|
||||||
|
args.onebppmethod <- m
|
||||||
|
|
||||||
(* Parse a control file, make an argv, and then make Arg parse it. *)
|
(* Parse a control file, make an argv, and then make Arg parse it. *)
|
||||||
let rec make_control_argv_and_parse filename =
|
let rec make_control_argv_and_parse filename =
|
||||||
control_args := !control_args @ parse_control_file filename
|
control_args := !control_args @ parse_control_file filename
|
||||||
@ -2710,6 +2716,9 @@ and specs =
|
|||||||
("-lossless-to-jpeg",
|
("-lossless-to-jpeg",
|
||||||
Arg.Int setjpegqualitylossless,
|
Arg.Int setjpegqualitylossless,
|
||||||
" Set JPEG quality for existing lossless images");
|
" Set JPEG quality for existing lossless images");
|
||||||
|
("-1bpp-method",
|
||||||
|
Arg.String set1bppmethod,
|
||||||
|
" Set 1bpp compression method for existing images");
|
||||||
("-squeeze",
|
("-squeeze",
|
||||||
Arg.Unit setsqueeze,
|
Arg.Unit setsqueeze,
|
||||||
" Squeeze");
|
" Squeeze");
|
||||||
@ -4447,7 +4456,7 @@ let go () =
|
|||||||
write_pdf false (Cpdfchop.chop ~x ~y ~columns:args.impose_columns ~btt:args.impose_btt ~rtl:args.impose_rtl pdf range)
|
write_pdf false (Cpdfchop.chop ~x ~y ~columns:args.impose_columns ~btt:args.impose_btt ~rtl:args.impose_rtl pdf range)
|
||||||
| Some ProcessImages ->
|
| Some ProcessImages ->
|
||||||
let pdf = get_single_pdf args.op false in
|
let pdf = get_single_pdf args.op false in
|
||||||
Cpdfimage.process pdf ~q:args.jpegquality ~qlossless:args.jpegqualitylossless ~path_to_convert:args.path_to_convert;
|
Cpdfimage.process pdf ~q:args.jpegquality ~qlossless:args.jpegqualitylossless ~onebppmethod:args.onebppmethod ~path_to_convert:args.path_to_convert;
|
||||||
write_pdf false pdf
|
write_pdf false pdf
|
||||||
|
|
||||||
(* Advise the user if a combination of command line flags makes little sense,
|
(* Advise the user if a combination of command line flags makes little sense,
|
||||||
|
14
cpdfimage.ml
14
cpdfimage.ml
@ -590,10 +590,16 @@ let lossless_to_jpeg pdf ~qlossless ~path_to_convert s dict reference =
|
|||||||
print_string (Printf.sprintf "%s (%s) [%s]\n" colspace bpc filter);
|
print_string (Printf.sprintf "%s (%s) [%s]\n" colspace bpc filter);
|
||||||
() (* an image we cannot or do not handle *)
|
() (* an image we cannot or do not handle *)
|
||||||
|
|
||||||
|
let recompress_1bpp_ccitt pdf s dict reference =
|
||||||
|
()
|
||||||
|
|
||||||
|
let recompress_1bpp_jbig2_lossless pdf s dict reference =
|
||||||
|
()
|
||||||
|
|
||||||
(* JPEG to JPEG: RGB and CMYK JPEGS *)
|
(* JPEG to JPEG: RGB and CMYK JPEGS *)
|
||||||
(* Lossless to JPEG: 8bpp Grey, 8bpp RGB, 8bpp CMYK including separation add ICCBased colourspaces *)
|
(* Lossless to JPEG: 8bpp Grey, 8bpp RGB, 8bpp CMYK including separation add ICCBased colourspaces *)
|
||||||
(* 1 bit: anything to CCITT; anything to JBIG2 lossless (no globals yet) *)
|
(* 1 bit: anything to CCITT; anything to JBIG2 lossless (no globals yet) *)
|
||||||
let process ?q ?qlossless ?jbig2 pdf ~path_to_convert =
|
let process ?q ?qlossless ?onebppmethod pdf ~path_to_convert =
|
||||||
let process_obj _ s =
|
let process_obj _ s =
|
||||||
match s with
|
match s with
|
||||||
| Pdf.Stream ({contents = dict, _} as reference) ->
|
| Pdf.Stream ({contents = dict, _} as reference) ->
|
||||||
@ -610,7 +616,11 @@ let process ?q ?qlossless ?jbig2 pdf ~path_to_convert =
|
|||||||
end
|
end
|
||||||
| Some (Pdf.Name "/Image"), _, Some (Pdf.Integer 1), _
|
| Some (Pdf.Name "/Image"), _, Some (Pdf.Integer 1), _
|
||||||
| Some (Pdf.Name "/Image"), _, _, Some (Pdf.Boolean true) ->
|
| Some (Pdf.Name "/Image"), _, _, Some (Pdf.Boolean true) ->
|
||||||
Printf.printf "1bpp\n"
|
begin match onebppmethod with
|
||||||
|
| Some "CCITT" -> recompress_1bpp_ccitt pdf s dict reference
|
||||||
|
| Some "JBIG2Lossless" -> recompress_1bpp_jbig2_lossless pdf s dict reference
|
||||||
|
| _ -> ()
|
||||||
|
end
|
||||||
| Some (Pdf.Name "/Image"), _, _, _ ->
|
| Some (Pdf.Name "/Image"), _, _, _ ->
|
||||||
begin match qlossless with
|
begin match qlossless with
|
||||||
| Some qlossless -> lossless_to_jpeg pdf ~qlossless ~path_to_convert s dict reference
|
| Some qlossless -> lossless_to_jpeg pdf ~qlossless ~path_to_convert s dict reference
|
||||||
|
@ -11,7 +11,7 @@ val image_resolution : Pdf.t -> int list -> float -> (int * string * int * int *
|
|||||||
(** List images in JSON format *)
|
(** List images in JSON format *)
|
||||||
val images : Pdf.t -> int list -> Cpdfyojson.Safe.t
|
val images : Pdf.t -> int list -> Cpdfyojson.Safe.t
|
||||||
|
|
||||||
val process : ?q:int -> ?qlossless:int -> ?jbig2:int -> Pdf.t -> path_to_convert:string -> unit
|
val process : ?q:int -> ?qlossless:int -> ?onebppmethod:string -> Pdf.t -> path_to_convert:string -> unit
|
||||||
|
|
||||||
(**/**)
|
(**/**)
|
||||||
val image_of_input : (unit -> Pdfio.bytes -> Pdf.pdfobject * (int * Pdf.pdfobject) list) -> Pdfio.input -> Pdf.t
|
val image_of_input : (unit -> Pdfio.bytes -> Pdf.pdfobject * (int * Pdf.pdfobject) list) -> Pdfio.input -> Pdf.t
|
||||||
|
Loading…
x
Reference in New Issue
Block a user