Request 3836 (accepted)

Overview

Request 3836 (accepted)

build with gcc7 and ImageMagick7

Created by olh over 7 years ago
In state accepted

Submit synfig

Submit package home:olh:branches:Multimedia / synfig to package Multimedia / synfig

synfig.spec Changed

synfig.gcc7.patch Added

@@ -0,0 +1,37 @@
+--- a/src/synfig/rendering/software/function/array.h
++++ b/src/synfig/rendering/software/function/array.h
+@@ -426,29 +426,29 @@ public:
+ 	};
+ 
+ 	void fill(const Type &x) const
+-		{ for(Iterator i(*this); i; ++i) i.get_array().fill(x); }
++		{ for(Iterator i(*this); i; ++i) i.get_array().template fill(x); }
+ 
+ 	template<typename TT>
+ 	void assign(const Array<TT, Rank> &x) const
+ 	{
+ 		typename Array<TT, Rank>::Iterator j(x);
+-		for(Iterator i(*this); i && j; ++i, ++j) i.get_array().assign<TT>(j.get_array());
++		for(Iterator i(*this); i && j; ++i, ++j) i.get_array().template assign<TT>(j.get_array());
+ 	}
+ 
+ 	template<typename function>
+ 	void process(const Type &x) const
+-		{ for(Iterator i(*this); i; ++i) i.get_array().process<function>(x); }
++		{ for(Iterator i(*this); i; ++i) i.get_array().template process<function>(x); }
+ 
+ 	template<typename function, typename TT>
+ 	void process(const Array<TT, Rank> &x) const
+ 	{
+ 		typename Array<TT, Rank>::Iterator j(x);
+-		for(Iterator i(*this); i && j; ++i, ++j) i.get_array().process<function, TT>(j.get_array());
++		for(Iterator i(*this); i && j; ++i, ++j) i.get_array().template process<function, TT>(j.get_array());
+ 	}
+ 
+ 	template<typename function>
+ 	void process() const
+-		{ for(Iterator i(*this); i; ++i) i.get_array().process<function>(); }
++		{ for(Iterator i(*this); i; ++i) i.get_array().template process<function>(); }
+ };
+ 
+ template<typename T>

synfig.magick7.patch Added

@@ -0,0 +1,68 @@
+--- a/src/modules/mod_magickpp/trgt_magickpp.cpp
++++ b/src/modules/mod_magickpp/trgt_magickpp.cpp
+@@ -60,15 +60,15 @@ MagickCore::Image* copy_image_list(Conta
+ 	typedef typename Container::iterator Iter;
+ 	MagickCore::Image* previous = 0;
+ 	MagickCore::Image* first = NULL;
+-	MagickCore::ExceptionInfo exceptionInfo;
+-	MagickCore::GetExceptionInfo(&exceptionInfo);
++	MagickCore::ExceptionInfo *exceptionInfo;
++	exceptionInfo = MagickCore::AcquireExceptionInfo();
+ 	for (Iter iter = container.begin(); iter != container.end(); ++iter)
+ 	{
+ 		MagickCore::Image* current;
+ 
+ 		try
+ 		{
+-			current = CloneImage(iter->image(), 0, 0, Magick::MagickTrue, &exceptionInfo);
++			current = CloneImage(iter->image(), 0, 0, Magick::MagickTrue, exceptionInfo);
+ 
+ 			if (!first) first = current;
+ 
+@@ -88,8 +88,8 @@ MagickCore::Image* copy_image_list(Conta
+ 
+ magickpp_trgt::~magickpp_trgt()
+ {
+-	MagickCore::ExceptionInfo exceptionInfo;
+-	MagickCore::GetExceptionInfo(&exceptionInfo);
++	MagickCore::ExceptionInfo *exceptionInfo;
++	exceptionInfo = MagickCore::AcquireExceptionInfo();
+ 
+ 	try
+ 	{
+@@ -103,7 +103,7 @@ magickpp_trgt::~magickpp_trgt()
+ 			image.fileName(filename);
+ 			try
+ 			{
+-				SetImageInfo(image.imageInfo(),Magick::MagickTrue,&exceptionInfo);
++				SetImageInfo(image.imageInfo(),Magick::MagickTrue,exceptionInfo);
+ 				can_adjoin = image.adjoin();
+ 			}
+ 			catch(Magick::Warning warning) {
+@@ -137,7 +137,7 @@ magickpp_trgt::~magickpp_trgt()
+ 				synfig::info("removing duplicate frames");
+ 				try
+ 				{
+-					RemoveDuplicateLayers(&image_list, &exceptionInfo);
++					RemoveDuplicateLayers(&image_list, exceptionInfo);
+ 				}
+ 				catch(Magick::Warning warning) {
+ 					synfig::warning("exception '%s'", warning.what());
+@@ -149,7 +149,7 @@ magickpp_trgt::~magickpp_trgt()
+ 				synfig::info("optimizing layers");
+ 				try
+ 				{
+-					image_list = OptimizeImageLayers(image_list,&exceptionInfo);
++					image_list = OptimizeImageLayers(image_list,exceptionInfo);
+ 				}
+ 				catch(Magick::Warning warning) {
+ 					synfig::warning("exception '%s'", warning.what());
+@@ -161,7 +161,7 @@ magickpp_trgt::~magickpp_trgt()
+ 				synfig::info("optimizing layer transparency");
+ 				try
+ 				{
+-					OptimizeImageTransparency(image_list,&exceptionInfo);
++					OptimizeImageTransparency(image_list,exceptionInfo);
+ 				}
+ 				catch(Magick::Warning warning) {
+ 					synfig::warning("exception '%s'", warning.what());

Build Results
RPM Lint

Refresh

Comments for request 3836 0

Request History

olh created request over 7 years ago

build with gcc7 and ImageMagick7

olh accepted request over 7 years ago