Begin cleaning up jbig2globals work

cpdfimage.ml

@@ -710,14 +710,10 @@ let recompress_1bpp_jbig2_lossless ~pixel_threshold ~length_threshold ~path_to_j
           remove out2
   end
 
-(* Recompress 1bpp images, compressed any way (none, flate, ccitt, jbig2 lossless) to lossy jbig2 *)
+(* Recompress 1bpp images (except existing JBIG2 compressed ones) to lossy jbig2 *)
-(* For now, just example 6406.pdf, which is CCITT, so simple decompression will do. For lossless
-to lossy JBIG2, we will need to write out and convert to PNM with jbig2dec *)
-(* FIXME: Need interface for jbig2 lossy parameters *)
 let preprocess_jbig2_lossy ~path_to_jbig2enc ~length_threshold ~pixel_threshold ~dpi_threshold inrange highdpi pdf =
  let objnum_name_pairs = ref [] in
  let process_obj objnum s =
- (* Write out each stream as a *.pnm, if we choose to process it, restoring if not. *)
    match s with
    | Pdf.Stream ({contents = dict, _} as reference) ->
        let old = !reference in
@@ -746,7 +742,7 @@ let preprocess_jbig2_lossy ~path_to_jbig2enc ~length_threshold ~pixel_threshold
                    let data = match s with Pdf.Stream {contents = _, Pdf.Got d} -> d | _ -> assert false in
                      pnm_to_channel_1_inverted fh w h data;
                      close_out fh;
-                      Printf.printf "obj %i = %s\n%!" objnum out;
+                     (*Printf.printf "obj %i = %s\n%!" objnum out;*)
                      objnum_name_pairs := (objnum, out)::!objnum_name_pairs
              end
        | _ -> () (* not a 1bpp image *)
@@ -756,23 +752,17 @@ let preprocess_jbig2_lossy ~path_to_jbig2enc ~length_threshold ~pixel_threshold
    Pdf.objiter process_obj pdf;
    if length !objnum_name_pairs > 10000 then Pdfe.log "Too many jbig2 streams" else
    if length !objnum_name_pairs = 0 then () else
-   (* Call jbig2 to generate one *.jbig2 for each, and a *.jbig2globals *)
    let jbig2out = Filename.temp_file "cpdf" "jbig2" in
-   Printf.printf "jbig2out: %s" jbig2out;
-   (* FIXME: redirect stdout or sterr from jbig2 to remove summary report. *)
    let retcode =
      let command = Filename.quote_command path_to_jbig2enc (["-p"; "-s"; "-b"; jbig2out] @ map snd !objnum_name_pairs) in
        (*Printf.printf "%S\n" command;*) Sys.command command
    in
    if retcode = 0 then
      begin
-       (* Build the JBIG2Globals stream for the file *)
        let globals = bytes_of_string (contents_of_file (jbig2out ^ ".sym")) in
        let globalobj =
          Pdf.addobj pdf (Pdf.Stream {contents = Pdf.Dictionary [("/Length", Pdf.Integer (bytes_size globals))], Pdf.Got globals})
        in
-         (* For each file, read in the new JBIG2 data, and build each new image stream to replace the old one, using the same
-         overwriting technique as elsewhere. *)
          iter2
            (fun (objnum, _) i ->
               let data = bytes_of_string (contents_of_file (jbig2out ^ Printf.sprintf ".%04i" i)) in