[Python-modules-commits] r21938 - in packages/gamera/trunk/debian (5 files)
jwilk at users.alioth.debian.org
jwilk at users.alioth.debian.org
Sat May 26 14:41:03 UTC 2012
Date: Saturday, May 26, 2012 @ 14:41:02
Author: jwilk
Revision: 21938
New upstream release.
Modified:
packages/gamera/trunk/debian/changelog
packages/gamera/trunk/debian/patches/series
packages/gamera/trunk/debian/patches/use-system-galib.diff
Deleted:
packages/gamera/trunk/debian/patches/gcc-4.7-compat.diff
packages/gamera/trunk/debian/patches/graphmodule-fix-type-mismatch.diff
Modified: packages/gamera/trunk/debian/changelog
===================================================================
--- packages/gamera/trunk/debian/changelog 2012-05-26 14:30:20 UTC (rev 21937)
+++ packages/gamera/trunk/debian/changelog 2012-05-26 14:41:02 UTC (rev 21938)
@@ -1,11 +1,15 @@
-gamera (3.3.2-4) UNRELEASED; urgency=low
+gamera (3.3.3-1) UNRELEASED; urgency=low
+ * New upstream release.
+ + Drop graphmodule-fix-type-mismatch.diff; applied upstream.
+ + Drop gcc-4.7-compat.diff; applied upstream.
+ + Refresh other patches.
* Improve DEP-8 tests:
+ Redirect nosetests output from stderr to stdout.
+ Copy tests to a temporary directory; remove rw-build-tree restriction.
+ Rename them, so that they match binary package names.
- -- Jakub Wilk <jwilk at debian.org> Sat, 26 May 2012 16:26:20 +0200
+ -- Jakub Wilk <jwilk at debian.org> Sat, 26 May 2012 16:31:29 +0200
gamera (3.3.2-3) unstable; urgency=low
Deleted: packages/gamera/trunk/debian/patches/gcc-4.7-compat.diff
===================================================================
--- packages/gamera/trunk/debian/patches/gcc-4.7-compat.diff 2012-05-26 14:30:20 UTC (rev 21937)
+++ packages/gamera/trunk/debian/patches/gcc-4.7-compat.diff 2012-05-26 14:41:02 UTC (rev 21938)
@@ -1,222 +0,0 @@
-Description: fix compatiblity with GCC 4.7
-Origin: upstream, http://gamera.svn.sourceforge.net/viewvc/gamera?revision=1335&view=revision
-Last-Update: 2012-04-16
-
---- a/include/pixel.hpp
-+++ b/include/pixel.hpp
-@@ -194,17 +194,17 @@
-
- /// Set the red component to the passed in value.
- void red(T v) {
-- setRed(v);
-+ this->setRed(v);
- }
-
- /// Set the green component to the passed in value.
- void green(T v) {
-- setGreen(v);
-+ this->setGreen(v);
- }
-
- /// Set the blue component to the passed in value.
- void blue(T v) {
-- setBlue(v);
-+ this->setBlue(v);
- }
-
- /// Retrieve the red component - the returned value is an lvalue.
---- a/include/plugins/deformations.hpp
-+++ b/include/plugins/deformations.hpp
-@@ -58,6 +58,46 @@
- return T(((pix1 * w1) + (pix2 * w2))/(w1 + w2));
- }
-
-+inline void filterfunc(RGBPixel &p0, RGBPixel &p1, RGBPixel &oldPixel, RGBPixel origPixel, double &weight) {
-+ p0 = origPixel;
-+ p1 = RGBPixel( GreyScalePixel(p0.red() * weight),
-+ GreyScalePixel(p0.green() * weight),
-+ GreyScalePixel(p0.blue() * weight));
-+ p0 = RGBPixel( GreyScalePixel(p0.red() - p1.red() + oldPixel.red()),
-+ GreyScalePixel(p0.green() - p1.green() + oldPixel.green()),
-+ GreyScalePixel(p0.blue() - p1.blue() + oldPixel.blue()));
-+ oldPixel = p1;
-+}
-+
-+template<class T>
-+inline void filterfunc(T &p0, T &p1, T &oldPixel, T origPixel, double & weight)
-+{
-+ p0 = origPixel;
-+ p1 = (T)(p0 * weight);
-+ p0 -= (T)(p1 - oldPixel);
-+ oldPixel = p1;
-+}
-+
-+/*
-+ * borderfunc
-+ *
-+ * Corrects the alpha blending of border pixels.
-+ *
-+ * p0 - Value 1
-+ * p1 - Value 2
-+ * oldPixel - Value3
-+ * origPixel - Pixel that comes from the source
-+ * weight - The weight given to the filter
-+ * bgcolor - The background color
-+ *
-+ */
-+template<class T>
-+inline void borderfunc(T& p0, T& p1, T& oldPixel, T origPixel, double& weight, T bgcolor)
-+{
-+ filterfunc(p0, p1, oldPixel, origPixel, weight);
-+ p0 = norm_weight_avg(bgcolor, origPixel, weight, 1.0-weight);
-+}
-+
- /*
- * shear_x
- * Shears the image horizontally with a shear angle in degrees.
-@@ -75,7 +115,6 @@
- *
- * diff: Correction factor for negative shear values.
- */
--
- template<class T, class U>
- void shear_x(const T &orig, U &newbmp, size_t &row, size_t shiftAmount, typename T::value_type bgcolor, double weight, size_t diff=0)
- {
-@@ -176,46 +215,6 @@
-
-
-
--inline void filterfunc(RGBPixel &p0, RGBPixel &p1, RGBPixel &oldPixel, RGBPixel origPixel, double &weight) {
-- p0 = origPixel;
-- p1 = RGBPixel( GreyScalePixel(p0.red() * weight),
-- GreyScalePixel(p0.green() * weight),
-- GreyScalePixel(p0.blue() * weight));
-- p0 = RGBPixel( GreyScalePixel(p0.red() - p1.red() + oldPixel.red()),
-- GreyScalePixel(p0.green() - p1.green() + oldPixel.green()),
-- GreyScalePixel(p0.blue() - p1.blue() + oldPixel.blue()));
-- oldPixel = p1;
--}
--
--template<class T>
--inline void filterfunc(T &p0, T &p1, T &oldPixel, T origPixel, double & weight)
--{
-- p0 = origPixel;
-- p1 = (T)(p0 * weight);
-- p0 -= (T)(p1 - oldPixel);
-- oldPixel = p1;
--}
--
--
--/*
-- * borderfunc
-- *
-- * Corrects the alpha blending of border pixels.
-- *
-- * p0 - Value 1
-- * p1 - Value 2
-- * oldPixel - Value3
-- * origPixel - Pixel that comes from the source
-- * weight - The weight given to the filter
-- * bgcolor - The background color
-- *
-- */
--template<class T>
--inline void borderfunc(T& p0, T& p1, T& oldPixel, T origPixel, double& weight, T bgcolor)
--{
-- filterfunc(p0, p1, oldPixel, origPixel, weight);
-- p0 = norm_weight_avg(bgcolor, origPixel, weight, 1.0-weight);
--}
-
- inline double sin2(float per, int n)
- {
---- a/include/plugins/image_utilities.hpp
-+++ b/include/plugins/image_utilities.hpp
-@@ -298,6 +298,18 @@
- // TODO: Test this
-
- template<class T>
-+ void _my_max(const T& a, T& b) {
-+ if (a > b)
-+ b = a;
-+ }
-+
-+ template<>
-+ void _my_max(const ComplexPixel& a, ComplexPixel& b) {
-+ if (a.real() > b.real())
-+ b = a;
-+ }
-+
-+ template<class T>
- typename T::value_type find_max(const T& image) {
- if (image.nrows() <= 1 || image.ncols() <= 1)
- throw std::range_error("Image must have nrows and ncols > 0.");
-@@ -309,13 +321,13 @@
- }
-
- template<class T>
-- void _my_max(const T& a, T& b) {
-- if (a > b)
-+ void _my_min(const T& a, T& b) {
-+ if (b > a)
- b = a;
- }
-
- template<>
-- void _my_max(const ComplexPixel& a, ComplexPixel& b) {
-+ void _my_min(const ComplexPixel& a, ComplexPixel& b) {
- if (a.real() > b.real())
- b = a;
- }
-@@ -331,17 +343,6 @@
- return value;
- }
-
-- template<class T>
-- void _my_min(const T& a, T& b) {
-- if (b > a)
-- b = a;
-- }
--
-- template<>
-- void _my_min(const ComplexPixel& a, ComplexPixel& b) {
-- if (a.real() > b.real())
-- b = a;
-- }
-
- /*
- Fill an image with white.
---- a/include/region.hpp
-+++ b/include/region.hpp
-@@ -129,7 +129,7 @@
- RegionMapTemplate() : std::list<region_type>(0) { }
- virtual ~RegionMapTemplate() { }
- void add_region(const region_type& x) {
-- push_back(x);
-+ this->push_back(x);
- }
- virtual region_type lookup(const rect_t& r) {
- typename self::iterator answer =
---- a/include/vigra/README
-+++ b/include/vigra/README
-@@ -39,4 +39,8 @@
- has been taken from the development branch of VIGRA,
- to avoid rounding errors for exact rotations in rotateImage()
-
-+ - sized_int.hxx
-+ fix for gcc 4.7. This change is already included in the
-+ development branch of VIGRA
-+
- Christoph Dalitz
---- a/include/vigra/sized_int.hxx
-+++ b/include/vigra/sized_int.hxx
-@@ -76,8 +76,8 @@
- template<class LIST>
- struct SelectBiggestIntegerType
- {
-- enum { cursize = LIST::size,
-- nextsize = SelectBiggestIntegerType<typename LIST::next>::size,
-+ enum { cursize = static_cast<int>(LIST::size),
-+ nextsize = static_cast<int>(SelectBiggestIntegerType<typename LIST::next>::size),
- size = (cursize < nextsize) ? nextsize : cursize };
- typedef typename
- IfBool<(cursize < nextsize),
Deleted: packages/gamera/trunk/debian/patches/graphmodule-fix-type-mismatch.diff
===================================================================
--- packages/gamera/trunk/debian/patches/graphmodule-fix-type-mismatch.diff 2012-05-26 14:30:20 UTC (rev 21937)
+++ packages/gamera/trunk/debian/patches/graphmodule-fix-type-mismatch.diff 2012-05-26 14:41:02 UTC (rev 21938)
@@ -1,29 +0,0 @@
-Description: fix type mismatch in graph initialization code
- Fix type mismatch in graph_new() and graph_copy() functions. The ‘i’ format
- unit represents an ‘int’, not an ‘unsigned long’. Use the ‘k’ format unit
- instead.
-Origin: upstream, http://gamera.svn.sourceforge.net/viewvc/gamera/trunk/gamera/src/graph/graphmodule/graphobject.cpp?r1=1315&r2=1324
-Bug: http://tech.groups.yahoo.com/group/gamera-devel/message/2177
-Bug-Debian: http://bugs.debian.org/650520
-Last-Update: 2012-04-18
-
---- a/src/graph/graphmodule/graphobject.cpp
-+++ b/src/graph/graphmodule/graphobject.cpp
-@@ -419,7 +419,7 @@
- PyObject* graph_new(PyTypeObject* pytype, PyObject* args,
- PyObject* kwds) {
- unsigned long flags = FLAG_FREE;
-- if (PyArg_ParseTuple(args, CHAR_PTR_CAST "|i:Graph.__init__", &flags) <= 0)
-+ if (PyArg_ParseTuple(args, CHAR_PTR_CAST "|k:Graph.__init__", &flags) <= 0)
- return NULL;
-
- return (PyObject*)graph_new(flags);
-@@ -479,7 +479,7 @@
- PyObject* graph_copy(PyObject* self, PyObject* args) {
- INIT_SELF_GRAPH();
- unsigned long flags = FLAG_FREE;
-- if (PyArg_ParseTuple(args, CHAR_PTR_CAST "|i:Graph.copy", &flags) <= 0)
-+ if (PyArg_ParseTuple(args, CHAR_PTR_CAST "|k:Graph.copy", &flags) <= 0)
- return NULL;
-
- return (PyObject*)graph_copy(so, flags);
Modified: packages/gamera/trunk/debian/patches/series
===================================================================
--- packages/gamera/trunk/debian/patches/series 2012-05-26 14:30:20 UTC (rev 21937)
+++ packages/gamera/trunk/debian/patches/series 2012-05-26 14:41:02 UTC (rev 21938)
@@ -6,7 +6,5 @@
use-system-python-modules.diff
setup-no-import-wx.diff
namespace-package.diff
-graphmodule-fix-type-mismatch.diff
nosetests.diff
-gcc-4.7-compat.diff
trap-errors-from-pclose.diff
Modified: packages/gamera/trunk/debian/patches/use-system-galib.diff
===================================================================
--- packages/gamera/trunk/debian/patches/use-system-galib.diff 2012-05-26 14:30:20 UTC (rev 21937)
+++ packages/gamera/trunk/debian/patches/use-system-galib.diff 2012-05-26 14:41:02 UTC (rev 21938)
@@ -52,7 +52,7 @@
// for rand
#include <stdlib.h>
#include <time.h>
-@@ -1498,7 +1499,7 @@
+@@ -1527,7 +1528,7 @@
GA1DArrayGenome<double> & genome = (GA1DArrayGenome<double> &)g;
KnnObject* knn = (KnnObject*)genome.userData();
More information about the Python-modules-commits
mailing list