@@ -66,19 +66,14 @@ typedef struct page_range
6666 int last ;
6767} PageRange ;
6868
69+ /* Compatibility options */
6970#define OPT_TPIC_TRANSPARENT_FILL (1 << 1)
7071#define OPT_CIDFONT_FIXEDPITCH (1 << 2)
7172#define OPT_FONTMAP_FIRST_MATCH (1 << 3)
7273#define OPT_PDFDOC_NO_DEST_REMOVE (1 << 4)
7374#define OPT_PDFOBJ_NO_PREDICTOR (1 << 5)
7475#define OPT_PDFOBJ_NO_OBJSTM (1 << 6)
7576
76- static int pdf_version_major = 1 ;
77- static int pdf_version_minor = 5 ;
78- static int compression_level = 9 ;
79-
80- static double annot_grow_x = 0.0 ;
81- static double annot_grow_y = 0.0 ;
8277static char ignore_colors = 0 ;
8378static int bookmark_open = 0 ;
8479static double mag = 1.0 ;
@@ -248,10 +243,18 @@ do_dvi_pages (void)
248243 xo = x_offset ; yo = y_offset ;
249244 dvi_scan_specials (page_no ,
250245 & w , & h , & xo , & yo , & lm ,
246+ /* No PDF version */
247+ NULL , NULL ,
248+ /* No compression */
249+ NULL ,
250+ /* No annotation grow */
251+ NULL , NULL ,
251252 /* No need for encryption options */
252- NULL , NULL , NULL , NULL , NULL , NULL , NULL ,
253+ NULL , NULL , NULL , NULL , NULL ,
253254 /* No trailer IDs */
254- NULL , NULL , NULL );
255+ NULL , NULL , NULL ,
256+ /* No opt_flags */
257+ NULL );
255258 if (lm != landscape_mode ) { /* already swapped for the first page */
256259 SWAP (w , h );
257260 landscape_mode = lm ;
@@ -336,6 +339,11 @@ dvipdfmx_main (
336339 int has_id = 0 ;
337340 unsigned char id1 [16 ], id2 [16 ];
338341 struct pdf_setting settings ;
342+ int pdf_version_major = 1 ;
343+ int pdf_version_minor = 5 ;
344+ int compression_level = 9 ;
345+ double annot_grow_x = 0 ;
346+ double annot_grow_y = 0 ;
339347
340348 assert (pdf_filename );
341349 assert (dvi_filename );
@@ -369,8 +377,7 @@ dvipdfmx_main (
369377 * code bits. */
370378
371379 select_paper (paperspec );
372- annot_grow_x = 0 ;
373- annot_grow_y = 0 ;
380+
374381 bookmark_open = 0 ;
375382 key_bits = 40 ;
376383 permission = 0x003C ;
@@ -397,8 +404,10 @@ dvipdfmx_main (
397404 & paper_width , & paper_height ,
398405 & x_offset , & y_offset , & landscape_mode ,
399406 & pdf_version_major , & pdf_version_minor ,
407+ & compression_level ,
408+ & annot_grow_x , & annot_grow_y ,
400409 & do_encryption , & key_bits , & permission , oplain , uplain ,
401- & has_id , id1 , id2 );
410+ & has_id , id1 , id2 , & opt_flags );
402411 }
403412
404413 /*kpse_init_prog("", font_dpi, NULL, NULL);
@@ -518,4 +527,4 @@ tt_engine_xdvipdfmx_main(
518527
519528 ttbc_global_engine_exit ();
520529 return rv ;
521- }
530+ }
0 commit comments