From 9ace5774af68fb8c866d059f3aff7b5b600d5c46 Mon Sep 17 00:00:00 2001 From: simon987 Date: Thu, 5 Mar 2020 16:10:45 -0500 Subject: [PATCH] Update dependencies --- README.md | 2 +- argparse | 2 +- cJSON | 2 +- lib/ffmpeg | 2 +- lib/harfbuzz | 2 +- lib/leptonica | 2 +- lib/libtiff | 2 +- lib/mupdf | 2 +- lib/onion | 2 +- lib/openjpeg | 2 +- lib/tesseract | 2 +- src/cli.c | 2 +- src/io/serialize.c | 8 +++---- src/parsing/pdf.c | 57 +++++++++++++++++++--------------------------- 14 files changed, 40 insertions(+), 49 deletions(-) diff --git a/README.md b/README.md index 835d8b8..eeb40f4 100644 --- a/README.md +++ b/README.md @@ -123,7 +123,7 @@ binaries. libssl-dev uuid-dev python3 libmagic-dev libfreetype6-dev \ libcurl4-openssl-dev libbz2-dev yasm libharfbuzz-dev ragel \ libarchive-dev libtiff5 libpng16-16 libpango1.0-dev \ - libxml2-dev + libxml2-dev libopenjp2-7-dev ``` 2. Build diff --git a/argparse b/argparse index fafc503..4ed6099 160000 --- a/argparse +++ b/argparse @@ -1 +1 @@ -Subproject commit fafc503d23d077bda40c29e8a20ea74707452721 +Subproject commit 4ed6099cb33245b06343518b9f3c45ac56e8283c diff --git a/cJSON b/cJSON index 2d4ad84..e8077d0 160000 --- a/cJSON +++ b/cJSON @@ -1 +1 @@ -Subproject commit 2d4ad841927590198ecfb8b27335a0cd97cf15c1 +Subproject commit e8077d01500279a7b45b8cd7a0ae94ea7ad5748a diff --git a/lib/ffmpeg b/lib/ffmpeg index 8887991..e27a35e 160000 --- a/lib/ffmpeg +++ b/lib/ffmpeg @@ -1 +1 @@ -Subproject commit 8887991a3109f94b7d019a11a86e6cd900105258 +Subproject commit e27a35e0458224ef6f47753f248ba84ec8284818 diff --git a/lib/harfbuzz b/lib/harfbuzz index b28c282..b7617f6 160000 --- a/lib/harfbuzz +++ b/lib/harfbuzz @@ -1 +1 @@ -Subproject commit b28c282585afd3bff844e84eae7f29e1a1267aef +Subproject commit b7617f6b3cfa0abf10292ea79bcd53ef61a08e90 diff --git a/lib/leptonica b/lib/leptonica index cc03be7..320b4bb 160000 --- a/lib/leptonica +++ b/lib/leptonica @@ -1 +1 @@ -Subproject commit cc03be70fded1ad6a8cedad656456386a1bd08e8 +Subproject commit 320b4bbb025db7f8c68d3c2b0b9d9fad459c7af3 diff --git a/lib/libtiff b/lib/libtiff index 3db0ff9..a6d3c1d 160000 --- a/lib/libtiff +++ b/lib/libtiff @@ -1 +1 @@ -Subproject commit 3db0ff91bc6db20fc4cb035be366a9bbb4e701cf +Subproject commit a6d3c1d64b655f5f151a01fda2b7b0bf50cc61aa diff --git a/lib/mupdf b/lib/mupdf index c50ac19..1e1ac03 160000 --- a/lib/mupdf +++ b/lib/mupdf @@ -1 +1 @@ -Subproject commit c50ac19e412fe7830dfef5d1cbc71e9da3405c96 +Subproject commit 1e1ac03fe4c8bfd9022d945b05e0cc1343827399 diff --git a/lib/onion b/lib/onion index 73329b6..2b3b230 160000 --- a/lib/onion +++ b/lib/onion @@ -1 +1 @@ -Subproject commit 73329b61eb82d65b827e92ab46b2db7da85163c7 +Subproject commit 2b3b230b79ecae119b7eb847f2f9545a46bef13c diff --git a/lib/openjpeg b/lib/openjpeg index ac37373..563ecfb 160000 --- a/lib/openjpeg +++ b/lib/openjpeg @@ -1 +1 @@ -Subproject commit ac3737372a00b8778b528094dd5bd58a74f67d42 +Subproject commit 563ecfb55ca77c0fc5ea19e4885e00f55ec82ca9 diff --git a/lib/tesseract b/lib/tesseract index f268e66..90405ad 160000 --- a/lib/tesseract +++ b/lib/tesseract @@ -1 +1 @@ -Subproject commit f268e6615e619a7140de78d9db3f8240fa8c68bd +Subproject commit 90405ad0e3bdb7b779d8edaf147bff496873f84b diff --git a/src/cli.c b/src/cli.c index 548393b..bd8fa33 100644 --- a/src/cli.c +++ b/src/cli.c @@ -238,7 +238,7 @@ int index_args_validate(index_args_t *args, int argc, const char **argv) { args->script = malloc(info.st_size + 1); res = read(fd, args->script, info.st_size); - if (res == -1) { + if (res < 0) { fprintf(stderr, "Error reading script file '%s': %s\n", args->script_path, strerror(errno)); return 1; } diff --git a/src/io/serialize.c b/src/io/serialize.c index 60e45bc..4e31b10 100644 --- a/src/io/serialize.c +++ b/src/io/serialize.c @@ -39,8 +39,8 @@ void write_index_descriptor(char *path, index_descriptor_t *desc) { cJSON_AddNumberToObject(json, "timestamp", (double) desc->timestamp); int fd = open(path, O_CREAT | O_WRONLY, S_IRUSR | S_IWUSR); - if (fd == -1) { - perror(path); + if (fd < 0) { + LOG_FATALF("serialize.c", "Could not write index descriptor: %s", strerror(errno)); } char *str = cJSON_Print(json); write(fd, str, strlen(str)); @@ -185,7 +185,7 @@ void write_document(document_t *doc) { int res = write(index_fd, buf.buf, buf.cur); if (res == -1) { - perror("write"); + LOG_FATALF("serialize.c", "Could not write document: %s", strerror(errno)) } ScanCtx.stat_index_size += buf.cur; dyn_buffer_destroy(&buf); @@ -334,7 +334,7 @@ void read_index_json(const char *path, UNUSED(const char *index_id), index_func char *line = NULL; size_t len; size_t read = getline(&line, &len, file); - if (read == -1) { + if (read < 0) { if (line) { free(line); } diff --git a/src/parsing/pdf.c b/src/parsing/pdf.c index 41f2ed0..d51069a 100644 --- a/src/parsing/pdf.c +++ b/src/parsing/pdf.c @@ -6,12 +6,13 @@ __thread text_buffer_t thread_buffer; -fz_page *render_cover(fz_context *ctx, document_t *doc, fz_document *fzdoc) { +int render_cover(fz_context *ctx, document_t *doc, fz_document *fzdoc) { int err = 0; fz_page *cover = NULL; fz_var(cover); + fz_var(err); fz_try(ctx) cover = fz_load_page(ctx, fzdoc, 0); fz_catch(ctx) @@ -20,7 +21,7 @@ fz_page *render_cover(fz_context *ctx, document_t *doc, fz_document *fzdoc) { if (err != 0) { fz_drop_page(ctx, cover); LOG_WARNINGF(doc->filepath, "fz_load_page() returned error code [%d] %s", err, ctx->error.message) - return NULL; + return FALSE; } fz_rect bounds = fz_bound_page(ctx, cover); @@ -45,14 +46,14 @@ fz_page *render_cover(fz_context *ctx, document_t *doc, fz_document *fzdoc) { fz_var(err); fz_try(ctx) { - pthread_mutex_lock(&ScanCtx.mupdf_mu); +// pthread_mutex_lock(&ScanCtx.mupdf_mu); fz_run_page(ctx, cover, dev, fz_identity, NULL); } fz_always(ctx) { fz_close_device(ctx, dev); fz_drop_device(ctx, dev); - pthread_mutex_unlock(&ScanCtx.mupdf_mu); +// pthread_mutex_unlock(&ScanCtx.mupdf_mu); } fz_catch(ctx) err = ctx->error.errcode; @@ -61,7 +62,7 @@ fz_page *render_cover(fz_context *ctx, document_t *doc, fz_document *fzdoc) { LOG_WARNINGF(doc->filepath, "fz_run_page() returned error code [%d] %s", err, ctx->error.message) fz_drop_page(ctx, cover); fz_drop_pixmap(ctx, pixmap); - return NULL; + return FALSE; } fz_buffer *fzbuf = NULL; @@ -86,10 +87,11 @@ fz_page *render_cover(fz_context *ctx, document_t *doc, fz_document *fzdoc) { LOG_WARNINGF(doc->filepath, "fz_new_buffer_from_pixmap_as_png() returned error code [%d] %s", err, ctx->error.message) fz_drop_page(ctx, cover); - return NULL; + return FALSE; } - return cover; + fz_drop_page(ctx, cover); + return TRUE; } void fz_err_callback(void *user, UNUSED(const char *message)) { @@ -232,18 +234,11 @@ void parse_pdf(void *buf, size_t buf_len, document_t *doc) { return; } - fz_page *cover = NULL; if (ScanCtx.tn_size > 0) { - cover = render_cover(ctx, doc, fzdoc); - } else { - fz_var(cover); - fz_try(ctx) - cover = fz_load_page(ctx, fzdoc, 0); - fz_catch(ctx) - cover = NULL; + err = render_cover(ctx, doc, fzdoc); } - if (cover == NULL) { + if (err == TRUE) { fz_drop_stream(ctx, stream); fz_drop_document(ctx, fzdoc); fz_drop_context(ctx); @@ -256,23 +251,19 @@ void parse_pdf(void *buf, size_t buf_len, document_t *doc) { for (int current_page = 0; current_page < page_count; current_page++) { fz_page *page = NULL; - if (current_page == 0) { - page = cover; - } else { - fz_var(err); - fz_try(ctx) - page = fz_load_page(ctx, fzdoc, current_page); - fz_catch(ctx) - err = ctx->error.errcode; - if (err != 0) { - LOG_WARNINGF(doc->filepath, "fz_load_page() returned error code [%d] %s", err, ctx->error.message) - text_buffer_destroy(&thread_buffer); - fz_drop_page(ctx, page); - fz_drop_stream(ctx, stream); - fz_drop_document(ctx, fzdoc); - fz_drop_context(ctx); - return; - } + fz_var(err); + fz_try(ctx) + page = fz_load_page(ctx, fzdoc, current_page); + fz_catch(ctx) + err = ctx->error.errcode; + if (err != 0) { + LOG_WARNINGF(doc->filepath, "fz_load_page() returned error code [%d] %s", err, ctx->error.message) + text_buffer_destroy(&thread_buffer); + fz_drop_page(ctx, page); + fz_drop_stream(ctx, stream); + fz_drop_document(ctx, fzdoc); + fz_drop_context(ctx); + return; } fz_stext_page *stext = fz_new_stext_page(ctx, fz_bound_page(ctx, page));