diff options
| author |   David Seifert <soap@gentoo.org> | 2016-01-24 23:08:10 +0100 |
|---|---|---|
| committer | David Seifert <soap@gentoo.org> | 2016-01-24 23:08:47 +0100 |
| commit | d401688e98ab5bf83c95eccf313c9bacc6a0ccb5 (patch) | |
| tree | f917e93dec2e04a8de8ac03a2147493e7fef9ea1 /media-libs/iulib/files | |
| parent | app-admin/consul-template: add gopkg.in/yaml.v2 mapping to get_archive_go_pac... (diff) | |
| download | gentoo-d401688e98ab5bf83c95eccf313c9bacc6a0ccb5.tar.gz gentoo-d401688e98ab5bf83c95eccf313c9bacc6a0ccb5.tar.bz2 gentoo-d401688e98ab5bf83c95eccf313c9bacc6a0ccb5.zip | |
media-libs/iulib: Fix wrong declaration of default arguments
Gentoo-Bug: 570102
* EAPI=6
* Make patch -p1 compatible
Package-Manager: portage-2.2.27
Diffstat (limited to 'media-libs/iulib/files')
| -rw-r--r-- | media-libs/iulib/files/iulib-0.4-default-arguments-declaration.patch | 25 | ||||
| -rw-r--r-- | media-libs/iulib/files/iulib-0.4-scons-build-env.patch | 4 |
2 files changed, 27 insertions, 2 deletions
diff --git a/media-libs/iulib/files/iulib-0.4-default-arguments-declaration.patch b/media-libs/iulib/files/iulib-0.4-default-arguments-declaration.patch new file mode 100644 index 000000000000..cbffdee0d547 --- /dev/null +++ b/media-libs/iulib/files/iulib-0.4-default-arguments-declaration.patch @@ -0,0 +1,25 @@ +Default arguments need to be specified in the class declaration and cannot be redeclared. +https://bugs.gentoo.org/show_bug.cgi?id=570102 + +--- iulib-0.4/imglib/imgops.cc ++++ iulib-0.4/imglib/imgops.cc +@@ -133,7 +133,7 @@ + + template<class T,class V> + void addscaled(narray<T> &dest,narray<T> &src, +- V scale=1,int dx=0,int dy=0) { ++ V scale,int dx,int dy) { + for (int i=0; i<dest.dim(0); i++) + for (int j=0; j<dest.dim(1); j++) + dest.unsafe_at(i,j) += (T)(scale*xref(src,i+dx,j+dy)); +--- iulib-0.4/imglib/imgops.h ++++ iulib-0.4/imglib/imgops.h +@@ -67,7 +67,7 @@ + } + + template<class T, class V> +- void addscaled(colib::narray<T> &, colib::narray<T> &, V, int, int); ++ void addscaled(colib::narray<T> &dest, colib::narray<T> &src, V scale=1, int dx=0, int dy=0); + template<class T> + void tighten(colib::narray<T> &image); + template<class T> diff --git a/media-libs/iulib/files/iulib-0.4-scons-build-env.patch b/media-libs/iulib/files/iulib-0.4-scons-build-env.patch index 3983d9c820b4..766795c8c15d 100644 --- a/media-libs/iulib/files/iulib-0.4-scons-build-env.patch +++ b/media-libs/iulib/files/iulib-0.4-scons-build-env.patch @@ -1,5 +1,5 @@ ---- SConstruct -+++ SConstruct +--- iulib-0.4/SConstruct ++++ iulib-0.4/SConstruct @@ -36,12 +36,25 @@ ### Options exposed via SCons |