# Conflicts:
#	src/training/combine_tessdata.cpp

# Conflicts:
#	src/ccutil/errcode.h
#	src/ccutil/serialis.cpp
#	src/ccutil/tprintf.h
#	src/viewer/scrollview.h

# Conflicts:
#	Makefile.am
#	src/ccutil/helpers.h
#	src/ccutil/scanutils.h
#	src/ccutil/tprintf.h
#	unittest/Makefile.am

# Conflicts:
#	dll/i686-w64-mingw32/iconv.dll
#	dll/i686-w64-mingw32/icudt64.dll
#	dll/i686-w64-mingw32/icuin64.dll
#	dll/i686-w64-mingw32/icuuc64.dll
#	dll/i686-w64-mingw32/libarchive-13.dll
#	dll/i686-w64-mingw32/libbz2-1.dll
#	dll/i686-w64-mingw32/libcairo-2.dll
#	dll/i686-w64-mingw32/libcurl-4.dll
#	dll/i686-w64-mingw32/libeay32.dll
#	dll/i686-w64-mingw32/libexpat-1.dll
#	dll/i686-w64-mingw32/libffi-6.dll
#	dll/i686-w64-mingw32/libfontconfig-1.dll
#	dll/i686-w64-mingw32/libfreetype-6.dll
#	dll/i686-w64-mingw32/libgcc_s_sjlj-1.dll
#	dll/i686-w64-mingw32/libgif-7.dll
#	dll/i686-w64-mingw32/libglib-2.0-0.dll
#	dll/i686-w64-mingw32/libgobject-2.0-0.dll
#	dll/i686-w64-mingw32/libgomp-1.dll
#	dll/i686-w64-mingw32/libharfbuzz-0.dll
#	dll/i686-w64-mingw32/libintl-8.dll
#	dll/i686-w64-mingw32/libjbig-2.dll
#	dll/i686-w64-mingw32/libjpeg-8.dll
#	dll/i686-w64-mingw32/liblept-5.dll
#	dll/i686-w64-mingw32/liblz4-1.dll
#	dll/i686-w64-mingw32/liblzma-5.dll
#	dll/i686-w64-mingw32/liblzo2-2.dll
#	dll/i686-w64-mingw32/libnettle-6.dll
#	dll/i686-w64-mingw32/libnghttp2-14.dll
#	dll/i686-w64-mingw32/libopenjp2.dll
#	dll/i686-w64-mingw32/libpango-1.0-0.dll
#	dll/i686-w64-mingw32/libpangocairo-1.0-0.dll
#	dll/i686-w64-mingw32/libpangoft2-1.0-0.dll
#	dll/i686-w64-mingw32/libpangowin32-1.0-0.dll
#	dll/i686-w64-mingw32/libpcre-1.dll
#	dll/i686-w64-mingw32/libpixman-1-0.dll
#	dll/i686-w64-mingw32/libpng16-16.dll
#	dll/i686-w64-mingw32/libssh2-1.dll
#	dll/i686-w64-mingw32/libstdc++-6.dll
#	dll/i686-w64-mingw32/libtiff-5.dll
#	dll/i686-w64-mingw32/libwebp-7.dll
#	dll/i686-w64-mingw32/libwinpthread-1.dll
#	dll/i686-w64-mingw32/libxml2-2.dll
#	dll/i686-w64-mingw32/libzstd-1.dll
#	dll/i686-w64-mingw32/ssleay32.dll
#	dll/i686-w64-mingw32/zlib1.dll
#	dll/x86_64-w64-mingw32/iconv.dll
#	dll/x86_64-w64-mingw32/icudt64.dll
#	dll/x86_64-w64-mingw32/icuin64.dll
#	dll/x86_64-w64-mingw32/icuuc64.dll
#	dll/x86_64-w64-mingw32/libarchive-13.dll
#	dll/x86_64-w64-mingw32/libbz2-1.dll
#	dll/x86_64-w64-mingw32/libcairo-2.dll
#	dll/x86_64-w64-mingw32/libcurl-4.dll
#	dll/x86_64-w64-mingw32/libeay32.dll
#	dll/x86_64-w64-mingw32/libexpat-1.dll
#	dll/x86_64-w64-mingw32/libffi-6.dll
#	dll/x86_64-w64-mingw32/libfontconfig-1.dll
#	dll/x86_64-w64-mingw32/libfreetype-6.dll
#	dll/x86_64-w64-mingw32/libgcc_s_seh-1.dll
#	dll/x86_64-w64-mingw32/libgif-7.dll
#	dll/x86_64-w64-mingw32/libglib-2.0-0.dll
#	dll/x86_64-w64-mingw32/libgobject-2.0-0.dll
#	dll/x86_64-w64-mingw32/libgomp-1.dll
#	dll/x86_64-w64-mingw32/libharfbuzz-0.dll
#	dll/x86_64-w64-mingw32/libintl-8.dll
#	dll/x86_64-w64-mingw32/libjbig-2.dll
#	dll/x86_64-w64-mingw32/libjpeg-8.dll
#	dll/x86_64-w64-mingw32/liblept-5.dll
#	dll/x86_64-w64-mingw32/liblz4-1.dll
#	dll/x86_64-w64-mingw32/liblzma-5.dll
#	dll/x86_64-w64-mingw32/liblzo2-2.dll
#	dll/x86_64-w64-mingw32/libnettle-6.dll
#	dll/x86_64-w64-mingw32/libnghttp2-14.dll
#	dll/x86_64-w64-mingw32/libopenjp2.dll
#	dll/x86_64-w64-mingw32/libpango-1.0-0.dll
#	dll/x86_64-w64-mingw32/libpangocairo-1.0-0.dll
#	dll/x86_64-w64-mingw32/libpangoft2-1.0-0.dll
#	dll/x86_64-w64-mingw32/libpangowin32-1.0-0.dll
#	dll/x86_64-w64-mingw32/libpcre-1.dll
#	dll/x86_64-w64-mingw32/libpixman-1-0.dll
#	dll/x86_64-w64-mingw32/libpng16-16.dll
#	dll/x86_64-w64-mingw32/libssh2-1.dll
#	dll/x86_64-w64-mingw32/libstdc++-6.dll
#	dll/x86_64-w64-mingw32/libtiff-5.dll
#	dll/x86_64-w64-mingw32/libwebp-7.dll
#	dll/x86_64-w64-mingw32/libwinpthread-1.dll
#	dll/x86_64-w64-mingw32/libxml2-2.dll
#	dll/x86_64-w64-mingw32/libzstd-1.dll
#	dll/x86_64-w64-mingw32/ssleay32.dll
#	dll/x86_64-w64-mingw32/zlib1.dll
#	src/ccutil/errcode.h
#	src/ccutil/tprintf.h
#	src/viewer/scrollview.h

