+ README

Author: 4lex4

CMakeLists.txt

@@ -6,7 +6,7 @@ IF (DEBUG_CLI)
     ADD_DEFINITIONS(-DDEBUG_CLI)
 ENDIF (DEBUG_CLI)
 
-ENABLE_TESTING()
+#ENABLE_TESTING()
 
 # This has to go quite early on, as otherwise we risk picking
 # up an identically named header from a system include path.
@@ -290,18 +290,18 @@ LINK_DIRECTORIES(${Qt5LinguistTools_LIBRARIES})
 
 #=================================== OpenCV ===================================#
 
-IF (FALSE)
-    find_package(OpenCV PATHS opencv_dir_ REQUIRED)
-    IF (NOT OpenCV_FOUND)
-        MESSAGE(
-                FATAL_ERROR
-                "Could not find OpenCV headers or libraries.\n"
-        )
-    ENDIF ()
 
-    INCLUDE_DIRECTORIES(${OpenCV_INCLUDE_DIRS})
-    LINK_DIRECTORIES(${OpenCV_LIBRARIES})
-ENDIF (FALSE)
+#   find_package(OpenCV PATHS opencv_dir_ REQUIRED)
+#   IF (NOT OpenCV_FOUND)
+#       MESSAGE(
+#               FATAL_ERROR
+#               "Could not find OpenCV headers or libraries.\n"
+#       )
+#   ENDIF ()
+#
+#   INCLUDE_DIRECTORIES(${OpenCV_INCLUDE_DIRS})
+#   LINK_DIRECTORIES(${OpenCV_LIBRARIES})
+
 
 #=================================== Main ===================================#
 
@@ -325,7 +325,7 @@ ADD_SUBDIRECTORY(math)
 ADD_SUBDIRECTORY(imageproc)
 ADD_SUBDIRECTORY(interaction)
 ADD_SUBDIRECTORY(zones)
-ADD_SUBDIRECTORY(tests)
+#ADD_SUBDIRECTORY(tests)
 
 FILE(GLOB common_ui_files ui/ErrorWidget.ui)
 FILE(GLOB gui_only_ui_files "ui/*.ui")
