CMakeLists.txt

@@ -25,8 +25,6 @@ add_library(
         libscan/media/media.c libscan/media/media.h
         libscan/font/font.c libscan/font/font.h
         libscan/msdoc/msdoc.c libscan/msdoc/msdoc.h
-        libscan/json/json.c libscan/json/json.h
-        libscan/wpd/wpd.c libscan/wpd/wpd.h libscan/wpd/libwpd_c_api.h libscan/wpd/libwpd_c_api.cpp
 
         third-party/utf8.h
         libscan/mobi/scan_mobi.c libscan/mobi/scan_mobi.h libscan/raw/raw.c libscan/raw/raw.h)
@@ -34,7 +32,6 @@ set_target_properties(scan PROPERTIES LINKER_LANGUAGE C)
 
 set(CMAKE_FIND_LIBRARY_SUFFIXES .a .lib .so)
 
-find_package(cJSON CONFIG REQUIRED)
 find_package(LibArchive REQUIRED)
 find_package(BZip2 REQUIRED)
 find_package(lz4 REQUIRED)
@@ -120,38 +117,37 @@ ExternalProject_Add(
 SET(FFMPEG_LIB_DIR ${CMAKE_CURRENT_BINARY_DIR}/third-party/ext_ffmpeg/src/ffmpeg)
 SET(FFMPEG_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/third-party/ext_ffmpeg/src/ffmpeg)
 
-ExternalProject_Add(
-        libwpd
-        URL http://prdownloads.sourceforge.net/libwpd/libwpd-0.9.9.tar.gz
-
-        UPDATE_COMMAND ""
-        PATCH_COMMAND ""
-        TEST_COMMAND ""
-        CONFIGURE_COMMAND ./configure --without-docs --enable-static --disable-shared
-        INSTALL_COMMAND ""
-
-        PREFIX "third-party/ext_libwpd"
-        SOURCE_DIR "third-party/ext_libwpd/src/libwpd"
-        BINARY_DIR "third-party/ext_libwpd/src/libwpd"
-
-        BUILD_COMMAND ${MAKE_EXE} -j33
-)
-SET(WPD_LIB_DIR ${CMAKE_CURRENT_BINARY_DIR}/third-party/ext_libwpd/src/libwpd/src/lib/.libs/)
-SET(WPD_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/third-party/ext_libwpd/src/libwpd/inc/)
+#ExternalProject_Add(
+#        libwpd
+#        URL http://prdownloads.sourceforge.net/libwpd/libwpd-0.9.9.tar.gz
+#
+#        UPDATE_COMMAND ""
+#        PATCH_COMMAND ""
+#        TEST_COMMAND ""
+#        CONFIGURE_COMMAND ./configure --without-docs --enable-static --disable-shared
+#        INSTALL_COMMAND ""
+#
+#        PREFIX "third-party/ext_libwpd"
+#        SOURCE_DIR "third-party/ext_libwpd/src/libwpd"
+#        BINARY_DIR "third-party/ext_libwpd/src/libwpd"
+#
+#        BUILD_COMMAND ${MAKE_EXE} -j33
+#)
+#SET(WPD_LIB_DIR ${CMAKE_CURRENT_BINARY_DIR}/third-party/ext_libwpd/src/libwpd/src/lib/.libs/)
+#SET(WPD_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/third-party/ext_libwpd/src/libwpd/inc/)
 
 add_dependencies(
         scan
         libmobi
         ffmpeg
         antiword
-        libwpd
+#        libwpd
 )
 
 target_link_libraries(
         scan
         PUBLIC
 
-        cjson
         ${LibArchive_LIBRARIES}
         ZLIB::ZLIB
         BZip2::BZip2
@@ -164,8 +160,7 @@ target_link_libraries(
 
         ${MOBI_LIB_DIR}/libmobi.a
 
-        ${WPD_LIB_DIR}/libwpd-0.9.a
-        ${WPD_LIB_DIR}/libwpd-stream-0.9.a
+#        ${WPD_LIB_DIR}/libwpd-0.9.a
 
         ${FREETYPE_LIB}
         ${HARFBUZZ_LIB}
@@ -210,7 +205,7 @@ target_include_directories(
         ${LIBXML2_INCLUDE_DIR}
         ${FFMPEG_INCLUDE_DIR}
         ${MOBI_INCLUDE_DIR}
-        ${WPD_INCLUDE_DIR}
+#        ${WPD_INCLUDE_DIR}
 )
 
 if (BUILD_TESTS)

libscan/json/json.c

@@ -1,119 +0,0 @@
-#include "json.h"
-#include "cjson/cJSON.h"
-
-
-#define JSON_MAX_FILE_SIZE (1024 * 1024 * 50)
-
-int json_extract_text(cJSON *json, text_buffer_t *tex) {
-    if (cJSON_IsObject(json)) {
-        for (cJSON *child = json->child; child != NULL; child = child->next) {
-            if (json_extract_text(child, tex)) {
-                return TRUE;
-            }
-        }
-    } else if (cJSON_IsArray(json)) {
-        cJSON *child;
-        cJSON_ArrayForEach(child, json) {
-            if (json_extract_text(child, tex)) {
-                return TRUE;
-            }
-        }
-    } else if (cJSON_IsString(json)) {
-        if (text_buffer_append_string0(tex, json->valuestring) == TEXT_BUF_FULL) {
-            return TRUE;
-        }
-        if (text_buffer_append_char(tex, ' ') == TEXT_BUF_FULL) {
-            return TRUE;
-        }
-    }
-
-    return FALSE;
-}
-
-scan_code_t parse_json(scan_json_ctx_t *ctx, vfile_t *f, document_t *doc) {
-
-    if (f->info.st_size > JSON_MAX_FILE_SIZE) {
-        CTX_LOG_WARNINGF("json.c", "File larger than maximum allowed [%s]", f->filepath)
-        return SCAN_ERR_SKIP;
-    }
-
-    size_t buf_len;
-    char *buf = read_all(f, &buf_len);
-
-    if (buf == NULL) {
-        return SCAN_ERR_READ;
-    }
-
-    buf_len += 1;
-    buf = realloc(buf, buf_len);
-    *(buf + buf_len - 1) = '\0';
-
-    cJSON *json = cJSON_ParseWithOpts(buf, NULL, TRUE);
-    text_buffer_t tex = text_buffer_create(ctx->content_size);
-
-    json_extract_text(json, &tex);
-    text_buffer_terminate_string(&tex);
-
-    APPEND_STR_META(doc, MetaContent, tex.dyn_buffer.buf);
-
-    cJSON_Delete(json);
-    free(buf);
-    text_buffer_destroy(&tex);
-
-    return SCAN_OK;
-}
-
-#define JSON_BUF_SIZE (1024 * 1024 * 5)
-
-scan_code_t parse_ndjson(scan_json_ctx_t *ctx, vfile_t *f, document_t *doc) {
-
-    char *buf = malloc(JSON_BUF_SIZE + 1);
-    *(buf + JSON_BUF_SIZE) = '\0';
-
-    text_buffer_t tex = text_buffer_create(-1);
-
-    size_t ret;
-    int eof = FALSE;
-    const char *parse_end = buf;
-    size_t to_read;
-    char *ptr = buf;
-
-    while (TRUE) {
-        cJSON *json;
-
-        if (!eof) {
-            to_read = parse_end == buf ? JSON_BUF_SIZE : parse_end - buf;
-            ret = f->read(f, ptr, to_read);
-            if (ret != to_read) {
-                eof = TRUE;
-            }
-        }
-
-        json = cJSON_ParseWithOpts(buf, &parse_end, FALSE);
-
-        if (parse_end == buf + JSON_BUF_SIZE) {
-            CTX_LOG_ERRORF("json.c", "Line too large for buffer [%s]", doc->filepath);
-            cJSON_Delete(json);
-            break;
-        }
-
-        if (parse_end == buf) {
-            cJSON_Delete(json);
-            break;
-        }
-
-        json_extract_text(json, &tex);
-
-        cJSON_Delete(json);
-
-        memmove(buf, parse_end, (buf + JSON_BUF_SIZE - parse_end));
-        ptr = buf + JSON_BUF_SIZE - parse_end + buf;
-    }
-
-    text_buffer_terminate_string(&tex);
-
-    APPEND_STR_META(doc, MetaContent, tex.dyn_buffer.buf);
-
-    free(buf);
-    text_buffer_destroy(&tex);
-}

libscan/json/json.h

@@ -1,30 +0,0 @@
-#ifndef SCAN_JSON_H
-#define SCAN_JSON_H
-
-#include "../scan.h"
-
-
-typedef struct {
-    long content_size;
-    log_callback_t log;
-    logf_callback_t logf;
-    store_callback_t store;
-    unsigned int json_mime;
-    unsigned int ndjson_mime;
-} scan_json_ctx_t;
-
-scan_code_t parse_json(scan_json_ctx_t *ctx, vfile_t *f, document_t *doc);
-
-scan_code_t parse_ndjson(scan_json_ctx_t *ctx, vfile_t *f, document_t *doc);
-
-__always_inline
-static int is_json(scan_json_ctx_t *ctx, unsigned int mime) {
-    return mime == ctx->json_mime;
-}
-
-__always_inline
-static int is_ndjson(scan_json_ctx_t *ctx, unsigned int mime) {
-    return mime == ctx->ndjson_mime;
-}
-
-#endif

libscan/msdoc/msdoc.c

@@ -6,7 +6,7 @@
 
 #include "../ebook/ebook.h"
 
-void parse_msdoc_text(scan_msdoc_ctx_t *ctx, document_t *doc, FILE *file_in, void *buf, size_t buf_len) {
+void parse_msdoc_text(scan_msdoc_ctx_t *ctx, document_t *doc, FILE *file_in, void* buf, size_t buf_len) {
 
     // Open word doc
     options_type *opts = direct_vGetOptions();
@@ -20,7 +20,7 @@ void parse_msdoc_text(scan_msdoc_ctx_t *ctx, document_t *doc, FILE *file_in, voi
     opts->iPageWidth = 595;
     opts->eImageLevel = level_ps_3;
 
-    int doc_word_version = iGuessVersionNumber(file_in, (int) buf_len);
+    int doc_word_version = iGuessVersionNumber(file_in, buf_len);
     if (doc_word_version < 0 || doc_word_version == 3) {
         free(buf);
         return;
@@ -38,19 +38,19 @@ void parse_msdoc_text(scan_msdoc_ctx_t *ctx, document_t *doc, FILE *file_in, voi
         return;
     }
 
-    iInitDocument(file_in, (int) buf_len);
-    const char *author = szGetAuthor();
+    iInitDocument(file_in, buf_len);
+    const char* author = szGetAuthor();
     if (author != NULL) {
         APPEND_UTF8_META(doc, MetaAuthor, author)
     }
 
-    const char *title = szGetTitle();
+    const char* title = szGetTitle();
     if (title != NULL) {
         APPEND_UTF8_META(doc, MetaTitle, title)
     }
     vFreeDocument();
 
-    bWordDecryptor(file_in, (int) buf_len, diag);
+    bWordDecryptor(file_in, buf_len, diag);
     vDestroyDiagram(diag);
     fclose(file_out);
 
@@ -71,7 +71,7 @@ void parse_msdoc_text(scan_msdoc_ctx_t *ctx, document_t *doc, FILE *file_in, voi
     free(out_buf);
 }
 
-void parse_msdoc_pdf(scan_msdoc_ctx_t *ctx, document_t *doc, FILE *file, void *buf, size_t buf_len) {
+void parse_msdoc_pdf(scan_msdoc_ctx_t *ctx, document_t *doc, FILE *file, void* buf, size_t buf_len) {
 
     scan_ebook_ctx_t ebook_ctx = {
             .content_size = ctx->content_size,
@@ -93,7 +93,7 @@ void parse_msdoc_pdf(scan_msdoc_ctx_t *ctx, document_t *doc, FILE *file, void *b
     opts->iPageWidth = 595;
     opts->eImageLevel = level_ps_3;
 
-    int doc_word_version = iGuessVersionNumber(file, (int) buf_len);
+    int doc_word_version = iGuessVersionNumber(file, buf_len);
     if (doc_word_version < 0 || doc_word_version == 3) {
         free(buf);
         return;
@@ -110,7 +110,7 @@ void parse_msdoc_pdf(scan_msdoc_ctx_t *ctx, document_t *doc, FILE *file, void *b
         return;
     }
 
-    bWordDecryptor(file, (int) buf_len, diag);
+    bWordDecryptor(file, buf_len, diag);
     vDestroyDiagram(diag);
 
     fclose(file_out);

libscan/scan.h

@@ -22,7 +22,6 @@ typedef void (*log_callback_t)(const char *filepath, int level, char *str);
 typedef int scan_code_t;
 #define SCAN_OK (scan_code_t) 0
 #define SCAN_ERR_READ (scan_code_t) (-1)
-#define SCAN_ERR_SKIP (scan_code_t) (-2)
 
 #define LEVEL_DEBUG 0
 #define LEVEL_INFO 1

libscan/text/text.c

@@ -35,7 +35,7 @@ scan_code_t parse_text(scan_text_ctx_t *ctx, vfile_t *f, document_t *doc) {
     return SCAN_OK;
 }
 
-#define MAX_MARKUP_SIZE (1024 * 1024)
+#define MAX_MARKUP_SIZE 1024 * 1024
 
 scan_code_t parse_markup(scan_text_ctx_t *ctx, vfile_t *f, document_t *doc) {
 

libscan/util.h

@@ -9,11 +9,11 @@
 
 #define STR_STARTS_WITH(x, y) (strncmp(y, x, sizeof(y) - 1) == 0)
 
-#define TEXT_BUF_FULL (-1)
-#define INITIAL_BUF_SIZE (1024 * 16)
+#define TEXT_BUF_FULL -1
+#define INITIAL_BUF_SIZE 1024 * 16
 
 #define SHOULD_IGNORE_CHAR(c) !(SHOULD_KEEP_CHAR(c))
-#define SHOULD_KEEP_CHAR(c) (((c) >= '\'' && (c) <= ';') || ((c) >= 'A' && (c) <= 'z') || ((c) > 127))
+#define SHOULD_KEEP_CHAR(c) ((c >= '\'' && c <= ';') || (c >= 'A' && c <= 'z') || (c > 127))
 
 
 typedef struct dyn_buffer {

libscan/wpd/libwpd_c_api.cpp

@@ -1,200 +0,0 @@
-#include "libwpd_c_api.h"
-#include "libwpd/libwpd.h"
-#include "libwpd/WPXProperty.h"
-#include "libwpd-stream/libwpd-stream.h"
-
-class StringDocument : public WPXDocumentInterface {
-
-private:
-    text_buffer_t *tex;
-    document_t *doc;
-    bool is_full;
-public:
-
-    StringDocument(text_buffer_t *tex, document_t *doc) {
-        this->tex = tex;
-        this->doc = doc;
-        this->is_full = false;
-    }
-
-    void setDocumentMetaData(const WPXPropertyList &propList) override {
-
-        WPXPropertyList::Iter propIter(propList);
-        for (propIter.rewind(); propIter.next();) {
-            // TODO: Read metadata here ?!
-        }
-    }
-
-    void endDocument() override {
-        text_buffer_terminate_string(this->tex);
-    }
-
-    void closeParagraph() override {
-        if (!this->is_full) {
-            if (text_buffer_append_char(tex, ' ') == TEXT_BUF_FULL) {
-                this->is_full = true;
-            };
-        }
-    }
-
-    void closeSpan() override {
-        if (!this->is_full) {
-            if (text_buffer_append_char(tex, ' ') == TEXT_BUF_FULL) {
-                this->is_full = true;
-            };
-        }
-    }
-
-    void closeSection() override {
-        if (!this->is_full) {
-            if (text_buffer_append_char(tex, ' ') == TEXT_BUF_FULL) {
-                this->is_full = true;
-            };
-        }
-    }
-
-    void insertTab() override {
-        if (!this->is_full) {
-            if (text_buffer_append_char(tex, ' ') == TEXT_BUF_FULL) {
-                this->is_full = true;
-            };
-        }
-    }
-
-    void insertSpace() override {
-        if (!this->is_full) {
-            if (text_buffer_append_char(tex, ' ') == TEXT_BUF_FULL) {
-                this->is_full = true;
-            };
-        }
-    }
-
-    void insertText(const WPXString &text) override {
-        if (!this->is_full) {
-            if (text_buffer_append_string0(tex, text.cstr()) == TEXT_BUF_FULL) {
-                this->is_full = true;
-            };
-        }
-    }
-
-    void insertLineBreak() override {
-        if (!this->is_full) {
-            if (text_buffer_append_char(tex, ' ') == TEXT_BUF_FULL) {
-                this->is_full = true;
-            };
-        }
-    }
-
-    void definePageStyle(const WPXPropertyList &propList) override { /* noop */ }
-
-    void closePageSpan() override { /* noop */ }
-
-    void openHeader(const WPXPropertyList &propList) override { /* noop */ }
-
-    void closeHeader() override { /* noop */ }
-
-    void openFooter(const WPXPropertyList &propList) override { /* noop */ }
-
-    void closeFooter() override { /* noop */ }
-
-    void
-    defineParagraphStyle(const WPXPropertyList &propList, const WPXPropertyListVector &tabStops) override { /* noop */ }
-
-    void openParagraph(const WPXPropertyList &propList, const WPXPropertyListVector &tabStops) override { /* noop */ }
-
-    void defineCharacterStyle(const WPXPropertyList &propList) override { /* noop */ }
-
-    void openSpan(const WPXPropertyList &propList) override { /* noop */ }
-
-    void
-    defineSectionStyle(const WPXPropertyList &propList, const WPXPropertyListVector &columns) override { /* noop */ }
-
-    void openSection(const WPXPropertyList &propList, const WPXPropertyListVector &columns) override { /* noop */ }
-
-    void insertField(const WPXString &type, const WPXPropertyList &propList) override { /* noop */ }
-
-    void defineOrderedListLevel(const WPXPropertyList &propList) override { /* noop */ }
-
-    void defineUnorderedListLevel(const WPXPropertyList &propList) override { /* noop */ }
-
-    void openOrderedListLevel(const WPXPropertyList &propList) override { /* noop */ }
-
-    void openUnorderedListLevel(const WPXPropertyList &propList) override { /* noop */ }
-
-    void closeOrderedListLevel() override { /* noop */ }
-
-    void closeUnorderedListLevel() override { /* noop */ }
-
-    void openListElement(const WPXPropertyList &propList, const WPXPropertyListVector &tabStops) override { /* noop */ }
-
-    void closeListElement() override { /* noop */ }
-
-    void openFootnote(const WPXPropertyList &propList) override { /* noop */ }
-
-    void closeFootnote() override { /* noop */ }
-
-    void openEndnote(const WPXPropertyList &propList) override { /* noop */ }
-
-    void closeEndnote() override { /* noop */ }
-
-    void openComment(const WPXPropertyList &propList) override { /* noop */ }
-
-    void closeComment() override { /* noop */ }
-
-    void openTextBox(const WPXPropertyList &propList) override { /* noop */ }
-
-    void closeTextBox() override { /* noop */ }
-
-    void openTable(const WPXPropertyList &propList, const WPXPropertyListVector &columns) override { /* noop */ }
-
-    void openTableRow(const WPXPropertyList &propList) override { /* noop */ }
-
-    void closeTableRow() override { /* noop */ }
-
-    void openTableCell(const WPXPropertyList &propList) override { /* noop */ }
-
-    void closeTableCell() override { /* noop */ }
-
-    void insertCoveredTableCell(const WPXPropertyList &propList) override { /* noop */ }
-
-    void closeTable() override { /* noop */ }
-
-    void openFrame(const WPXPropertyList &propList) override { /* noop */ }
-
-    void closeFrame() override { /* noop */ }
-
-    void insertBinaryObject(const WPXPropertyList &propList, const WPXBinaryData &data) override { /* noop */ }
-
-    void insertEquation(const WPXPropertyList &propList, const WPXString &data) override { /* noop */ }
-
-    void openPageSpan(const WPXPropertyList &propList) override { /* noop */ }
-
-    void startDocument() override { /* noop */ };
-};
-
-
-wpd_stream_t wpd_memory_stream_create(const unsigned char *buf, size_t buf_len) {
-    auto *input = new WPXStringStream(buf, buf_len);
-    return input;
-}
-
-wpd_confidence_t wpd_is_file_format_supported(wpd_stream_t ptr) {
-    auto *stream = (WPXStringStream *) ptr;
-    WPDConfidence confidence = WPDocument::isFileFormatSupported(stream);
-
-    return (wpd_confidence_t) confidence;
-}
-
-wpd_result_t wpd_parse(wpd_stream_t ptr, text_buffer_t *tex, document_t *doc) {
-    auto *stream = (WPXStringStream *) ptr;
-
-    auto myDoc = StringDocument(tex, doc);
-    WPDResult result2 = WPDocument::parse(stream, &myDoc, nullptr);
-
-    return (wpd_result_t) result2;
-}
-
-void wpd_memory_stream_destroy(wpd_stream_t ptr) {
-    auto *stream = (WPXStringStream *) ptr;
-    delete stream;
-}

libscan/wpd/libwpd_c_api.h

@@ -1,50 +0,0 @@
-#ifndef SIST2_LIBWPD_C_API_H
-#define SIST2_LIBWPD_C_API_H
-
-#include "stdlib.h"
-
-#ifdef __cplusplus
-#define EXTERNC extern "C"
-#else
-#define EXTERNC
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#include "../scan.h"
-#include "../util.h"
-#ifdef __cplusplus
-};
-#endif
-
-
-typedef void *wpd_stream_t;
-
-typedef enum {
-    C_WPD_CONFIDENCE_NONE = 0,
-    C_WPD_CONFIDENCE_UNSUPPORTED_ENCRYPTION,
-    C_WPD_CONFIDENCE_SUPPORTED_ENCRYPTION,
-    C_WPD_CONFIDENCE_EXCELLENT
-} wpd_confidence_t;
-
-typedef enum {
-    C_WPD_OK,
-    C_WPD_FILE_ACCESS_ERROR,
-    C_WPD_PARSE_ERROR,
-    C_WPD_UNSUPPORTED_ENCRYPTION_ERROR,
-    C_WPD_PASSWORD_MISSMATCH_ERROR,
-    C_WPD_OLE_ERROR,
-    C_WPD_UNKNOWN_ERROR
-} wpd_result_t;
-
-
-EXTERNC wpd_confidence_t wpd_is_file_format_supported(wpd_stream_t stream);
-
-EXTERNC wpd_stream_t wpd_memory_stream_create(const unsigned char *buf, size_t buf_len);
-
-EXTERNC void wpd_memory_stream_destroy(wpd_stream_t stream);
-
-EXTERNC wpd_result_t wpd_parse(wpd_stream_t ptr, text_buffer_t *tex, document_t *doc);
-
-#endif

libscan/wpd/wpd.c

@@ -1,41 +0,0 @@
-#include "wpd.h"
-#include "libwpd_c_api.h"
-
-scan_code_t parse_wpd(scan_wpd_ctx_t *ctx, vfile_t *f, document_t *doc) {
-
-    size_t buf_len;
-    void *buf = read_all(f, &buf_len);
-
-    void *stream = wpd_memory_stream_create(buf, buf_len);
-    wpd_confidence_t conf = wpd_is_file_format_supported(stream);
-
-    if (conf == C_WPD_CONFIDENCE_SUPPORTED_ENCRYPTION || conf == C_WPD_CONFIDENCE_UNSUPPORTED_ENCRYPTION) {
-        CTX_LOG_DEBUGF("wpd.c", "File is encrypted! Password-protected WPD files are not supported yet (conf=%d)", conf)
-        wpd_memory_stream_destroy(stream);
-        free(buf);
-        return SCAN_ERR_READ;
-    }
-
-    if (conf != C_WPD_CONFIDENCE_EXCELLENT) {
-        CTX_LOG_ERRORF("wpd.c", "Unsupported file format! [%s] (conf=%d)", doc->filepath, conf)
-        wpd_memory_stream_destroy(stream);
-        free(buf);
-        return SCAN_ERR_READ;
-    }
-
-    text_buffer_t tex = text_buffer_create(-1);
-    wpd_result_t res = wpd_parse(stream, &tex, doc);
-
-    if (res != C_WPD_OK) {
-        CTX_LOG_ERRORF("wpd.c", "Error while parsing WPD file [%s] (%d)",
-                       doc->filepath, res)
-    }
-
-    if (tex.dyn_buffer.cur != 0) {
-        APPEND_STR_META(doc, MetaContent, tex.dyn_buffer.buf)
-    }
-
-    text_buffer_destroy(&tex);
-    wpd_memory_stream_destroy(stream);
-    free(buf);
-}

libscan/wpd/wpd.h

@@ -1,23 +0,0 @@
-#ifndef SIST2_WPD_H
-#define SIST2_WPD_H
-
-#include "../scan.h"
-#include "../util.h"
-
-typedef struct {
-    long content_size;
-
-    log_callback_t log;
-    logf_callback_t logf;
-
-    unsigned int wpd_mime;
-} scan_wpd_ctx_t;
-
-scan_code_t parse_wpd(scan_wpd_ctx_t *ctx, vfile_t *f, document_t *doc);
-
-__always_inline
-static int is_wpd(scan_wpd_ctx_t *ctx, unsigned int mime) {
-    return mime == ctx->wpd_mime;
-}
-
-#endif

test/main.cpp

@@ -11,8 +11,6 @@ extern "C" {
 #include "../libscan/mobi/scan_mobi.h"
 #include "../libscan/raw/raw.h"
 #include "../libscan/msdoc/msdoc.h"
-#include "../libscan/wpd/wpd.h"
-#include "../libscan/json/json.h"
 #include <libavutil/avutil.h>
 }
 
@@ -41,10 +39,6 @@ static scan_msdoc_ctx_t msdoc_ctx;
 
 static scan_msdoc_ctx_t msdoc_text_ctx;
 
-static scan_wpd_ctx_t wpd_ctx;
-
-static scan_json_ctx_t json_ctx;
-
 
 document_t LastSubDoc;
 
@@ -948,7 +942,7 @@ TEST(Msdoc, TestFuzz1) {
 
     for (int i = 0; i < 1000; i++) {
         size_t buf_len_copy = buf_len;
-        char *buf_copy = (char *) malloc(buf_len);
+        char *buf_copy = (char*)malloc(buf_len);
         memcpy(buf_copy, buf, buf_len);
 
         fuzz_buffer(buf_copy, &buf_len_copy, 3, 8, 5);
@@ -959,38 +953,6 @@ TEST(Msdoc, TestFuzz1) {
     cleanup(&doc, &f);
 }
 
-TEST(Wpd, Wpd51_1) {
-    vfile_t f;
-    document_t doc;
-    load_doc_file("libscan-test-files/test_files/wpd/test51_1.wpd", &f, &doc);
-
-    parse_wpd(&wpd_ctx, &f, &doc);
-
-    ASSERT_STREQ(get_meta(&doc, MetaContent)->str_val,
-                 "Hello, WordPerfect This is a test This is the next page This is another page");
-
-    cleanup(&doc, &f);
-}
-
-TEST(Json, Json1) {
-    vfile_t f;
-    document_t doc;
-    load_doc_file("libscan-test-files/test_files/json/json1.json", &f, &doc);
-
-    parse_json(&json_ctx, &f, &doc);
-
-    cleanup(&doc, &f);
-}
-
-TEST(Json, NDJson1) {
-    vfile_t f;
-    document_t doc;
-    load_doc_file("libscan-test-files/test_files/json/ndjson1.jsonl", &f, &doc);
-
-    parse_ndjson(&json_ctx, &f, &doc);
-
-    cleanup(&doc, &f);
-}
 
 int main(int argc, char **argv) {
     setlocale(LC_ALL, "");
@@ -1072,14 +1034,6 @@ int main(int argc, char **argv) {
     msdoc_text_ctx.content_size = 500;
     msdoc_text_ctx.tn_size = 0;
 
-    wpd_ctx.log = noop_log;
-    wpd_ctx.logf = noop_logf;
-    wpd_ctx.content_size = 500;
-
-    json_ctx.log = noop_log;
-    json_ctx.logf = noop_logf;
-    json_ctx.content_size = 5000;
-
     av_log_set_level(AV_LOG_QUIET);
     ::testing::InitGoogleTest(&argc, argv);
     return RUN_ALL_TESTS();