Last active
January 4, 2016 04:29
-
-
Save muellermartin/8569243 to your computer and use it in GitHub Desktop.
This patch makes Scan Tailor (scantailor-0.9.11.1) work with Clang on Mac OS X 10.9.1 with homebrew. The patch has been accepted by the maintainer and has been included in the main repository. See conversation in mailing list: http://sourceforge.net/p/scantailor/mailman/message/31884956/
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/ProjectFilesDialog.cpp b/ProjectFilesDialog.cpp | |
index f632b3c..dfa1c14 100644 | |
--- a/ProjectFilesDialog.cpp | |
+++ b/ProjectFilesDialog.cpp | |
@@ -279,7 +279,7 @@ ProjectFilesDialog::inProjectFiles() const | |
using namespace boost::lambda; | |
std::vector<ImageFileInfo> files; | |
- m_ptrInProjectFiles->items(bind(&pushFileInfo<Item>, ref(files), _1)); | |
+ m_ptrInProjectFiles->items(bind(&pushFileInfo<Item>, boost::ref(files), _1)); | |
std::sort(files.begin(), files.end(), imageFileInfoLess); | |
@@ -439,7 +439,7 @@ ProjectFilesDialog::setInputDir(QString const& dir, bool const auto_add_files) | |
files.begin(), files.end(), | |
bind( | |
&pushItemWithFlags<Item, ItemList>, | |
- _1, ref(items), cref(m_supportedExtensions) | |
+ _1, boost::ref(items), cref(m_supportedExtensions) | |
) | |
); | |
@@ -510,7 +510,7 @@ ProjectFilesDialog::removeFromProject() | |
m_ptrInProjectFiles->items( | |
selection, bind( | |
&pushItemIfSameDir<Item, ItemList>, | |
- ref(items), _1, cref(input_dir) | |
+ boost::ref(items), _1, cref(input_dir) | |
) | |
); | |
diff --git a/foundation/GridLineTraverser.cpp b/foundation/GridLineTraverser.cpp | |
index 72f51e8..0c9b5cb 100644 | |
--- a/foundation/GridLineTraverser.cpp | |
+++ b/foundation/GridLineTraverser.cpp | |
@@ -19,6 +19,7 @@ | |
#include "GridLineTraverser.h" | |
#include "LineIntersectionScalar.h" | |
#include <algorithm> | |
+#include <cstdlib> | |
GridLineTraverser::GridLineTraverser(QLineF const& line) | |
{ | |
diff --git a/math/MatrixCalc.h b/math/MatrixCalc.h | |
index 0dd8de0..e915ea0 100644 | |
--- a/math/MatrixCalc.h | |
+++ b/math/MatrixCalc.h | |
@@ -74,7 +74,7 @@ private: | |
template<typename T> | |
class Mat | |
{ | |
- template<typename OT, typename Alloc> friend class MatrixCalc; | |
+ template<typename OT, typename Alloc> friend class ::MatrixCalc; | |
template<typename OT> friend Mat<OT> operator+(Mat<OT> const& m1, Mat<OT> const& m2); | |
template<typename OT> friend Mat<OT> operator-(Mat<OT> const& m1, Mat<OT> const& m2); | |
template<typename OT> friend Mat<OT> operator*(Mat<OT> const& m1, Mat<OT> const& m2); |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
thank you, i see your patch included in the official repository now
http://sourceforge.net/p/scantailor/code/ci/123a71afaf7d3bb6151cfa22b4a974e64a2f26d3/
did you try to compile also scantailor-enhanced?
furthermore, may i ask you what params have you used with cmake?
i managed to compile it, but doesn't import jpeg files, only tiff.