# Conflicts:
#	configure.ac

# Conflicts:
#	Makefile.am
#	unittest/Makefile.am

# Conflicts:
#	src/api/pdfrenderer.cpp

…er merge

Signed-off-by: Stefan Weil <[email protected]>

Signed-off-by: Stefan Weil <[email protected]>

Signed-off-by: Stefan Weil <[email protected]>

Signed-off-by: Stefan Weil <[email protected]>

Signed-off-by: Stefan Weil <[email protected]>

Signed-off-by: Stefan Weil <[email protected]>

Signed-off-by: Stefan Weil <[email protected]>

Signed-off-by: Stefan Weil <[email protected]>

Signed-off-by: Stefan Weil <[email protected]>

Signed-off-by: Stefan Weil <[email protected]>

Signed-off-by: Stefan Weil <[email protected]>

Signed-off-by: Stefan Weil <[email protected]>

Signed-off-by: Stefan Weil <[email protected]>

# Conflicts:
#	.github/workflows/sw.yml
#	src/api/tesseractmain.cpp

- make sure everyone uses tprintf() instead of printf() / fprintf(), so any print output gets routed through the fz_error/warning/info calls and lands in a place where we can actually see/do something with it.

# Conflicts:
#	src/api/tesseractmain.cpp

# Conflicts:
#	src/api/tesseractmain.cpp