@@ -430,6 +430,9 @@ SET(
         FileNameDisambiguator.cpp FileNameDisambiguator.h
         OpenGLSupport.cpp OpenGLSupport.h
         OutputFileNameGenerator.cpp OutputFileNameGenerator.h
+	DarkScheme.cpp DarkScheme.h
+        LightScheme.cpp LightScheme.h
+        ColorSchemeManager.cpp ColorSchemeManager.h
         PageRange.cpp PageRange.h
         SelectedPage.cpp SelectedPage.h
         Utils.cpp Utils.h
@@ -456,9 +459,6 @@ SET(
 SET(
         gui_only_sources
         Application.cpp Application.h
-		DarkScheme.cpp DarkScheme.h
-        LightScheme.cpp LightScheme.h
-        ColorSchemeManager.cpp ColorSchemeManager.h
         SkinnedButton.cpp SkinnedButton.h
         RelinkablePathVisualization.cpp RelinkablePathVisualization.h
         RelinkingModel.cpp RelinkingModel.h
@@ -522,7 +522,7 @@ ADD_EXECUTABLE(
         ${resource_sources} ${win32_resource_file} resources/icons/COPYING
 )
 
-ADD_EXECUTABLE(scantailor-cli ${cli_only_sources} ${common_ui_sources})
+#ADD_EXECUTABLE(scantailor-cli ${cli_only_sources} ${common_ui_sources})
 
 TARGET_LINK_LIBRARIES(
         scantailor
@@ -532,27 +532,28 @@ TARGET_LINK_LIBRARIES(
         ${Qt5OpenGL_LIBRARIES} ${Qt5LinguistTools_LIBRARIES} ${EXTRA_LIBS}
         # ${OpenCV_LIBRARIES}
 )
-TARGET_LINK_LIBRARIES(
-        scantailor-cli
-        fix_orientation page_split deskew select_content page_layout output
-        stcore dewarping zones interaction imageproc math foundation
-        ${Qt5Core_LIBRARIES} ${Qt5Widgets_LIBRARIES} ${Qt5Xml_LIBRARIES} ${Qt5Network_LIBRARIES}
-        ${Qt5LinguistTools_LIBRARIES} ${EXTRA_LIBS}
-        # ${OpenCV_LIBRARIES}
-)
+#TARGET_LINK_LIBRARIES(
+#        scantailor-cli
+#        fix_orientation page_split deskew select_content page_layout output
+#        stcore dewarping zones interaction imageproc math foundation
+#        ${Qt5Core_LIBRARIES} ${Qt5Widgets_LIBRARIES} ${Qt5Xml_LIBRARIES} ${Qt5Network_LIBRARIES}
+#        ${Qt5LinguistTools_LIBRARIES} ${EXTRA_LIBS}
+#        # ${OpenCV_LIBRARIES}
+#)
 
 if (WIN32)
     TARGET_LINK_LIBRARIES(
             scantailor
             wsock32 ws2_32
     )
-    TARGET_LINK_LIBRARIES(
-            scantailor-cli
-            wsock32 ws2_32
-    )
+#    TARGET_LINK_LIBRARIES(
+#            scantailor-cli
+#            wsock32 ws2_32
+#    )
 endif ()
 
-INSTALL(TARGETS scantailor scantailor-cli RUNTIME DESTINATION bin)
+#INSTALL(TARGETS scantailor scantailor-cli RUNTIME DESTINATION bin)
+INSTALL(TARGETS scantailor RUNTIME DESTINATION bin)
 
 # Translations
 TRANSLATION_SOURCES(scantailor ${sources} ${ui_files})

README.md

@@ -8,28 +8,28 @@ brings new ones and fixes.
 #### <u>Contents</u>:
 * [Description](#description)
 * [Features](#features)
-    * [**Scan Tailor Enhanced** features](#**scan-tailor-enhanced**-features)
+    * [**Scan Tailor Enhanced** features](#scan-tailor-enhanced-features)
         * [Auto margins](#auto-margins)
         * [Page detect](#page-detect)
         * [Deviation](#deviation)
         * [Picture shape](#picture-shape)
         * [Tiff compression](#tiff-compression)
-        * [Multi column thumbnails view \[reworked\]](#multi-column-thumbnails-view-\[reworked\])
-    * [**Scan Tailor Featured** features](#**scan-tailor-featured**-features)
+        * [Multi column thumbnails view \[reworked\]](#multi-column-thumbnails-view-reworked)
+    * [**Scan Tailor Featured** features](#scan-tailor-featured-features)
         * [Scan Tailor Featured fixes](#scan-tailor-featured-fixes)
         * [Line vertical dragging on dewarp](#line-vertical-dragging-on-dewarp)
         * [Square picture zones](#square-picture-zones)
-        * [Auto save project \[optimized\]](#auto-save-project-\[optimized\])
+        * [Auto save project \[optimized\]](#auto-save-project-optimized)
         * [Quadro Zoner](#quadro-zoner)
         * [Marginal dewarping](#marginal-dewarping)
-    * [**Scan Tailor Advanced** features](#**scan-tailor-advanced**-features)
+    * [**Scan Tailor Advanced** features](#scan-tailor-advanced-features)
         * [Scan Tailor Advanced fixes](#scan-tailor-advanced-fixes)
         * [Light and Dark color schemes](#light-and-dark-color-schemes)
         * [Multi-threading support for batch processing](#multi-threading-support-for-batch-processing)
         * [Full control over settings on output](#full-control-over-settings-on-output)
         * [Adaptive binarization](#adaptive-binarization)
         * [Splitting output](#splitting-output)
-* Building (work on the section in progress)
+* [Building](#building)
 
 Description
 ------------
@@ -112,8 +112,8 @@ Features
  *This feature had performance issues and has been optimized.*
 
 * ##### Quadro Zoner
- Another rectangular picture zone shape. This option is based on [Picture shape](picture-shape),
- [Square picture zones](square-picture-zones). It squeezes every Picture shape zone down to the real
+ Another rectangular picture zone shape. This option is based on [Picture shape](#picture-shape),
+ [Square picture zones](#square-picture-zones). It squeezes every Picture shape zone down to the real
  rectangular picture outline and then replaces it (the resulting raster zone) by a vector rectangular zone,
  so that a user could easily adjust it afterwards (by moving its corners in an orthogonal manner).
 
@@ -143,7 +143,7 @@ Features
 
 4. Optimized memory usage on the output stage.
 
-5. Reworking on [Multi column thumbnails view](#multi-column-thumbnails-view-\[reworked\])
+5. Reworking on [Multi column thumbnails view](#multi-column-thumbnails-view-reworked)
    feature from ver. Enhanced. 
    Now thumbnails is shown evenly.
 
@@ -153,6 +153,7 @@ Features
 * ##### Multi-threading support for batch processing
  This significantly increases the speed of processing. The count of threads to use can be
  adjusted while processing.
+
  **Warning!** More threads requires more memory to use. Exclude situations of that to be overflowed.  
 
 * ##### Full control over settings on output
@@ -168,12 +169,17 @@ Features
  The feature allows to split the mixed output scans into the pairs of a foreground (letters) 
  and background (images) layer.
 
- You can choose between B&W or Color foreground.
+ You can choose between B&W or color (original) foreground.
 
  It can be useful:
- - for the further DjVu encoding,
- - to apply different filters to letters and images, which when being applied to the whole
-   image gives worse results.
+   -    for the further DjVu encoding,
+   -    to apply different filters to letters and images, which when being applied to the whole
+        image gives worse results.
 
- This does not rename files to 0001, 0002... It can be made by a third party app, for example 
- [Bulk Rename Utility](http://www.bulkrenameutility.co.uk/Main_Intro.php)
+ *Note: That does not rename files to 0001, 0002... It can be made by a third party app, for example 
+ [Bulk Rename Utility](http://www.bulkrenameutility.co.uk/Main_Intro.php)*
+
+Building
+----------
+
+Go to [this repository](https://github.com/4lex4/scantailor-libs-build) and follow the instructions given there.

WorkerThreadPool.cpp

@@ -105,7 +105,17 @@ void WorkerThreadPool::customEvent(QEvent* event) {
 }
 
 void WorkerThreadPool::updateNumberOfThreads() {
-    int max_threads = QThread::idealThreadCount();
+    int max_threads;
+    if (sizeof(void*) <= 4) {
+        // Restricting num of processors for 32-bit due to
+        // address space constraints.
+        max_threads = QThread::idealThreadCount();
+        if (max_threads > 2) {
+        	max_threads = 2;
+        }
+    } else {
+    	max_threads = QThread::idealThreadCount();
+    }
 
     int num_threads = m_settings.value("settings/batch_processing_threads", max_threads).toInt();
     num_threads = std::min<int>(num_threads, max_threads);

imageproc/CMakeLists.txt

@@ -56,4 +56,4 @@ SOURCE_GROUP(Sources FILES ${sources})
 
 ADD_LIBRARY(imageproc STATIC ${sources})
 
-ADD_SUBDIRECTORY(tests)
+#ADD_SUBDIRECTORY(tests)

math/CMakeLists.txt

@@ -45,5 +45,5 @@ SOURCE_GROUP("Sources\\Differentiation Framework" FILES ${ADIFF_SOURCES})
 
 ADD_LIBRARY(math STATIC ${GENERIC_SOURCES} ${SPFIT_SOURCES} ${ADIFF_SOURCES})
 
-ADD_SUBDIRECTORY(spfit/tests)
-ADD_SUBDIRECTORY(adiff/tests)
+#ADD_SUBDIRECTORY(spfit/tests)
+#ADD_SUBDIRECTORY(adiff/tests)

math/adiff/tests/TestHessians.cpp

@@ -18,6 +18,9 @@
 
 #include "Function.h"
 #include <boost/test/auto_unit_test.hpp>
+#include <boost/test/floating_point_comparison.hpp>
+#include <stdlib.h>
+#include <math.h>
 
 namespace adiff {
     namespace tests {

math/spfit/tests/TestSqDistApproximant.cpp

@@ -18,7 +18,12 @@
 
 #include "SqDistApproximant.h"
 #include "ToLineProjector.h"
+#include <QPointF>
+#include <QLineF>
 #include <boost/test/auto_unit_test.hpp>
+#include <boost/test/floating_point_comparison.hpp>
+#include <stdlib.h>
+#include <math.h>
 
 namespace spfit {
     namespace tests {

tests/TestContentSpanFinder.cpp

@@ -18,12 +18,10 @@
 
 #include "ContentSpanFinder.h"
 #include "imageproc/SlicedHistogram.h"
-#include <boost/lambda/lambda.hpp>
-#include <boost/lambda/bind.hpp>
+#include <vector>
 #include <boost/test/auto_unit_test.hpp>
 
 namespace Tests {
-    using namespace boost::lambda;
     using namespace imageproc;
 
     BOOST_AUTO_TEST_SUITE(ContentSpanFinderTestSuite);
@@ -34,7 +32,10 @@ namespace Tests {
             std::vector<Span> spans;
             span_finder.find(
                     SlicedHistogram(),
-                    bind(&std::vector<Span>::push_back, var(spans), _1)
+            [&](Span const& span)
+        {
+            spans.push_back(span);
+        }
             );
 
             BOOST_CHECK(spans.empty());
@@ -57,7 +58,11 @@ namespace Tests {
             span_finder.setMinContentWidth(2);
 
             std::vector<Span> spans;
-            span_finder.find(hist, bind(&std::vector<Span>::push_back, var(spans), _1));
+        span_finder.find(hist, [&](Span const& span)
+        {
+            spans.push_back(span);
+        }
+        );
 
             BOOST_REQUIRE(spans.size() == 2);
             BOOST_REQUIRE(spans[0] == Span(3, 3 + 3));
@@ -81,7 +86,11 @@ namespace Tests {
             span_finder.setMinWhitespaceWidth(2);
 
             std::vector<Span> spans;
-            span_finder.find(hist, bind(&std::vector<Span>::push_back, var(spans), _1));
+        span_finder.find(hist, [&](Span const& span)
+        {
+            spans.push_back(span);
+        }
+        );
 
             BOOST_REQUIRE(spans.size() == 2);
             BOOST_REQUIRE(spans[0] == Span(1, 1 + 4));
@@ -106,7 +115,11 @@ namespace Tests {
             span_finder.setMinWhitespaceWidth(2);
 
             std::vector<Span> spans;
-            span_finder.find(hist, bind(&std::vector<Span>::push_back, var(spans), _1));
+        span_finder.find(hist, [&](Span const& span)
+        {
+            spans.push_back(span);
+        }
+        );
 
 
             BOOST_REQUIRE(spans.size() == 1);

tests/TestMatrixCalc.cpp

@@ -18,6 +18,7 @@
 
 #include "MatrixCalc.h"
 #include <boost/test/auto_unit_test.hpp>
+#include <boost/test/floating_point_comparison.hpp>
 
 namespace imageproc {
     namespace tests {