diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | apps/mudraw.c | 489 | ||||
| -rw-r--r-- | fitz/base_context.c | 13 | ||||
| -rw-r--r-- | fitz/fitz.h | 1 | ||||
| -rw-r--r-- | win32/mudraw.vcproj | 246 | ||||
| -rw-r--r-- | win32/mupdf.sln | 13 |
6 files changed, 760 insertions, 4 deletions
@@ -125,7 +125,7 @@ $(OUT)/cmapdump.o : pdf/pdf_cmap.c pdf/pdf_cmap_parse.c # --- Tools and Apps --- -PDF_APPS := $(addprefix $(OUT)/, mupdfdraw mupdfclean mupdfextract mupdfinfo mupdfshow) +PDF_APPS := $(addprefix $(OUT)/, mudraw mupdfdraw mupdfclean mupdfextract mupdfinfo mupdfshow) XPS_APPS := $(addprefix $(OUT)/, muxpsdraw) $(PDF_APPS) : $(FITZ_LIB) $(THIRD_LIBS) diff --git a/apps/mudraw.c b/apps/mudraw.c new file mode 100644 index 00000000..ce59a4e3 --- /dev/null +++ b/apps/mudraw.c @@ -0,0 +1,489 @@ +/* + * mudraw -- command line tool for drawing pdf/xps/cbz documents + */ + +#include "fitz.h" +#include "mupdf.h" + +#ifdef _MSC_VER +#include <winsock2.h> +#else +#include <sys/time.h> +#endif + +static char *output = NULL; +static float resolution = 72; +static float rotation = 0; + +static int showxml = 0; +static int showtext = 0; +static int showtime = 0; +static int showmd5 = 0; +static int showoutline = 0; +static int savealpha = 0; +static int uselist = 1; +static int alphabits = 8; +static float gamma_value = 1; +static int invert = 0; + +static fz_colorspace *colorspace; +static char *filename; + +static struct { + int count, total; + int min, max; + int minpage, maxpage; +} timing; + +static void usage(void) +{ + fprintf(stderr, + "usage: mudraw [options] input [pages]\n" + "\t-o -\toutput filename (%%d for page number)\n" + "\t\tsupported formats: pgm, ppm, pam, png, pbm\n" + "\t-p -\tpassword\n" + "\t-r -\tresolution in dpi (default: 72)\n" + "\t-a\tsave alpha channel (only pam and png)\n" + "\t-b -\tnumber of bits of antialiasing (0 to 8)\n" + "\t-g\trender in grayscale\n" + "\t-m\tshow timing information\n" + "\t-t\tshow text (-tt for xml)\n" + "\t-x\tshow display list\n" + "\t-d\tdisable use of display list\n" + "\t-5\tshow md5 checksums\n" + "\t-R -\trotate clockwise by given number of degrees\n" + "\t-G gamma\tgamma correct output\n" + "\t-I\tinvert output\n" + "\t-l\tprint outline\n" + "\tpages\tcomma separated list of ranges\n"); + exit(1); +} + +static int gettime(void) +{ + static struct timeval first; + static int once = 1; + struct timeval now; + if (once) + { + gettimeofday(&first, NULL); + once = 0; + } + gettimeofday(&now, NULL); + return (now.tv_sec - first.tv_sec) * 1000 + (now.tv_usec - first.tv_usec) / 1000; +} + +static int isrange(char *s) +{ + while (*s) + { + if ((*s < '0' || *s > '9') && *s != '-' && *s != ',') + return 0; + s++; + } + return 1; +} + +static void drawpage(fz_context *ctx, fz_document *doc, int pagenum) +{ + fz_page *page; + fz_display_list *list = NULL; + fz_device *dev = NULL; + int start; + + fz_var(list); + fz_var(dev); + + if (showtime) + { + start = gettime(); + } + + fz_try(ctx) + { + page = fz_load_page(doc, pagenum - 1); + } + fz_catch(ctx) + { + fz_throw(ctx, "cannot load page %d in file '%s'", pagenum, filename); + } + + if (uselist) + { + fz_try(ctx) + { + list = fz_new_display_list(ctx); + dev = fz_new_list_device(ctx, list); + fz_run_page(doc, page, dev, fz_identity, NULL); + } + fz_catch(ctx) + { + fz_free_device(dev); + fz_free_display_list(ctx, list); + fz_free_page(doc, page); + fz_throw(ctx, "cannot draw page %d in file '%s'", pagenum, filename); + } + fz_free_device(dev); + dev = NULL; + } + + if (showxml) + { + fz_try(ctx) + { + dev = fz_new_trace_device(ctx); + printf("<page number=\"%d\">\n", pagenum); + if (list) + fz_run_display_list(list, dev, fz_identity, fz_infinite_bbox, NULL); + else + fz_run_page(doc, page, dev, fz_identity, NULL); + printf("</page>\n"); + } + fz_catch(ctx) + { + fz_free_device(dev); + fz_free_display_list(ctx, list); + fz_free_page(doc, page); + fz_rethrow(ctx); + } + fz_free_device(dev); + dev = NULL; + } + + if (showtext) + { + fz_text_span *text = NULL; + + fz_var(text); + + fz_try(ctx) + { + text = fz_new_text_span(ctx); + dev = fz_new_text_device(ctx, text); + if (list) + fz_run_display_list(list, dev, fz_identity, fz_infinite_bbox, NULL); + else + fz_run_page(doc, page, dev, fz_identity, NULL); + fz_free_device(dev); + dev = NULL; + printf("[Page %d]\n", pagenum); + if (showtext > 1) + fz_debug_text_span_xml(text); + else + fz_debug_text_span(text); + printf("\n"); + } + fz_catch(ctx) + { + fz_free_device(dev); + fz_free_text_span(ctx, text); + fz_free_display_list(ctx, list); + fz_free_page(doc, page); + fz_rethrow(ctx); + } + fz_free_text_span(ctx, text); + } + + if (showmd5 || showtime) + printf("page %s %d", filename, pagenum); + + if (output || showmd5 || showtime) + { + float zoom; + fz_matrix ctm; + fz_rect bounds; + fz_bbox bbox; + fz_pixmap *pix = NULL; + + fz_var(pix); + + bounds = fz_bound_page(doc, page); + zoom = resolution / 72; + ctm = fz_scale(zoom, zoom); + ctm = fz_concat(ctm, fz_rotate(rotation)); + bbox = fz_round_rect(fz_transform_rect(ctm, bounds)); + + /* TODO: banded rendering and multi-page ppm */ + + fz_try(ctx) + { + pix = fz_new_pixmap_with_rect(ctx, colorspace, bbox); + + if (savealpha) + fz_clear_pixmap(ctx, pix); + else + fz_clear_pixmap_with_value(ctx, pix, 255); + + dev = fz_new_draw_device(ctx, pix); + if (list) + fz_run_display_list(list, dev, ctm, bbox, NULL); + else + fz_run_page(doc, page, dev, ctm, NULL); + fz_free_device(dev); + dev = NULL; + + if (invert) + fz_invert_pixmap(ctx, pix); + if (gamma_value != 1) + fz_gamma_pixmap(ctx, pix, gamma_value); + + if (savealpha) + fz_unmultiply_pixmap(ctx, pix); + + if (output) + { + char buf[512]; + sprintf(buf, output, pagenum); + if (strstr(output, ".pgm") || strstr(output, ".ppm") || strstr(output, ".pnm")) + fz_write_pnm(ctx, pix, buf); + else if (strstr(output, ".pam")) + fz_write_pam(ctx, pix, buf, savealpha); + else if (strstr(output, ".png")) + fz_write_png(ctx, pix, buf, savealpha); + else if (strstr(output, ".pbm")) { + fz_halftone *ht = fz_get_default_halftone(ctx, 1); + fz_bitmap *bit = fz_halftone_pixmap(ctx, pix, ht); + fz_write_pbm(ctx, bit, buf); + fz_drop_bitmap(ctx, bit); + fz_drop_halftone(ctx, ht); + } + } + + if (showmd5) + { + fz_md5 md5; + unsigned char digest[16]; + int i; + + fz_md5_init(&md5); + fz_md5_update(&md5, pix->samples, pix->w * pix->h * pix->n); + fz_md5_final(&md5, digest); + + printf(" "); + for (i = 0; i < 16; i++) + printf("%02x", digest[i]); + } + + fz_drop_pixmap(ctx, pix); + } + fz_catch(ctx) + { + fz_free_device(dev); + fz_drop_pixmap(ctx, pix); + fz_free_display_list(ctx, list); + fz_free_page(doc, page); + fz_rethrow(ctx); + } + } + + if (list) + fz_free_display_list(ctx, list); + + fz_free_page(doc, page); + + if (showtime) + { + int end = gettime(); + int diff = end - start; + + if (diff < timing.min) + { + timing.min = diff; + timing.minpage = pagenum; + } + if (diff > timing.max) + { + timing.max = diff; + timing.maxpage = pagenum; + } + timing.total += diff; + timing.count ++; + + printf(" %dms", diff); + } + + if (showmd5 || showtime) + printf("\n"); + + fz_flush_warnings(ctx); +} + +static void drawrange(fz_context *ctx, fz_document *doc, char *range) +{ + int page, spage, epage, final; + char *spec, *dash; + + final = fz_count_pages(doc); + spec = fz_strsep(&range, ","); + while (spec) + { + dash = strchr(spec, '-'); + + if (dash == spec) + spage = epage = final; + else + spage = epage = atoi(spec); + + if (dash) + { + if (strlen(dash) > 1) + epage = atoi(dash + 1); + else + epage = final; + } + + spage = CLAMP(spage, 1, final); + epage = CLAMP(epage, 1, final); + + if (spage < epage) + for (page = spage; page <= epage; page++) + drawpage(ctx, doc, page); + else + for (page = spage; page >= epage; page--) + drawpage(ctx, doc, page); + + spec = fz_strsep(&range, ","); + } +} + +static void drawoutline(fz_context *ctx, fz_document *doc) +{ + fz_outline *outline = fz_load_outline(doc); + if (showoutline > 1) + fz_debug_outline_xml(ctx, outline, 0); + else + fz_debug_outline(ctx, outline, 0); + fz_free_outline(ctx, outline); +} + +#ifdef MUPDF_COMBINED_EXE +int draw_main(int argc, char **argv) +#else +int main(int argc, char **argv) +#endif +{ + char *password = ""; + int grayscale = 0; + fz_document *doc = NULL; + int c; + fz_context *ctx; + + fz_var(doc); + + while ((c = fz_getopt(argc, argv, "lo:p:r:R:ab:dgmtx5G:I")) != -1) + { + switch (c) + { + case 'o': output = fz_optarg; break; + case 'p': password = fz_optarg; break; + case 'r': resolution = atof(fz_optarg); break; + case 'R': rotation = atof(fz_optarg); break; + case 'a': savealpha = 1; break; + case 'b': alphabits = atoi(fz_optarg); break; + case 'l': showoutline++; break; + case 'm': showtime++; break; + case 't': showtext++; break; + case 'x': showxml++; break; + case '5': showmd5++; break; + case 'g': grayscale++; break; + case 'd': uselist = 0; break; + case 'G': gamma_value = atof(fz_optarg); break; + case 'I': invert++; break; + default: usage(); break; + } + } + + if (fz_optind == argc) + usage(); + + if (!showtext && !showxml && !showtime && !showmd5 && !showoutline && !output) + { + printf("nothing to do\n"); + exit(0); + } + + ctx = fz_new_context(NULL, NULL, FZ_STORE_DEFAULT); + if (!ctx) + { + fprintf(stderr, "cannot initialise context\n"); + exit(1); + } + + fz_set_aa_level(ctx, alphabits); + + colorspace = fz_device_rgb; + if (grayscale) + colorspace = fz_device_gray; + if (output && strstr(output, ".pgm")) + colorspace = fz_device_gray; + if (output && strstr(output, ".ppm")) + colorspace = fz_device_rgb; + if (output && strstr(output, ".pbm")) + colorspace = fz_device_gray; + + timing.count = 0; + timing.total = 0; + timing.min = 1 << 30; + timing.max = 0; + timing.minpage = 0; + timing.maxpage = 0; + + if (showxml) + printf("<?xml version=\"1.0\"?>\n"); + + fz_try(ctx) + { + while (fz_optind < argc) + { + filename = argv[fz_optind++]; + + fz_try(ctx) + { + doc = fz_open_document(ctx, filename); + } + fz_catch(ctx) + { + fz_throw(ctx, "cannot open document: %s", filename); + } + + if (fz_needs_password(doc)) + if (!fz_authenticate_password(doc, password)) + fz_throw(ctx, "cannot authenticate password: %s", filename); + + if (showxml) + printf("<document name=\"%s\">\n", filename); + + if (showoutline) + drawoutline(ctx, doc); + + if (showtext || showxml || showtime || showmd5 || output) + { + if (fz_optind == argc || !isrange(argv[fz_optind])) + drawrange(ctx, doc, "1-"); + if (fz_optind < argc && isrange(argv[fz_optind])) + drawrange(ctx, doc, argv[fz_optind++]); + } + + if (showxml) + printf("</document>\n"); + + fz_close_document(doc); + doc = NULL; + } + } + fz_catch(ctx) + { + fz_close_document(doc); + } + + if (showtime) + { + printf("total %dms / %d pages for an average of %dms\n", + timing.total, timing.count, timing.total / timing.count); + printf("fastest page %d: %dms\n", timing.minpage, timing.min); + printf("slowest page %d: %dms\n", timing.maxpage, timing.max); + } + + fz_free_context(ctx); + return 0; +} diff --git a/fitz/base_context.c b/fitz/base_context.c index 8df74531..fe69ff8e 100644 --- a/fitz/base_context.c +++ b/fitz/base_context.c @@ -115,13 +115,20 @@ fz_new_context(fz_alloc_context *alloc, fz_locks_context *locks, unsigned int ma fz_context * fz_clone_context(fz_context *ctx) { - fz_context *new_ctx; - /* We cannot safely clone the context without having locking/ * unlocking functions. */ - if (ctx == NULL || ctx->alloc == NULL || ctx->locks == &fz_locks_default) + if (ctx == NULL || ctx->locks == &fz_locks_default) return NULL; + return fz_clone_context_internal(ctx); +} + +fz_context * +fz_clone_context_internal(fz_context *ctx) +{ + fz_context *new_ctx; + if (ctx == NULL || ctx->alloc == NULL) + return NULL; new_ctx = new_context_phase1(ctx->alloc, ctx->locks); new_ctx->store = fz_store_keep(ctx); new_ctx->glyph_cache = fz_keep_glyph_cache(ctx); diff --git a/fitz/fitz.h b/fitz/fitz.h index 3992a75b..d2672031 100644 --- a/fitz/fitz.h +++ b/fitz/fitz.h @@ -373,6 +373,7 @@ struct fz_context_s fz_context *fz_new_context(fz_alloc_context *alloc, fz_locks_context *locks, unsigned int max_store); fz_context *fz_clone_context(fz_context *ctx); +fz_context *fz_clone_context_internal(fz_context *ctx); void fz_free_context(fz_context *ctx); void fz_new_aa_context(fz_context *ctx); diff --git a/win32/mudraw.vcproj b/win32/mudraw.vcproj new file mode 100644 index 00000000..81cb8c86 --- /dev/null +++ b/win32/mudraw.vcproj @@ -0,0 +1,246 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="8.00" + Name="mudraw" + ProjectGUID="{0B51171B-B10E-4EAC-8FFA-19226A1828A3}" + RootNamespace="mupdf" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)\$(ProjectName)" + ConfigurationType="1" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="..\fitz;..\pdf" + PreprocessorDefinitions="DEBUG=1" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="1" + WarningLevel="3" + DebugInformationFormat="4" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + GenerateDebugInformation="true" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Release|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)\$(ProjectName)" + ConfigurationType="1" + CharacterSet="2" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + EnableIntrinsicFunctions="true" + AdditionalIncludeDirectories="..\fitz;..\pdf" + RuntimeLibrary="0" + EnableFunctionLevelLinking="true" + WarningLevel="3" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + GenerateDebugInformation="true" + OptimizeReferences="2" + EnableCOMDATFolding="2" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + <Configuration + Name="Memento|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)\$(ProjectName)" + ConfigurationType="1" + CharacterSet="2" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="..\fitz;..\pdf" + PreprocessorDefinitions="MEMENTO=1;DEBUG=1" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="1" + WarningLevel="3" + DebugInformationFormat="4" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + GenerateDebugInformation="true" + TargetMachine="1" + /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> + </Configuration> + </Configurations> + <References> + </References> + <Files> + <File + RelativePath="..\apps\mudraw.c" + > + </File> + </Files> + <Globals> + </Globals> +</VisualStudioProject> diff --git a/win32/mupdf.sln b/win32/mupdf.sln index 6a0481f8..3dd78ffd 100644 --- a/win32/mupdf.sln +++ b/win32/mupdf.sln @@ -21,6 +21,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mupdfdraw", "mupdfdraw.vcpr {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C} = {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mudraw", "mudraw.vcproj", "{0B51171B-B10E-4EAC-8FFA-19226A1828A3}" + ProjectSection(ProjectDependencies) = postProject + {A5053AA7-02E5-4903-B596-04F17AEB1526} = {A5053AA7-02E5-4903-B596-04F17AEB1526} + {5F615F91-DFF8-4F05-BF48-6222B7D86519} = {5F615F91-DFF8-4F05-BF48-6222B7D86519} + {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C} = {5EDCF4FD-0291-4FB9-8D96-D58957CA5E3C} + EndProjectSection +EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mupdfclean", "mupdfclean.vcproj", "{923D7C3D-A5CD-47F1-9BB3-F716531DCCCE}" ProjectSection(ProjectDependencies) = postProject {5F615F91-DFF8-4F05-BF48-6222B7D86519} = {5F615F91-DFF8-4F05-BF48-6222B7D86519} @@ -90,6 +97,12 @@ Global {26C5D7C3-BEE9-4886-9CDB-846D26F5BCDB}.Memento|Win32.Build.0 = Memento|Win32 {26C5D7C3-BEE9-4886-9CDB-846D26F5BCDB}.Release|Win32.ActiveCfg = Release|Win32 {26C5D7C3-BEE9-4886-9CDB-846D26F5BCDB}.Release|Win32.Build.0 = Release|Win32 + {0B51171B-B10E-4EAC-8FFA-19226A1828A3}.Debug|Win32.ActiveCfg = Debug|Win32 + {0B51171B-B10E-4EAC-8FFA-19226A1828A3}.Debug|Win32.Build.0 = Debug|Win32 + {0B51171B-B10E-4EAC-8FFA-19226A1828A3}.Memento|Win32.ActiveCfg = Memento|Win32 + {0B51171B-B10E-4EAC-8FFA-19226A1828A3}.Memento|Win32.Build.0 = Memento|Win32 + {0B51171B-B10E-4EAC-8FFA-19226A1828A3}.Release|Win32.ActiveCfg = Release|Win32 + {0B51171B-B10E-4EAC-8FFA-19226A1828A3}.Release|Win32.Build.0 = Release|Win32 {923D7C3D-A5CD-47F1-9BB3-F716531DCCCE}.Debug|Win32.ActiveCfg = Debug|Win32 {923D7C3D-A5CD-47F1-9BB3-F716531DCCCE}.Debug|Win32.Build.0 = Debug|Win32 {923D7C3D-A5CD-47F1-9BB3-F716531DCCCE}.Memento|Win32.ActiveCfg = Memento|Win32 |