# Conflicts:
#	src/api/tesseractmain.cpp

# Conflicts:
#	src/arch/simddetect.cpp

exported each utility as a separate function (to be invoked via `mutool`)

# Conflicts:
#	src/ccutil/serialis.cpp
#	src/ccutil/serialis.h
#	src/ccutil/unicharcompress.cpp

# Conflicts:
#	src/ccmain/tessedit.cpp
#	src/ccmain/tesseractclass.h
#	src/ccutil/strngs.cpp
#	src/ccutil/strngs.h
#	src/lstm/lstmrecognizer.cpp

… make this codebase compile.

… make this codebase compile.

# Conflicts:
#	include/tesseract/baseapi.h
#	include/tesseract/capi.h
#	include/tesseract/export.h
#	src/api/baseapi.cpp
#	src/api/capi.cpp
#	src/api/pdfrenderer.cpp
#	src/api/tesseractmain.cpp
#	src/arch/simddetect.cpp
#	src/ccmain/applybox.cpp
#	src/ccmain/output.cpp
#	src/ccmain/pageiterator.cpp
#	src/ccmain/paragraphs.cpp
#	src/ccmain/resultiterator.cpp
#	src/ccmain/tessedit.cpp
#	src/ccmain/tesseractclass.h
#	src/ccmain/thresholder.cpp
#	src/ccstruct/boxread.cpp
#	src/ccstruct/coutln.h
#	src/ccstruct/imagedata.cpp
#	src/ccstruct/mod128.cpp
#	src/ccstruct/ocrblock.cpp
#	src/ccstruct/points.h
#	src/ccstruct/polyaprx.cpp
#	src/ccstruct/rect.h
#	src/ccutil/errcode.h
#	src/ccutil/genericvector.h
#	src/ccutil/host.h
#	src/ccutil/params.cpp
#	src/ccutil/scanutils.h
#	src/ccutil/serialis.cpp
#	src/ccutil/strngs.cpp
#	src/ccutil/strngs.h
#	src/ccutil/tessdatamanager.cpp
#	src/ccutil/tessdatamanager.h
#	src/ccutil/tprintf.cpp
#	src/ccutil/tprintf.h
#	src/ccutil/unicharcompress.cpp
#	src/ccutil/unicharcompress.h
#	src/ccutil/unicharset.cpp
#	src/dict/dawg.cpp
#	src/dict/permdawg.cpp
#	src/dict/stopper.cpp
#	src/dict/trie.cpp
#	src/lstm/input.cpp
#	src/lstm/lstmrecognizer.cpp
#	src/lstm/recodebeam.cpp
#	src/lstm/series.cpp
#	src/lstm/tfnetwork.cpp
#	src/lstm/tfnetwork.h
#	src/opencl/oclkernels.h
#	src/opencl/openclwrapper.h
#	src/textord/blkocc.cpp
#	src/textord/drawtord.cpp
#	src/textord/fpchop.cpp
#	src/textord/makerow.cpp
#	src/textord/oldbasel.cpp
#	src/textord/pithsync.cpp
#	src/textord/pitsync1.cpp
#	src/textord/strokewidth.cpp
#	src/textord/topitch.cpp
#	src/textord/tordmain.cpp
#	src/textord/tospace.cpp
#	src/textord/wordseg.cpp
#	src/training/ambiguous_words.cpp
#	src/training/classifier_tester.cpp
#	src/training/cntraining.cpp
#	src/training/combine_lang_model.cpp
#	src/training/combine_tessdata.cpp
#	src/training/common/commandlineflags.cpp
#	src/training/common/commandlineflags.h
#	src/training/common/commontraining.cpp
#	src/training/common/commontraining.h
#	src/training/common/mastertrainer.h
#	src/training/dawg2wordlist.cpp
#	src/training/lstmeval.cpp
#	src/training/lstmtraining.cpp
#	src/training/merge_unicharsets.cpp
#	src/training/mftraining.cpp
#	src/training/pango/boxchar.cpp
#	src/training/pango/boxchar.h
#	src/training/pango/ligature_table.cpp
#	src/training/pango/pango_font_info.cpp
#	src/training/pango/pango_font_info.h
#	src/training/pango/stringrenderer.cpp
#	src/training/pango/stringrenderer.h
#	src/training/set_unicharset_properties.cpp
#	src/training/text2image.cpp
#	src/training/unicharset/icuerrorcode.cpp
#	src/training/unicharset/icuerrorcode.h
#	src/training/unicharset/normstrngs.cpp
#	src/training/unicharset/unicharset_training_utils.cpp
#	src/training/unicharset/validate_grapheme.cpp
#	src/training/unicharset/validate_myanmar.cpp
#	src/training/unicharset/validator.cpp
#	src/training/unicharset_extractor.cpp
#	src/training/wordlist2dawg.cpp
#	src/viewer/scrollview.h

