summaryrefslogtreecommitdiff
path: root/vigra
diff options
context:
space:
mode:
Diffstat (limited to 'vigra')
-rw-r--r--vigra/makefile.mk5
-rw-r--r--vigra/vigra1.4.0-unused-parameters.patch31
2 files changed, 36 insertions, 0 deletions
diff --git a/vigra/makefile.mk b/vigra/makefile.mk
index db08373faf52..c8e4f7779809 100644
--- a/vigra/makefile.mk
+++ b/vigra/makefile.mk
@@ -50,6 +50,11 @@ TARFILE_NAME=vigra1.4.0
TARFILE_MD5=ea91f2fb4212a21d708aced277e6e85a
PATCH_FILES=$(TARFILE_NAME).patch
+# Help static analysis tools (see SAL_UNUSED_PARAMETER in sal/types.h):
+.IF "$(COM)" == "GCC"
+PATCH_FILES += vigra1.4.0-unused-parameters.patch
+.END
+
CONFIGURE_DIR=
CONFIGURE_ACTION=
diff --git a/vigra/vigra1.4.0-unused-parameters.patch b/vigra/vigra1.4.0-unused-parameters.patch
new file mode 100644
index 000000000000..f32317865ea8
--- /dev/null
+++ b/vigra/vigra1.4.0-unused-parameters.patch
@@ -0,0 +1,31 @@
+--- misc/vigra1.4.0/include/vigra/basicimage.hxx 2012-01-19 22:49:11.232074631 +0100
++++ misc/build/vigra1.4.0/include/vigra/basicimage.hxx 2012-01-19 22:48:12.997439136 +0100
+@@ -72,7 +72,7 @@
+ difference_type offset_;
+ };
+
+- static void initialize(BaseType &) {}
++ static void initialize(__attribute__ ((unused)) BaseType &) {}
+
+ static reference dereference(BaseType const & d)
+ { return const_cast<reference>(*(*d.line_start_ + d.offset_)); }
+--- misc/vigra1.4.0/include/vigra/diff2d.hxx 2012-01-19 22:49:11.280074335 +0100
++++ misc/build/vigra1.4.0/include/vigra/diff2d.hxx 2012-01-19 22:49:00.129144170 +0100
+@@ -60,7 +60,7 @@
+ typedef Diff const * pointer;
+ typedef std::random_access_iterator_tag iterator_category;
+
+- static void initialize(BaseType &) {}
++ static void initialize(__attribute__ ((unused)) BaseType &) {}
+
+ static reference dereference(BaseType const & d)
+ { return d; }
+@@ -102,7 +102,7 @@
+ typedef Diff const * pointer;
+ typedef std::random_access_iterator_tag iterator_category;
+
+- static void initialize(BaseType & /*d*/) {}
++ static void initialize(__attribute__ ((unused)) BaseType & /*d*/) {}
+
+ static reference dereference(BaseType const & d)
+ { return d; }