Attachment 173389 Details for Bug 211652 – svn-diff_graphics_scantailor

[patch] svn-diff_graphics_scantailor

svn-diff_graphics_scantailor (text/plain), 4.12 KB, created by Walter Schwarzenfeld on 2016-08-08 00:53:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Walter Schwarzenfeld

Created: 2016-08-08 00:53:15 UTC

Size: 4.12 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 419792)
>+++ Makefile	(working copy)
>@@ -14,13 +14,15 @@
> 
> LIB_DEPENDS=	libtiff.so:graphics/tiff \
> 		libjbig.so:graphics/jbigkit \
>-		libpng.so:graphics/png
>+		libpng.so:graphics/png \
>+
> BUILD_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs
> 
>+#MAKE_JOBS_UNSAFE=	yes
> USES=		cmake gettext jpeg
>-USE_GCC=	yes
>-USE_QT4=	gui xml qmake_build uic_build moc_build rcc_build \
>+USE_QT4=	corelib 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
>Index: files/patch-GridTraverser_cpp
>===================================================================
>--- files/patch-GridTraverser_cpp	(nonexistent)
>+++ files/patch-GridTraverser_cpp	(working copy)
>@@ -0,0 +1,11 @@
>+--- foundation/GridLineTraverser.cpp
>++++ foundation/GridLineTraverser.cpp
>+@@ -19,6 +19,7 @@
>+ #include "GridLineTraverser.h"
>+ #include "LineIntersectionScalar.h"
>+ #include <algorithm>
>++#include <cstdlib>
>+ 
>+ GridLineTraverser::GridLineTraverser(QLineF const& line)
>+ {
>+
>
>Property changes on: files/patch-GridTraverser_cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-MatrixCalc.h
>===================================================================
>--- files/patch-MatrixCalc.h	(nonexistent)
>+++ files/patch-MatrixCalc.h	(working copy)
>@@ -0,0 +1,12 @@
>+--- 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);
>+
>
>Property changes on: files/patch-MatrixCalc.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-ProfilesDialog_cpp
>===================================================================
>--- files/patch-ProfilesDialog_cpp	(nonexistent)
>+++ files/patch-ProfilesDialog_cpp	(working copy)
>@@ -0,0 +1,29 @@
>+--- 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)
>+ 		)
>+ 	);
>+ 	
>
>Property changes on: files/patch-ProfilesDialog_cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 211652: 173389