[Gfxprim] [repo.or.cz] gfxprim.git branch generate updated: 59ca35df4a090bfb9ba4e17504263512e3225eef

gavento gavento at ucw.cz
Sat Aug 13 18:17:16 CEST 2011


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project gfxprim.git.

The branch, generate has been updated
       via  59ca35df4a090bfb9ba4e17504263512e3225eef (commit)
      from  88d3600064fa5461ea1aeb818349e8b7ab910283 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://repo.or.cz/w/gfxprim.git/commit/59ca35df4a090bfb9ba4e17504263512e3225eef

commit 59ca35df4a090bfb9ba4e17504263512e3225eef
Author: Tomas Gavenciak <gavento at ucw.cz>
Date:   Sat Aug 13 18:16:47 2011 +0200

    Make generating python2.4 compatible, add bython binary variable

diff --git a/config.mk b/config.mk
index eb23555..962c414 100644
--- a/config.mk
+++ b/config.mk
@@ -5,5 +5,10 @@ LDLIBS+=-ldl
 # path to local module directory
 PYLIBSDIR=$(TOPDIR)/pylib
 
+# Python binary/version
+PYTHON_BIN=python
+# To test with other python versions (example):
+#PYTHON_BIN=${TOPDIR}/virtualpy2.4/bin/python
+
 # Command to run Python with pylib/ modules
-PYTHON=PYTHONPATH=$$PYTHONPATH:${PYLIBSDIR} python -Werror
+PYTHON=PYTHONPATH=$$PYTHONPATH:${PYLIBSDIR} ${PYTHON_BIN} -Werror
diff --git a/pylib/gfxprim/gfxprimconfig.py b/pylib/gfxprim/gfxprimconfig.py
index fd9088b..33c03f9 100644
--- a/pylib/gfxprim/gfxprimconfig.py
+++ b/pylib/gfxprim/gfxprimconfig.py
@@ -32,7 +32,8 @@ class GfxPrimConfig(object):
     self.pixelsizes = pixelsizes
     assert isinstance(self.pixelsizes, list)
     assert self.pixel_size in [i.size for i in self.pixelsizes]
-    assert all((i.size <= self.pixel_size for i in self.pixelsizes))
+    for i in self.pixelsizes:
+      assert i.size <= self.pixel_size
 
     # Set of all encountered channel names
     self.channels = set()
diff --git a/pylib/gfxprim/pixeltype.py b/pylib/gfxprim/pixeltype.py
index e2389a0..fb2744f 100644
--- a/pylib/gfxprim/pixeltype.py
+++ b/pylib/gfxprim/pixeltype.py
@@ -52,7 +52,9 @@ class PixelType(object):
     return (self.name == "UNKNOWN")
 
   def is_rgb(self):
-    return all((i in self.chans for i in 'RGB'))
+    for i in 'RGB':
+      if i not in self.chans: return False
+    return True
 
   def is_gray(self):
     return ('V' in self.chans)

-----------------------------------------------------------------------

Summary of changes:
 config.mk                      |    7 ++++++-
 pylib/gfxprim/gfxprimconfig.py |    3 ++-
 pylib/gfxprim/pixeltype.py     |    4 +++-
 3 files changed, 11 insertions(+), 3 deletions(-)


repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos at gmail.com
if you want to unsubscribe, or site admin admin at repo.or.cz if you receive
no reply.
-- 
gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")



More information about the Gfxprim mailing list