…ages are prefixed with 'ERROR:' (and warning messages with 'WARNING:') for proper handling and dispatching in caller code (MuPDF-based tools which feed these messages to log file(s))

…onment variable has not been set. This modifies the beehaviour as mentioned in commit SHA-1: 55d87f6

…e in Leptonica: I guess someone created or at least *edited* the CMakefiles for both)

# Conflicts:
#	src/api/capi.cpp
#	src/training/common/commandlineflags.cpp

# Conflicts:
#	src/api/tesseractmain.cpp

Originally, this code would have complained if it was ever compiled
on a platform that didn't support it.

We changed this so that every file could be built on every platform
for simplicity of build files. Attempting to build (say) an SSE
file on a platform that didn't support SSE will just compile away
to nothing.

Unfortunately, while making this change, I didn't remove the
slightly strange state whereby it would be impossible to build
without SSE optimisations on a platform that supported them.

To fix this, I've removed the lines.

Also fix a missing \ at line ending

…lt optimisations

… ensure all .h files are correctly included in the build

# Conflicts:
#	src/arch/dotproductavx.cpp
#	src/arch/dotproductfma.cpp
#	src/arch/dotproductsse.cpp
#	src/arch/intsimdmatrixavx2.cpp
#	src/arch/intsimdmatrixsse.cpp

# Conflicts:
#	src/ccmain/paragraphs.cpp
#	src/dict/trie.cpp
#	src/training/unicharset/icuerrorcode.h
#	src/training/unicharset_extractor.cpp

# Conflicts:
#	abseil
#	src/api/baseapi.cpp
#	src/api/pdfrenderer.cpp
#	src/api/tesseractmain.cpp
#	src/ccmain/applybox.cpp
#	src/ccmain/pagesegmain.cpp
#	src/ccstruct/imagedata.cpp
#	src/ccstruct/mod128.cpp
#	src/ccstruct/pageres.cpp
#	src/lstm/lstmrecognizer.cpp
#	src/textord/colpartitiongrid.cpp
#	src/textord/makerow.cpp
#	src/textord/oldbasel.cpp
#	src/textord/strokewidth.cpp
#	src/textord/topitch.cpp
#	src/training/combine_tessdata.cpp
#	src/training/mftraining.cpp
#	src/training/text2image.cpp
#	src/training/unicharset/lang_model_helpers.cpp
#	src/training/unicharset/validate_grapheme.cpp
#	src/training/unicharset/validate_indic.cpp
#	src/training/unicharset/validate_javanese.cpp

# Conflicts:
#	src/training/unicharset/lang_model_helpers.cpp

# Conflicts:
#	src/lstm/input.cpp
#	src/lstm/lstmrecognizer.cpp
#	src/viewer/scrollview.h

Signed-off-by: Stefan Weil <[email protected]>

Signed-off-by: Stefan Weil <[email protected]>

Signed-off-by: Stefan Weil <[email protected]>

# Conflicts:
#	abseil

# Conflicts:
#	include/tesseract/baseapi.h
#	include/tesseract/capi.h
#	src/api/tesseractmain.cpp