Gfxprim January 2013

gfxprim@ucw.cz

2 participants
36 discussions

[repo.or.cz] gfxprim.git branch master updated: ea13b90643f283c3296b5a0621fb32e937eaf87b
by gavento 02 Jan '13

02 Jan '13

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, master has been updated via ea13b90643f283c3296b5a0621fb32e937eaf87b (commit) via 218adc04c0f5748b3709b2653fb1d14fb62f6cc0 (commit) via 892b5f173094333af4d8184991bb9404759c48a7 (commit) from 3934f00a09db3fc608a39c15889d0788565b7e36 (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/ea13b90643f283c3296b5a0621fb32e937ea… commit ea13b90643f283c3296b5a0621fb32e937eaf87b Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Wed Jan 2 01:18:57 2013 +0100 core: pylib: Fix off-by-one in Blit wrapper diff --git a/pylib/gfxprim/core/__init__.py b/pylib/gfxprim/core/__init__.py index fdf3017..f9db954 100644 --- a/pylib/gfxprim/core/__init__.py +++ b/pylib/gfxprim/core/__init__.py @@ -127,13 +127,15 @@ def _init(module): assert sum([w is not None, sx2 is not None, tx2 is not None]) == 1 assert sum([h is not None, sy2 is not None, ty2 is not None]) == 1 if sx2 is not None: - w = max(0, sx2 - sx) + w = max(0, sx2 - sx + 1) if tx2 is not None: - w = max(0, tx2 - tx) + w = max(0, tx2 - tx + 1) if sy2 is not None: - h = max(0, sy2 - sy) + h = max(0, sy2 - sy + 1) if ty2 is not None: - h = max(0, ty2 - ty) + h = max(0, ty2 - ty + 1) + if (w < 0) or (h < 0): + raise ValueError("Size of blit rect must be non-negative.") return c_core.GP_BlitXYWH_Clipped(self, sx, sy, w, h, target, tx, ty) # Color conversions http://repo.or.cz/w/gfxprim.git/commit/218adc04c0f5748b3709b2653fb1d14fb62f… commit 218adc04c0f5748b3709b2653fb1d14fb62f6cc0 Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Wed Jan 2 01:17:17 2013 +0100 core: pylib: Expand blit tests (rectangle formats) diff --git a/tests/pylib/test_core.py b/tests/pylib/test_core.py index aad219e..80d0408 100644 --- a/tests/pylib/test_core.py +++ b/tests/pylib/test_core.py @@ -157,21 +157,31 @@ def test_subcontext_vs_blit(t): def test_blits_by_rect(t): "Blit defined by XYXY, XYX2Y2 and XYWH" c = ContextRand(17, 13, t, seed=765) - c2a = ContextRand(16, 15, t) - c2b = ContextRand(16, 15, t) - c2c = ContextRand(16, 15, t) + c2a = ContextRand(16, 15, t, seed=4) + c2b = ContextRand(16, 15, t, seed=4) + c2c = ContextRand(16, 15, t, seed=4) + c2d = ContextRand(16, 15, t, seed=4) + c2e = ContextRand(16, 15, t, seed=4) assert c2a == c2b assert c2a == c2c + assert c2a == c2d + assert c2a == c2e assert c != c2a c.Blit(3, 4, c2a, 5, 2, w=4, h=5) - assert c2a != c2c - c.Blit(3, 4, c2b, 5, 2, w=4, h=5) - assert c2b != c2c - c.Blit(3, 4, c2c, 5, 2, w=4, h=5) + assert c2a != c2e + c.Blit(3, 4, c2b, 5, 2, sx2=6, sy2=8) + assert c2b != c2e + c.Blit(3, 4, c2c, 5, 2, tx2=8, ty2=6) + assert c2c != c2e + core.c_core.GP_BlitXYWH(c, 3, 4, 4, 5, c2d, 5, 2) + assert c2d != c2e + core.c_core.GP_BlitXYXY(c, 3, 4, 6, 8, c2e, 5, 2) assert c2a == c2b assert c2a == c2c + assert c2a == c2d + assert c2a == c2e # 'RGBAToPixel', http://repo.or.cz/w/gfxprim.git/commit/892b5f173094333af4d8184991bb9404759c… commit 892b5f173094333af4d8184991bb9404759c48a7 Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Wed Jan 2 01:16:21 2013 +0100 pylib: test: Fix generated func globals and name diff --git a/tests/pylib/testutils.py b/tests/pylib/testutils.py index 4edb403..cdc5c9d 100644 --- a/tests/pylib/testutils.py +++ b/tests/pylib/testutils.py @@ -24,10 +24,11 @@ def alltypes_new_functions(_filter=None): if (_filter is None) or _filter(t): nf = lambda: f(t) nf.__name__ = f.__name__ + "_" + t.name + nf.__module__ = f.__module__ nf.__doc__ = "%s<%s:%s>"% ( f.__doc__ + " " if f.__doc__ else "", - __name__, nf.__name__) - globals()[nf.__name__] = nf + nf.__module__, nf.__name__) + f.__globals__[nf.__name__] = nf return None return decorate ----------------------------------------------------------------------- Summary of changes: pylib/gfxprim/core/__init__.py | 10 ++++++---- tests/pylib/test_core.py | 24 +++++++++++++++++------- tests/pylib/testutils.py | 5 +++-- 3 files changed, 26 insertions(+), 13 deletions(-) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch master updated: 3934f00a09db3fc608a39c15889d0788565b7e36
by gavento 02 Jan '13

02 Jan '13

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, master has been updated via 3934f00a09db3fc608a39c15889d0788565b7e36 (commit) via 2a92e4b5c47d96fca358453efcaddb66a4b4007c (commit) via fcd6ceb84774d065882cfe87b2e64e179ff0e53d (commit) via c4649a19ae46dff6f9e1fbdd002b6c23d95f25e0 (commit) via da9b47d3f6e7b68b41aebfebe7627db7ddc75595 (commit) from f8e9982dea3d60b4db125a4b6aeb56b661f9fe43 (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/3934f00a09db3fc608a39c15889d0788565b… commit 3934f00a09db3fc608a39c15889d0788565b7e36 Merge: 2a92e4b f8e9982 Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Wed Jan 2 00:55:43 2013 +0100 Merge branch 'master' of ssh://repo.or.cz/srv/git/gfxprim http://repo.or.cz/w/gfxprim.git/commit/2a92e4b5c47d96fca358453efcaddb66a4b4… commit 2a92e4b5c47d96fca358453efcaddb66a4b4007c Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Wed Jan 2 00:54:57 2013 +0100 core: pylib: Minor test improvements diff --git a/tests/pylib/test_core.py b/tests/pylib/test_core.py index 58f3bba..aad219e 100644 --- a/tests/pylib/test_core.py +++ b/tests/pylib/test_core.py @@ -1,3 +1,5 @@ +"core.Context tests" + from unittest import SkipTest from testutils import * @@ -5,6 +7,7 @@ from gfxprim import core from gfxprim.core import Context def test_basic_types_exist(): + "There are the basic pixel types" assert core.C.PIXEL_RGB888 > 0 assert core.C.PIXEL_RGBA8888 > 0 assert core.C.PIXEL_G8 > 0 @@ -77,6 +80,7 @@ def test_get_put_pixel(t): @alltypes() def test_str_repr(t): + "Context __str__ and __repr__ work" c = Context(42, 43, t) assert "42x43" in str(c) assert "42x43" in repr(c) @@ -95,22 +99,25 @@ def test_blit_with_offset_and_rotation(t): @alltypes() def test_blit_vs_convert_to_RGB888(t): + "Compare Blit vs Convert" if 'P' in t.name: raise SkipTest("Palette conversions are TODO") - c = ContextRand(42, 43, t) - c2a = Context(c.w, c.h, core.C.PIXEL_RGB888) + c = ContextRand(42, 43, t, seed=0) + c2a = ContextRand(c.w, c.h, core.C.PIXEL_RGB888, seed=42) c2b = c.Convert(core.C.PIXEL_RGB888) c.Blit(0, 0, c2a, 0, 0, w=c.w, h=c.h) assert c2a == c2b @alltypes() def test_copy(t): + "Copying works" c = ContextRand(19, 43, t) c2 = c.Copy(True) assert c == c2 @alltypes() def test_rotate(t): + "Rotations work (and LLL=R)" c = ContextRand(42, 47, t) c2 = c.Copy(True) assert c == c2 @@ -129,13 +136,17 @@ def test_rotate(t): @alltypes() def test_subcontext(t): - c = ContextRand(43, 51, t) - c2a = c.SubContext(5, 7, 10, 9) - c2b = c.SubContext(5, 7, 10, 9) + "Subcontext is sensible" + c1a = ContextRand(43, 51, t) + c1b = ContextRand(43, 51, t) + assert c1a == c1b + c2a = c1a.SubContext(5, 7, 10, 9) + c2b = c1b.SubContext(5, 7, 10, 9) assert c2a == c2b @alltypes() def test_subcontext_vs_blit(t): + "Compare Subcontext and Blit of a rectangle" c = ContextRand(31, 21, t) c2a = c.SubContext(5, 7, 15, 9) c2b = Context(15, 9, t) @@ -144,6 +155,7 @@ def test_subcontext_vs_blit(t): @alltypes() def test_blits_by_rect(t): + "Blit defined by XYXY, XYX2Y2 and XYWH" c = ContextRand(17, 13, t, seed=765) c2a = ContextRand(16, 15, t) c2b = ContextRand(16, 15, t) http://repo.or.cz/w/gfxprim.git/commit/fcd6ceb84774d065882cfe87b2e64e179ff0… commit fcd6ceb84774d065882cfe87b2e64e179ff0e53d Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Wed Jan 2 00:45:12 2013 +0100 test: pylib: Split off test utils, improve @alltypes diff --git a/tests/pylib/test_core.py b/tests/pylib/test_core.py index fb58340..58f3bba 100644 --- a/tests/pylib/test_core.py +++ b/tests/pylib/test_core.py @@ -1,39 +1,8 @@ -### Helper imports and decorators -# TODO: separate (nose plugin?) - from unittest import SkipTest +from testutils import * + from gfxprim import core from gfxprim.core import Context -from random import Random - - -def alltypes(_filter=None): - def decorate(f): - def gen(): - for t in core.PixelTypes[1:]: - if (_filter is None) or _filter(t): - yield f, t - gen.__name__ = f.__name__ - return gen - return decorate - -def ContextRand(w, h, t, seed=None): - "Return new Context(w, h, t) filled with RandomizeContext(c, seed)" - c = Context(w, h, t) - RandomizeContext(c, seed) - return c - -def RandomizeContext(c, seed=None): - if seed is None: - seed = c.w + (2 ** c.h) * c.pixel_type - r = Random(seed) - for x in range(c.w): - for y in range(c.h): - p = r.randint(0, (1 << c.bpp) - 1) - c.PutPixel(x, y, p) - assert c.GetPixel(x, y) == p - -### The actual tests def test_basic_types_exist(): assert core.C.PIXEL_RGB888 > 0 diff --git a/tests/pylib/testutils.py b/tests/pylib/testutils.py new file mode 100644 index 0000000..4edb403 --- /dev/null +++ b/tests/pylib/testutils.py @@ -0,0 +1,60 @@ +### Helper imports and decorators + +from random import Random + +from gfxprim import core + +__all__ = ["alltypes", "RandomizeContext", "ContextRand"] + + +def alltypes_generator(_filter=None): + def decorate(f): + def gen(): + for t in core.PixelTypes[1:]: + if (_filter is None) or _filter(t): + yield f, t + gen.__name__ = f.__name__ + return gen + return decorate + + +def alltypes_new_functions(_filter=None): + def decorate(f): + for t in core.PixelTypes[1:]: + if (_filter is None) or _filter(t): + nf = lambda: f(t) + nf.__name__ = f.__name__ + "_" + t.name + nf.__doc__ = "%s<%s:%s>"% ( + f.__doc__ + " " if f.__doc__ else "", + __name__, nf.__name__) + globals()[nf.__name__] = nf + return None + return decorate + + +# Switch to alltypes_new_functions by default +alltypes = alltypes_new_functions + +### core.Context helpers + +def ContextRand(w, h, t, seed=None): + "Return new Context(w, h, t) filled with RandomizeContext(c, seed)" + c = core.Context(w, h, t) + RandomizeContext(c, seed) + return c + +def RandomizeContext(c, seed=None): + """Fill Context with pseudorandom data. + + The default seed is computed from size and type number. + """ + + if seed is None: + seed = c.w + (1 << c.h) * c.pixel_type + r = Random(seed) + for x in range(c.w): + for y in range(c.h): + p = r.randint(0, (1 << c.bpp) - 1) + c.PutPixel(x, y, p) + assert c.GetPixel(x, y) == p + http://repo.or.cz/w/gfxprim.git/commit/c4649a19ae46dff6f9e1fbdd002b6c23d95f… commit c4649a19ae46dff6f9e1fbdd002b6c23d95f25e0 Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Wed Jan 2 00:31:14 2013 +0100 core: pylib: Minor modifications to blit tests diff --git a/tests/pylib/test_core.py b/tests/pylib/test_core.py index 3889c87..fb58340 100644 --- a/tests/pylib/test_core.py +++ b/tests/pylib/test_core.py @@ -29,7 +29,9 @@ def RandomizeContext(c, seed=None): r = Random(seed) for x in range(c.w): for y in range(c.h): - c.PutPixel(x, y, r.randint(0, (1 << c.bpp) - 1)) + p = r.randint(0, (1 << c.bpp) - 1) + c.PutPixel(x, y, p) + assert c.GetPixel(x, y) == p ### The actual tests @@ -59,7 +61,7 @@ def test_check_attributes(t): assert c._free_pixels @alltypes() -def test_context_convert_from_RGB888(t): +def test_convert_from_RGB888(t): "Conversion from RGB888" if 'P' in t.name: raise SkipTest("Palette conversion are TODO") @@ -128,8 +130,8 @@ def test_blit_vs_convert_to_RGB888(t): raise SkipTest("Palette conversions are TODO") c = ContextRand(42, 43, t) c2a = Context(c.w, c.h, core.C.PIXEL_RGB888) - c.Blit(0, 0, c2a, 0, 0, w=c.w, h=c.h) c2b = c.Convert(core.C.PIXEL_RGB888) + c.Blit(0, 0, c2a, 0, 0, w=c.w, h=c.h) assert c2a == c2b @alltypes() http://repo.or.cz/w/gfxprim.git/commit/da9b47d3f6e7b68b41aebfebe7627db7ddc7… commit da9b47d3f6e7b68b41aebfebe7627db7ddc75595 Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Wed Jan 2 00:24:02 2013 +0100 core: Remove a buggy special case in blitXYXY_Raw_xBPP diff --git a/libs/core/GP_Blit.gen.c.t b/libs/core/GP_Blit.gen.c.t index 0c482af..ccb924a 100644 --- a/libs/core/GP_Blit.gen.c.t +++ b/libs/core/GP_Blit.gen.c.t @@ -27,9 +27,9 @@ static void blitXYXY_Naive_Raw(const GP_Context *src, for (x = x0; x <= x1; x++) { GP_Pixel p = GP_GetPixel_Raw(src, x, y); - if (src->pixel_type != dst->pixel_type) + if (src->pixel_type != dst->pixel_type) p = GP_ConvertContextPixel(p, src, dst); - + GP_PutPixel_Raw(dst, x2 + (x - x0), y2 + (y - y0), p); } @@ -44,19 +44,8 @@ static void blitXYXY_Raw_{{ ps.suffix }}(const GP_Context *src, GP_Coord x0, GP_Coord y0, GP_Coord x1, GP_Coord y1, GP_Context *dst, GP_Coord x2, GP_Coord y2) { - /* Special case - copy whole line-block with one memcpy() */ - if ((x0 == 0) && (x2 == 0) && (x1 == (GP_Coord)src->w - 1) && - (src->w == dst->w) && - (src->bytes_per_row == dst->bytes_per_row)) { - - memcpy(dst->pixels + dst->bytes_per_row * y2, - src->pixels + src->bytes_per_row * y0, - src->bytes_per_row * y1); - return; - } - %% if not ps.needs_bit_endian() - /* General case - memcpy() each horizontal line */ + /* memcpy() each horizontal line */ GP_Coord y; for (y = 0; y <= (y1 - y0); y++) @@ -81,7 +70,7 @@ static void blitXYXY_Raw_{{ ps.suffix }}(const GP_Context *src, uint8_t *p2 = (uint8_t *) GP_PIXEL_ADDR_{{ ps.suffix }}(dst, x2, y2); uint8_t *end_p1 = (uint8_t *) GP_PIXEL_ADDR_{{ ps.suffix }}(src, x1, y0); uint8_t *end_p2 = (uint8_t *) GP_PIXEL_ADDR_{{ ps.suffix }}(dst, x2, y2); - + GP_Coord i; for (i = 0; i < (y1 - y0 + 1); i++) { ----------------------------------------------------------------------- Summary of changes: libs/core/GP_Blit.gen.c.t | 19 +++----------- tests/pylib/test_core.py | 57 +++++++++++++++--------------------------- tests/pylib/testutils.py | 60 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 84 insertions(+), 52 deletions(-) create mode 100644 tests/pylib/testutils.py repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch master updated: f8e9982dea3d60b4db125a4b6aeb56b661f9fe43
by metan 02 Jan '13

02 Jan '13

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, master has been updated via f8e9982dea3d60b4db125a4b6aeb56b661f9fe43 (commit) from 6cc8cbbe7416776f1349a808a7c12fde991a49aa (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/f8e9982dea3d60b4db125a4b6aeb56b661f9… commit f8e9982dea3d60b4db125a4b6aeb56b661f9fe43 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Wed Jan 2 00:36:58 2013 +0100 doc: context: Clarify the context->pixels description. diff --git a/doc/context.txt b/doc/context.txt index 0d1d18b..b973f91 100644 --- a/doc/context.txt +++ b/doc/context.txt @@ -37,10 +37,17 @@ typedef struct GP_Context { } GP_Context; ------------------------------------------------------------------------------- -The 'pixels' field points to the image data, stored as a one-dimensional -array of byte-aligned lines. (There can be some unused space at the end of -each line; this is reflected by the 'bytes_per_row' value being greater -than what would be needed for that pixel format). +The 'pixels' field points to the image data. + +The 'pixels' are stored as a one-dimensional array consisting of byte-aligned +lines (i.e. each image line starts at whole byte and ends at whole byte). The +'pixels' array starts exactly at the start of the first line. Each line is +'bytes_per_row' bytes long. The first pixel may actually start at 'offset' bit +in the first byte in each line (but only for some sub contexts for pixel types +that are not byte aligned). The first pixel is followed by the rest of the +pixels in the image line (there is 'w' pixels in each line) and ends somewhere +before the end of the line (i.e. there may be padding before the start of the +next line or in case of subcontexts image data of the parent context). Rotation ^^^^^^^^ ----------------------------------------------------------------------- Summary of changes: doc/context.txt | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch master updated: 6cc8cbbe7416776f1349a808a7c12fde991a49aa
by metan 01 Jan '13

01 Jan '13

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, master has been updated via 6cc8cbbe7416776f1349a808a7c12fde991a49aa (commit) via 0adeef8600221b641cdc7dcb94b8a78f8d7b17de (commit) from 19c17eca8a9cfe5e86527548a50512d43ff26cf0 (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/6cc8cbbe7416776f1349a808a7c12fde991a… commit 6cc8cbbe7416776f1349a808a7c12fde991a49aa Merge: 0adeef8 19c17ec Author: Cyril Hrubis <metan(a)ucw.cz> Date: Tue Jan 1 21:37:32 2013 +0100 Merge ssh://repo.or.cz/srv/git/gfxprim http://repo.or.cz/w/gfxprim.git/commit/0adeef8600221b641cdc7dcb94b8a78f8d7b… commit 0adeef8600221b641cdc7dcb94b8a78f8d7b17de Author: Cyril Hrubis <metan(a)ucw.cz> Date: Tue Jan 1 21:36:06 2013 +0100 core: Comment out broken blit optimalization. The optimalization code for not byte aligned pixels is wrong and triggers asserts. Comment it out and make use of the naive implementation for now. diff --git a/libs/core/GP_Blit.gen.c.t b/libs/core/GP_Blit.gen.c.t index 07a153c..0c482af 100644 --- a/libs/core/GP_Blit.gen.c.t +++ b/libs/core/GP_Blit.gen.c.t @@ -64,7 +64,7 @@ static void blitXYXY_Raw_{{ ps.suffix }}(const GP_Context *src, GP_PIXEL_ADDR_{{ ps.suffix }}(src, x0, y0 + y), {{ int(ps.size/8) }} * (x1 - x0 + 1)); %% else - /* Rectangles may not be bit-aligned in the same way! */ +{# /* Rectangles may not be bit-aligned in the same way! */ /* Alignment (index) of first bits in the first byte */ //TODO: This is wrong for subcontexts where the offset // needs to be summed with context->offset and moduled @@ -96,6 +96,7 @@ static void blitXYXY_Raw_{{ ps.suffix }}(const GP_Context *src, end_p2 += dst->bytes_per_row; } } else /* Different bit-alignment, can't use memcpy() */ +#} blitXYXY_Naive_Raw(src, x0, y0, x1, y1, dst, x2, y2); %% endif } ----------------------------------------------------------------------- Summary of changes: libs/core/GP_Blit.gen.c.t | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch master updated: 19c17eca8a9cfe5e86527548a50512d43ff26cf0
by gavento 01 Jan '13

01 Jan '13

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, master has been updated via 19c17eca8a9cfe5e86527548a50512d43ff26cf0 (commit) from 0841a375e21de5071687413607915ed4d5b191bf (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/19c17eca8a9cfe5e86527548a50512d43ff2… commit 19c17eca8a9cfe5e86527548a50512d43ff26cf0 Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Tue Jan 1 21:35:53 2013 +0100 doc: Coding style for Python diff --git a/doc/coding_style.txt b/doc/coding_style.txt index b4afeaf..ebd0f3f 100644 --- a/doc/coding_style.txt +++ b/doc/coding_style.txt @@ -16,13 +16,13 @@ link:http://www.kernel.org/doc/Documentation/CodingStyle[link] (it's funny and enligthening reading). .Indentation and whitespaces - + * We use tabs for indentation and tab is eight spaces wide. - + * Lines should be at most 80 chars long. - + * No additional whitespaces (other than newline) at the end of line. - + * Each file must end with newline (most editors do that automatically, beware of Kate). @@ -37,11 +37,11 @@ enligthening reading). /* WRONG */ if (something) do_work(); do_other(); - + /* RIGHT */ if (something) do_work(); - + do_other(); ---- @@ -117,7 +117,7 @@ GFXprim Specific Rules ** The basic structures are also typedefed so you can wite 'GP_Context' instead of 'struct GP_Context'. ** Other uses of typedef are frowned upon. - + * When you add an externally visible symbol, i.e. new API function please add its name into the corresponding file at 'build/syms/'. You may also run the 'buld/check_symbols.sh' script to check that you haven't @@ -126,4 +126,22 @@ GFXprim Specific Rules Python Coding Style ~~~~~~~~~~~~~~~~~~~ -TODO +The Python parts of GFXprim follow mostly coding style outlined in +link:http://www.python.org/dev/peps/pep-0008/[PEP 8]. +The major difference is that the default indent is 2 spaces. +All files should be ASCII unless required otherwise. + +GFXPrim uses CamelCase as described in the C section. +The names are mostly derived from the corresponding C names without +the 'GP_' prefix. +All wrapped symbols of a module are available in the SWIG modules 'foo.c_foo' +(i.e. 'core.c_core'). + +Some number and enum types are typedeffed in C, but left as integers +in the Python interface. +All constants are available in 'foo.C' submodules (i.e. 'core.C') +to avoid clutter. + +Where this makes sense, functions should be available as methods of +an object (i.e. 'Context.Copy()' rather than 'Copy(context)'). Be Pythonic. + ----------------------------------------------------------------------- Summary of changes: doc/coding_style.txt | 34 ++++++++++++++++++++++++++-------- 1 files changed, 26 insertions(+), 8 deletions(-) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch master updated: 0841a375e21de5071687413607915ed4d5b191bf
by gavento 01 Jan '13

01 Jan '13

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, master has been updated via 0841a375e21de5071687413607915ed4d5b191bf (commit) via 33cdab55c6d7fb13d5845b5fdf7174f493e74160 (commit) via 84dbd5eb640c75933117e24785a84ddd40bc299d (commit) via db0a648c957c21c98c32dd06bce2dafd47f4a784 (commit) via 4c6265fad1a9d6d32947d34af9e258a3fec7a539 (commit) via 63aa717a239d4a15d17754d101beefe051862d23 (commit) from 631cb441b16c00328d2659334528d341d582fad6 (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/0841a375e21de5071687413607915ed4d5b1… commit 0841a375e21de5071687413607915ed4d5b191bf Merge: 33cdab5 631cb44 Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Tue Jan 1 14:54:51 2013 +0100 Merge branch 'master' of ssh://repo.or.cz/srv/git/gfxprim http://repo.or.cz/w/gfxprim.git/commit/33cdab55c6d7fb13d5845b5fdf7174f493e7… commit 33cdab55c6d7fb13d5845b5fdf7174f493e74160 Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Mon Dec 31 19:15:11 2012 +0100 core: pylib: Added more tests, discovered bugs in core diff --git a/tests/pylib/test_core.py b/tests/pylib/test_core.py index 9417990..3889c87 100644 --- a/tests/pylib/test_core.py +++ b/tests/pylib/test_core.py @@ -113,6 +113,16 @@ def test_str_repr(t): assert t.name in repr(c) @alltypes() +def test_blit_with_offset_and_rotation(t): + "Blit with various shifts and rotation" + c1 = ContextRand(19, 17, t) + for r in range(4): + for i in [0,1,2]: + c2 = Context(51-i, 25+i, t) + c1.Blit(2+i, 3+i, c2, 1+i, 4-i, w=2+3*i, h=13-i) + c1.RotateCW() + +@alltypes() def test_blit_vs_convert_to_RGB888(t): if 'P' in t.name: raise SkipTest("Palette conversions are TODO") @@ -122,10 +132,66 @@ def test_blit_vs_convert_to_RGB888(t): c2b = c.Convert(core.C.PIXEL_RGB888) assert c2a == c2b -#'Blit', -# 'Copy', +@alltypes() +def test_copy(t): + c = ContextRand(19, 43, t) + c2 = c.Copy(True) + assert c == c2 + +@alltypes() +def test_rotate(t): + c = ContextRand(42, 47, t) + c2 = c.Copy(True) + assert c == c2 + c2.RotateCCW() + assert c != c2 + c.RotateCCW() + assert c == c2 + c2.RotateCCW() + assert c != c2 + c2.RotateCCW() + assert c != c2 + c2.RotateCCW() + assert c != c2 + c.RotateCW() + assert c == c2 + +@alltypes() +def test_subcontext(t): + c = ContextRand(43, 51, t) + c2a = c.SubContext(5, 7, 10, 9) + c2b = c.SubContext(5, 7, 10, 9) + assert c2a == c2b + +@alltypes() +def test_subcontext_vs_blit(t): + c = ContextRand(31, 21, t) + c2a = c.SubContext(5, 7, 15, 9) + c2b = Context(15, 9, t) + c.Blit(5, 7, c2b, 0, 0, w=15, h=9) + assert c2a == c2b + +@alltypes() +def test_blits_by_rect(t): + c = ContextRand(17, 13, t, seed=765) + c2a = ContextRand(16, 15, t) + c2b = ContextRand(16, 15, t) + c2c = ContextRand(16, 15, t) + assert c2a == c2b + assert c2a == c2c + assert c != c2a + + c.Blit(3, 4, c2a, 5, 2, w=4, h=5) + assert c2a != c2c + c.Blit(3, 4, c2b, 5, 2, w=4, h=5) + assert c2b != c2c + c.Blit(3, 4, c2c, 5, 2, w=4, h=5) + + assert c2a == c2b + assert c2a == c2c + + # 'RGBAToPixel', # 'RGBToPixel', # 'Resize', -# 'SubContext', http://repo.or.cz/w/gfxprim.git/commit/84dbd5eb640c75933117e24785a84ddd40bc… commit 84dbd5eb640c75933117e24785a84ddd40bc299d Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Mon Dec 31 18:36:53 2012 +0100 core: pylib: (pseudo)randomize contexts in tests diff --git a/tests/pylib/test_core.py b/tests/pylib/test_core.py index 09cbf03..9417990 100644 --- a/tests/pylib/test_core.py +++ b/tests/pylib/test_core.py @@ -2,6 +2,10 @@ # TODO: separate (nose plugin?) from unittest import SkipTest +from gfxprim import core +from gfxprim.core import Context +from random import Random + def alltypes(_filter=None): def decorate(f): @@ -13,11 +17,21 @@ def alltypes(_filter=None): return gen return decorate +def ContextRand(w, h, t, seed=None): + "Return new Context(w, h, t) filled with RandomizeContext(c, seed)" + c = Context(w, h, t) + RandomizeContext(c, seed) + return c -### The actual tests +def RandomizeContext(c, seed=None): + if seed is None: + seed = c.w + (2 ** c.h) * c.pixel_type + r = Random(seed) + for x in range(c.w): + for y in range(c.h): + c.PutPixel(x, y, r.randint(0, (1 << c.bpp) - 1)) -from gfxprim import core -from gfxprim.core import Context +### The actual tests def test_basic_types_exist(): assert core.C.PIXEL_RGB888 > 0 @@ -49,7 +63,7 @@ def test_context_convert_from_RGB888(t): "Conversion from RGB888" if 'P' in t.name: raise SkipTest("Palette conversion are TODO") - c = Context(17, 19, core.C.PIXEL_RGB888) + c = ContextRand(17, 19, core.C.PIXEL_RGB888) # both by number and the pixeltype c2 = c.Convert(t) assert c2.pixel_type == t.type @@ -61,26 +75,28 @@ def test_convert_to_RGB888(t): "Conversion to RGB888" if 'P' in t.name: raise SkipTest("Palette conversion are TODO") - c = Context(1, 1, t) + c = ContextRand(11, 12, t) c2 = c.Convert(core.C.PIXEL_RGB888) assert c2.pixel_type == core.C.PIXEL_RGB888 @alltypes() -def test_equality_same_type(t): - "Basics of equality" - c1 = Context(2, 1, t) - assert c1 == c1 - c2 = Context(1, 2, t) +def test_equality(t): + "Equality" + c1a = ContextRand(2, 11, t, seed=123) + c1b = ContextRand(2, 11, t, seed=123) + assert c1a == c1a + assert c1a == c1b + c2 = ContextRand(2, 11, t, seed=456) assert c2 == c2 - assert c1 != c2 - assert c2 != c1 + assert c1a != c2 + assert c2 != c1a @alltypes() def test_get_put_pixel(t): "Get/Put pixel consistent" def f(x,y): return (x + 3 ** y) % (1 << t.size) - c = Context(45, 37, t) + c = ContextRand(45, 37, t) for x in range(c.w): for y in range(c.h): c.PutPixel(x, y, f(x, y)) @@ -89,17 +105,6 @@ def test_get_put_pixel(t): assert c.GetPixel(x, y) == f(x, y) @alltypes() -def test_equality_data(t): - "Equality of data" - c1 = Context(1, 1, t) - c1.PutPixel(0, 0, 1) - c2 = Context(1, 1, t) - c2.PutPixel(0, 0, 1) - assert c1 == c2 - c2.PutPixel(0, 0, 0) - assert c1 != c2 - -@alltypes() def test_str_repr(t): c = Context(42, 43, t) assert "42x43" in str(c) @@ -111,7 +116,7 @@ def test_str_repr(t): def test_blit_vs_convert_to_RGB888(t): if 'P' in t.name: raise SkipTest("Palette conversions are TODO") - c = Context(42, 43, t) + c = ContextRand(42, 43, t) c2a = Context(c.w, c.h, core.C.PIXEL_RGB888) c.Blit(0, 0, c2a, 0, 0, w=c.w, h=c.h) c2b = c.Convert(core.C.PIXEL_RGB888) @@ -122,7 +127,5 @@ def test_blit_vs_convert_to_RGB888(t): # 'RGBAToPixel', # 'RGBToPixel', # 'Resize', -# 'RotateCCW', -# 'RotateCW', # 'SubContext', http://repo.or.cz/w/gfxprim.git/commit/db0a648c957c21c98c32dd06bce2dafd47f4… commit db0a648c957c21c98c32dd06bce2dafd47f4a784 Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Mon Dec 31 18:01:58 2012 +0100 core: pylib: Convert, Blit fix and tests diff --git a/pylib/gfxprim/core/__init__.py b/pylib/gfxprim/core/__init__.py index ddfaaa2..fdf3017 100644 --- a/pylib/gfxprim/core/__init__.py +++ b/pylib/gfxprim/core/__init__.py @@ -134,7 +134,7 @@ def _init(module): h = max(0, sy2 - sy) if ty2 is not None: h = max(0, ty2 - ty) - return c_core.GP_BlitXYWH_Clipped(self, sx, sy, target, tx, ty, w, h) + return c_core.GP_BlitXYWH_Clipped(self, sx, sy, w, h, target, tx, ty) # Color conversions diff --git a/tests/pylib/test_core.py b/tests/pylib/test_core.py index 5c9ba2e..09cbf03 100644 --- a/tests/pylib/test_core.py +++ b/tests/pylib/test_core.py @@ -48,7 +48,7 @@ def test_check_attributes(t): def test_context_convert_from_RGB888(t): "Conversion from RGB888" if 'P' in t.name: - raise SkipTest("Palette conversion os TODO") + raise SkipTest("Palette conversion are TODO") c = Context(17, 19, core.C.PIXEL_RGB888) # both by number and the pixeltype c2 = c.Convert(t) @@ -60,7 +60,7 @@ def test_context_convert_from_RGB888(t): def test_convert_to_RGB888(t): "Conversion to RGB888" if 'P' in t.name: - raise SkipTest("Palette conversion os TODO") + raise SkipTest("Palette conversion are TODO") c = Context(1, 1, t) c2 = c.Convert(core.C.PIXEL_RGB888) assert c2.pixel_type == core.C.PIXEL_RGB888 @@ -76,6 +76,19 @@ def test_equality_same_type(t): assert c2 != c1 @alltypes() +def test_get_put_pixel(t): + "Get/Put pixel consistent" + def f(x,y): + return (x + 3 ** y) % (1 << t.size) + c = Context(45, 37, t) + for x in range(c.w): + for y in range(c.h): + c.PutPixel(x, y, f(x, y)) + for x in range(c.w): + for y in range(c.h): + assert c.GetPixel(x, y) == f(x, y) + +@alltypes() def test_equality_data(t): "Equality of data" c1 = Context(1, 1, t) @@ -93,3 +106,23 @@ def test_str_repr(t): assert "42x43" in repr(c) assert t.name in str(c) assert t.name in repr(c) + +@alltypes() +def test_blit_vs_convert_to_RGB888(t): + if 'P' in t.name: + raise SkipTest("Palette conversions are TODO") + c = Context(42, 43, t) + c2a = Context(c.w, c.h, core.C.PIXEL_RGB888) + c.Blit(0, 0, c2a, 0, 0, w=c.w, h=c.h) + c2b = c.Convert(core.C.PIXEL_RGB888) + assert c2a == c2b + +#'Blit', +# 'Copy', +# 'RGBAToPixel', +# 'RGBToPixel', +# 'Resize', +# 'RotateCCW', +# 'RotateCW', +# 'SubContext', + http://repo.or.cz/w/gfxprim.git/commit/4c6265fad1a9d6d32947d34af9e258a3fec7… commit 4c6265fad1a9d6d32947d34af9e258a3fec7a539 Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Mon Dec 31 17:42:32 2012 +0100 core: pylib: Improve str and repr (and tests) diff --git a/pylib/gfxprim/core/__init__.py b/pylib/gfxprim/core/__init__.py index 8f24919..ddfaaa2 100644 --- a/pylib/gfxprim/core/__init__.py +++ b/pylib/gfxprim/core/__init__.py @@ -45,8 +45,8 @@ def _init(module): @extend(_context, name='__str__') @extend(_context, name='__repr__') def context_str(self): - return "<Context %dx%d, %dbpp, GP_Context %sowned, %s parent>" % ( - self.w, self.h, self.bpp, + return "<Context %dx%d %s (%dbpp), GP_Context %sowned, %s parent>" % ( + self.w, self.h, module['PixelTypes'][self.pixel_type].name, self.bpp, "" if self.thisown else "not ", "with" if self.parent else "no") diff --git a/tests/pylib/test_core.py b/tests/pylib/test_core.py index d718390..5c9ba2e 100644 --- a/tests/pylib/test_core.py +++ b/tests/pylib/test_core.py @@ -1,5 +1,3 @@ -"core.Context" - ### Helper imports and decorators # TODO: separate (nose plugin?) @@ -88,5 +86,10 @@ def test_equality_data(t): c2.PutPixel(0, 0, 0) assert c1 != c2 -#@alltypes() -#def test_equality_data(t): +@alltypes() +def test_str_repr(t): + c = Context(42, 43, t) + assert "42x43" in str(c) + assert "42x43" in repr(c) + assert t.name in str(c) + assert t.name in repr(c) http://repo.or.cz/w/gfxprim.git/commit/63aa717a239d4a15d17754d101beefe05186… commit 63aa717a239d4a15d17754d101beefe051862d23 Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Sun Dec 30 22:28:18 2012 +0100 core: pylib: Create Contex.__init__ (remove Context.Create) diff --git a/pylib/gfxprim/core/__init__.py b/pylib/gfxprim/core/__init__.py index 1b082f5..8f24919 100644 --- a/pylib/gfxprim/core/__init__.py +++ b/pylib/gfxprim/core/__init__.py @@ -59,7 +59,7 @@ def _init(module): raise TypeError("Can only compare two Contexts.") return bool(c_core.GP_ContextEqual(self, other)) - # Creation + # Constructor def pixeltype_no(pixeltype): "Return pixel type number from the number or a PixelType instance" @@ -69,14 +69,16 @@ def _init(module): return pixeltype.type raise TypeError("Not a PixelType instance or number: %r", pixeltype) - @extend(_context, name='Create') - @staticmethod - def Create(w, h, pixeltype): + extend(_context, name='__swig_init__')(_context.__init__) + + @extend(_context, name='__init__') + def ContextCreate(self, w, h, pixeltype): "Allocate a new w*h bitmap of given type." # Add "parent" attribute, pointing to a wrapper of the actual parent or None - c = c_core.GP_ContextAlloc(w, h, pixeltype_no(pixeltype)) - c.parent = None - return c + _context.__swig_init__(self, w, h, pixeltype_no(pixeltype)) + self.parent = None + + # New instance methods @extend(_context) def SubContext(self, x, y, w, h): @@ -98,6 +100,7 @@ def _init(module): return c_core.GP_ContextConvertAlloc(self, pixeltype_no(target_type)) # Manipulation + extend_direct(_context, "PutPixel", c_core.GP_PutPixel, "Set a pixel value encoded according to context PixelType. Clipped.") diff --git a/pylib/gfxprim/core/core.i b/pylib/gfxprim/core/core.i index 89c0301..b7725eb 100644 --- a/pylib/gfxprim/core/core.i +++ b/pylib/gfxprim/core/core.i @@ -85,14 +85,12 @@ and self.thisown.") GP_Context; $self->w, $self->h, $self->bpp, $self->free_pixels); GP_ContextFree($self); } - /* - PyObject *_hacky_hacky_pixels_buffer() { - GP_DEBUG(0, "Evil and dangerous _hacky_hacky_pixels_buffer() used!"); - return PyBuffer_FromMemory($self->pixels, $self->bytes_per_row * $self->h); + GP_Context(GP_Coord w, GP_Coord h, GP_PixelType typeno) { + return GP_ContextAlloc(w, h, typeno); } - */ }; + /* Error handling */ ERROR_ON_NONZERO(GP_ContextResize); ERROR_ON_NULL(GP_ContextAlloc); diff --git a/tests/pylib/test_core.py b/tests/pylib/test_core.py index f1703a5..d718390 100644 --- a/tests/pylib/test_core.py +++ b/tests/pylib/test_core.py @@ -29,17 +29,17 @@ def test_basic_types_exist(): @alltypes() def test_create_by_pixeltype(t): "Allocate Context by pixeltype" - c = Context.Create(13, 15, t.type) + c = Context(13, 15, t.type) @alltypes() def test_create_by_number(t): "Allocation by pixeltype number" - c = Context.Create(3, 5, t) + c = Context(3, 5, t) @alltypes() def test_check_attributes(t): "Context attributes" - c = Context.Create(13, 15, t.type) + c = Context(13, 15, t.type) assert c.w == 13 assert c.h == 15 assert c._bit_endian == t.bit_endian @@ -51,7 +51,7 @@ def test_context_convert_from_RGB888(t): "Conversion from RGB888" if 'P' in t.name: raise SkipTest("Palette conversion os TODO") - c = Context.Create(17, 19, core.C.PIXEL_RGB888) + c = Context(17, 19, core.C.PIXEL_RGB888) # both by number and the pixeltype c2 = c.Convert(t) assert c2.pixel_type == t.type @@ -63,16 +63,16 @@ def test_convert_to_RGB888(t): "Conversion to RGB888" if 'P' in t.name: raise SkipTest("Palette conversion os TODO") - c = Context.Create(1, 1, t) + c = Context(1, 1, t) c2 = c.Convert(core.C.PIXEL_RGB888) assert c2.pixel_type == core.C.PIXEL_RGB888 @alltypes() def test_equality_same_type(t): "Basics of equality" - c1 = Context.Create(2, 1, t) + c1 = Context(2, 1, t) assert c1 == c1 - c2 = Context.Create(1, 2, t) + c2 = Context(1, 2, t) assert c2 == c2 assert c1 != c2 assert c2 != c1 @@ -80,11 +80,13 @@ def test_equality_same_type(t): @alltypes() def test_equality_data(t): "Equality of data" - c1 = Context.Create(1, 1, t) + c1 = Context(1, 1, t) c1.PutPixel(0, 0, 1) - c2 = Context.Create(1, 1, t) + c2 = Context(1, 1, t) c2.PutPixel(0, 0, 1) assert c1 == c2 c2.PutPixel(0, 0, 0) assert c1 != c2 +#@alltypes() +#def test_equality_data(t): ----------------------------------------------------------------------- Summary of changes: pylib/gfxprim/core/__init__.py | 23 +++--- pylib/gfxprim/core/core.i | 8 +- tests/pylib/test_core.py | 163 +++++++++++++++++++++++++++++++++------- 3 files changed, 151 insertions(+), 43 deletions(-) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

Gfxprim January 2013