diff options
Diffstat (limited to 'Build/source/texk/dvipdfm-x/pdfximage.c')
-rw-r--r-- | Build/source/texk/dvipdfm-x/pdfximage.c | 41 |
1 files changed, 20 insertions, 21 deletions
diff --git a/Build/source/texk/dvipdfm-x/pdfximage.c b/Build/source/texk/dvipdfm-x/pdfximage.c index 9c249848591..e480190f7d8 100644 --- a/Build/source/texk/dvipdfm-x/pdfximage.c +++ b/Build/source/texk/dvipdfm-x/pdfximage.c @@ -28,6 +28,7 @@ #include "error.h" #include "mem.h" +#include "dpxconf.h" #include "dpxfile.h" #include "dpxutil.h" @@ -95,17 +96,13 @@ struct pdf_ximage_ /* verbose, verbose, verbose... */ struct opt_ { - int verbose; char *cmdtmpl; }; static struct opt_ _opts = { - 0, NULL + NULL }; -void pdf_ximage_set_verbose (void) { _opts.verbose++; } - - struct ic_ { int count, capacity; @@ -193,7 +190,8 @@ pdf_close_images (void) * We also use this to convert a PS file only once if multiple * pages are imported from that file. */ - if (_opts.verbose > 1 && keep_cache != 1) + if (dpx_conf.verbose_level > 1 && + dpx_conf.file.keep_cache != 1) MESG("pdf_image>> deleting temporary file \"%s\"\n", I->filename); dpx_delete_temp_file(I->filename, false); /* temporary filename freed here */ I->filename = NULL; @@ -282,14 +280,14 @@ load_image (const char *ident, const char *fullname, int format, FILE *fp, switch (format) { case IMAGE_TYPE_JPEG: - if (_opts.verbose) + if (dpx_conf.verbose_level > 0) MESG("[JPEG]"); if (jpeg_include_image(I, fp) < 0) goto error; I->subtype = PDF_XOBJECT_TYPE_IMAGE; break; case IMAGE_TYPE_JP2: - if (_opts.verbose) + if (dpx_conf.verbose_level > 0) MESG("[JP2]"); if (jp2_include_image(I, fp) < 0) goto error; @@ -297,7 +295,7 @@ load_image (const char *ident, const char *fullname, int format, FILE *fp, break; #ifdef HAVE_LIBPNG case IMAGE_TYPE_PNG: - if (_opts.verbose) + if (dpx_conf.verbose_level > 0) MESG("[PNG]"); if (png_include_image(I, fp) < 0) goto error; @@ -305,14 +303,14 @@ load_image (const char *ident, const char *fullname, int format, FILE *fp, break; #endif case IMAGE_TYPE_BMP: - if (_opts.verbose) + if (dpx_conf.verbose_level > 0) MESG("[BMP]"); if (bmp_include_image(I, fp) < 0) goto error; I->subtype = PDF_XOBJECT_TYPE_IMAGE; break; case IMAGE_TYPE_PDF: - if (_opts.verbose) + if (dpx_conf.verbose_level > 0) MESG("[PDF]"); { int result = pdf_include_page(I, fp, fullname, options); @@ -322,7 +320,7 @@ load_image (const char *ident, const char *fullname, int format, FILE *fp, if (result < 0) goto error; } - if (_opts.verbose) + if (dpx_conf.verbose_level > 0) MESG(",Page:%ld", I->attr.page_no); I->subtype = PDF_XOBJECT_TYPE_FORM; break; @@ -330,11 +328,11 @@ load_image (const char *ident, const char *fullname, int format, FILE *fp, case IMAGE_TYPE_EPS: */ default: - if (_opts.verbose) + if (dpx_conf.verbose_level > 0) MESG(format == IMAGE_TYPE_EPS ? "[PS]" : "[UNKNOWN]"); if (ps_include_page(I, fullname, options) < 0) goto error; - if (_opts.verbose) + if (dpx_conf.verbose_level > 0) MESG(",Page:%ld", I->attr.page_no); I->subtype = PDF_XOBJECT_TYPE_FORM; } @@ -409,16 +407,16 @@ pdf_ximage_findresource (const char *ident, load_options options) RELEASE(fullname); return -1; } - if (_opts.verbose) { + if (dpx_conf.verbose_level > 0) { MESG("(Image:%s", ident); - if (_opts.verbose > 1) + if (dpx_conf.verbose_level > 1) MESG("[%s]", fullname); } format = source_image_type(fp); switch (format) { case IMAGE_TYPE_MPS: - if (_opts.verbose) + if (dpx_conf.verbose_level > 0) MESG("[MPS]"); id = mps_include_page(ident, fp); if (id < 0) { @@ -435,7 +433,7 @@ pdf_ximage_findresource (const char *ident, load_options options) RELEASE(fullname); - if (_opts.verbose) + if (dpx_conf.verbose_level > 0) MESG(")"); if (id < 0) @@ -947,14 +945,15 @@ ps_include_page (pdf_ximage *ximage, const char *filename, load_options options) } #endif - if (keep_cache != -1 && stat(temp, &stat_t)==0 && stat(filename, &stat_o)==0 - && stat_t.st_mtime > stat_o.st_mtime) { + if (dpx_conf.file.keep_cache != -1 && + stat(temp, &stat_t)==0 && stat(filename, &stat_o)==0 && + stat_t.st_mtime > stat_o.st_mtime) { /* cache exist */ /*printf("\nLast file modification: %s", ctime(&stat_o.st_mtime)); printf("Last file modification: %s", ctime(&stat_t.st_mtime));*/ ; } else { - if (_opts.verbose > 1) { + if (dpx_conf.verbose_level > 1) { MESG("\n"); MESG("pdf_image>> Converting file \"%s\" --> \"%s\" via:\n", filename, temp); MESG("pdf_image>> %s\n", distiller_template); |