Attachment #173389 for bug #211652

View | Details | Raw Unified | Return to bug 211652
Collapse All | Expand All





LIB_DEPENDS=	libtiff.so:graphics/tiff \
		libjbig.so:graphics/jbigkit \
		libpng.so:graphics/png \

BUILD_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs

#MAKE_JOBS_UNSAFE=	yes
USES=		cmake gettext jpeg
USE_QT4=	corelib gui xml qmake_build uic_build moc_build rcc_build \
USE_QT4=	gui xml qmake_build uic_build moc_build rcc_build \
		linguist_build
USE_XORG+=	xrender

DESKTOP_ENTRIES="Scan Tailor" "${COMMENT}" "${PORTNAME}" \
		"${PORTNAME}" "Graphics;Scanning;" false

Line 0 Link Here

(-)files/patch-GridTraverser_cpp (+11 lines)
	1	--- foundation/GridLineTraverser.cpp
	2	+++ foundation/GridLineTraverser.cpp
	3	@@ -19,6 +19,7 @@
	4	#include "GridLineTraverser.h"
	5	#include "LineIntersectionScalar.h"
	6	#include <algorithm>
	7	+#include <cstdlib>
	8
	9	GridLineTraverser::GridLineTraverser(QLineF const& line)
	10	{
	11




--- math/MatrixCalc.h
+++ math/MatrixCalc.h
@@ -74,7 +74,7 @@ class DynamicPoolAllocator : public AbstractAllocator<T>
 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);





--- ProjectFilesDialog.cpp
+++ 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)
 		)
 	);
 	

Return to bug 211652

Lines 14-26 Link Here

(-)Makefile (-3 / +5 lines)
14		14
15	LIB_DEPENDS= libtiff.so:graphics/tiff \	15	LIB_DEPENDS= libtiff.so:graphics/tiff \
16	libjbig.so:graphics/jbigkit \	16	libjbig.so:graphics/jbigkit \
17	libpng.so:graphics/png	17	libpng.so:graphics/png \
		18
18	BUILD_DEPENDS= ${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs	19	BUILD_DEPENDS= ${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs
19		20
		21	#MAKE_JOBS_UNSAFE= yes
20	USES= cmake gettext jpeg	22	USES= cmake gettext jpeg
21	USE_GCC= yes	23	USE_QT4= corelib gui xml qmake_build uic_build moc_build rcc_build \
22	USE_QT4= gui xml qmake_build uic_build moc_build rcc_build \
23	linguist_build	24	linguist_build
		25	USE_XORG+= xrender
24		26
25	DESKTOP_ENTRIES="Scan Tailor" "${COMMENT}" "${PORTNAME}" \	27	DESKTOP_ENTRIES="Scan Tailor" "${COMMENT}" "${PORTNAME}" \
26	"${PORTNAME}" "Graphics;Scanning;" false	28	"${PORTNAME}" "Graphics;Scanning;" false

Line 0 Link Here

(-)files/patch-MatrixCalc.h (+12 lines)
	1	--- math/MatrixCalc.h
	2	+++ math/MatrixCalc.h
	3	@@ -74,7 +74,7 @@ class DynamicPoolAllocator : public AbstractAllocator<T>
	4	template<typename T>
	5	class Mat
	6	{
	7	- template<typename OT, typename Alloc> friend class MatrixCalc;
	8	+ template<typename OT, typename Alloc> friend class ::MatrixCalc;
	9	template<typename OT> friend Mat<OT> operator+(Mat<OT> const& m1, Mat<OT> const& m2);
	10	template<typename OT> friend Mat<OT> operator-(Mat<OT> const& m1, Mat<OT> const& m2);
	11	template<typename OT> friend Mat<OT> operator*(Mat<OT> const& m1, Mat<OT> const& m2);
	12

Line 0 Link Here

(-)files/patch-ProfilesDialog_cpp (+29 lines)
	1	--- ProjectFilesDialog.cpp
	2	+++ ProjectFilesDialog.cpp
	3	@@ -279,7 +279,7 @@ ProjectFilesDialog::inProjectFiles() const
	4	using namespace boost::lambda;
	5
	6	std::vector<ImageFileInfo> files;
	7	- m_ptrInProjectFiles->items(bind(&pushFileInfo<Item>, ref(files), _1));
	8	+ m_ptrInProjectFiles->items(bind(&pushFileInfo<Item>, boost::ref(files), _1));
	9
	10	std::sort(files.begin(), files.end(), imageFileInfoLess);
	11
	12	@@ -439,7 +439,7 @@ ProjectFilesDialog::setInputDir(QString const& dir, bool const auto_add_files)
	13	files.begin(), files.end(),
	14	bind(
	15	&pushItemWithFlags<Item, ItemList>,
	16	- _1, ref(items), cref(m_supportedExtensions)
	17	+ _1, boost::ref(items), cref(m_supportedExtensions)
	18	)
	19	);
	20
	21	@@ -510,7 +510,7 @@ ProjectFilesDialog::removeFromProject()
	22	m_ptrInProjectFiles->items(
	23	selection, bind(
	24	&pushItemIfSameDir<Item, ItemList>,
	25	- ref(items), _1, cref(input_dir)
	26	+ boost::ref(items), _1, cref(input_dir)
	27	)
	28	);
	29