Version 1.0.14

Author: 4lex4

AbstractCommand.h

@@ -22,31 +22,12 @@
 #include "ref_countable.h"
 #include "intrusive_ptr.h"
 
-template<typename R>
-class AbstractCommand0 : public ref_countable {
+template<typename Res, typename... ArgTypes>
+class AbstractCommand : public ref_countable {
 public:
-    typedef intrusive_ptr<AbstractCommand0> Ptr;
+    typedef intrusive_ptr<AbstractCommand> Ptr;
 
-    virtual R operator()() = 0;
+    virtual Res operator()(ArgTypes... args) = 0;
 };
 
-
-template<typename R, typename A1>
-class AbstractCommand1 : public ref_countable {
-public:
-    typedef intrusive_ptr<AbstractCommand1> Ptr;
-
-    virtual R operator()(A1 arg1) = 0;
-};
-
-
-template<typename R, typename T1, typename T2>
-class AbstractCommand2 : public ref_countable {
-public:
-    typedef intrusive_ptr<AbstractCommand2> Ptr;
-
-    virtual R operator()(T1 arg1, T2 arg2) = 0;
-};
-
-
 #endif  // ifndef ABSTRACTCOMMAND_H_

BackgroundExecutor.h

@@ -29,8 +29,8 @@ class BackgroundExecutor {
     DECLARE_NON_COPYABLE(BackgroundExecutor)
 
 public:
-    typedef intrusive_ptr<AbstractCommand0<void>> TaskResultPtr;
-    typedef intrusive_ptr<AbstractCommand0<TaskResultPtr>> TaskPtr;
+    typedef intrusive_ptr<AbstractCommand<void>> TaskResultPtr;
+    typedef intrusive_ptr<AbstractCommand<TaskResultPtr>> TaskPtr;
 
     BackgroundExecutor();
 

BackgroundTask.h

@@ -26,7 +26,7 @@
 #include <QAtomicInt>
 #include <exception>
 
-class BackgroundTask : public AbstractCommand0<FilterResultPtr>, public TaskStatus {
+class BackgroundTask : public AbstractCommand<FilterResultPtr>, public TaskStatus {
 public:
     enum Type { INTERACTIVE, BATCH };
 

BlackOnWhiteEstimator.cpp

@@ -64,8 +64,8 @@ bool BubbleAnimation::nextFrame(const QColor& head_color,
 
     for (int i = 0; i < m_numBubbles; ++i) {
         const double angle = -0.5 * PI + 2.0 * PI * (m_curFrame - i) / m_numBubbles;
-        const double s = sin(angle);
-        const double c = cos(angle);
+        const double s = std::sin(angle);
+        const double c = std::cos(angle);
         const QPointF vec(c * reduced_radius, s * reduced_radius);
         QRectF r(0.0, 0.0, 2.0 * bubble_radius, 2.0 * bubble_radius);
         r.moveCenter(center + vec);

BlackOnWhiteEstimator.h

@@ -557,7 +557,6 @@ SET(
 		DefaultParamsProvider.cpp DefaultParamsProvider.h
         DeviationProvider.h
         OrderByDeviationProvider.cpp OrderByDeviationProvider.h
-        BlackOnWhiteEstimator.cpp BlackOnWhiteEstimator.h
         ImageSettings.cpp ImageSettings.h
         version.h
         config.h.in

BubbleAnimation.cpp

@@ -139,8 +139,8 @@ BackgroundTaskPtr ConsoleBatch::createCompositeTask(const PageInfo& page, const
     }
     assert(fix_orientation_task);
 
-    return BackgroundTaskPtr(
-            new LoadFileTask(BackgroundTask::BATCH, page, m_ptrThumbnailCache, m_ptrPages, fix_orientation_task));
+    return make_intrusive<LoadFileTask>(BackgroundTask::BATCH, page, m_ptrThumbnailCache, m_ptrPages,
+                                        fix_orientation_task);
 }  // ConsoleBatch::createCompositeTask
 
 // process the image vector **images** and save output to **output_dir**

CMakeLists.txt

@@ -21,7 +21,8 @@
 
 using namespace imageproc;
 
-void ContentSpanFinder::findImpl(const SlicedHistogram& histogram, VirtualFunction1<void, Span>& handler) const {
+void ContentSpanFinder::findImpl(const SlicedHistogram& histogram,
+                                 const VirtualFunction<void, const Span&>& handler) const {
     const auto hist_size = static_cast<const int>(histogram.size());
 
     int i = 0;

ConsoleBatch.cpp

@@ -51,17 +51,16 @@ class ContentSpanFinder {
     void find(const imageproc::SlicedHistogram& histogram, T handler) const;
 
 private:
-    void findImpl(const imageproc::SlicedHistogram& histogram, VirtualFunction1<void, Span>& handler) const;
+    void findImpl(const imageproc::SlicedHistogram& histogram, const VirtualFunction<void, const Span&>& handler) const;
 
     int m_minContentWidth;
     int m_minWhitespaceWidth;
 };
 
 
-template<typename T>
-void ContentSpanFinder::find(const imageproc::SlicedHistogram& histogram, T handler) const {
-    ProxyFunction1<T, void, Span> proxy(handler);
-    findImpl(histogram, proxy);
+template<typename Callable>
+void ContentSpanFinder::find(const imageproc::SlicedHistogram& histogram, Callable handler) const {
+    findImpl(histogram, ProxyFunction<Callable, void, const Span&>(handler));
 }
 
 #endif  // ifndef CONTENTSPANFINDER_H_