- Gfxprim - ucw.cz

[repo.or.cz] gfxprim.git branch master updated: 81cfb3c3c3d08268a25747d38e05274c8b335300
by metan 19 Mar '13

19 Mar '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 81cfb3c3c3d08268a25747d38e05274c8b335300 (commit) via 57342d11f3b297b3094b1a7ad23c037d369563b3 (commit) via 7c0b661b5432f428fa62f362a45d70ee3081a8d3 (commit) via 8de99349842bc33fb809ed145ac767739bdecec2 (commit) from 2b990abb940a194551bed5dc1404fc7b6652fefc (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/81cfb3c3c3d08268a25747d38e05274c8b33… commit 81cfb3c3c3d08268a25747d38e05274c8b335300 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Tue Mar 19 23:21:40 2013 +0100 demos: py_simple: showimage.py: Add input event hanlding. diff --git a/demos/py_simple/showimage.py b/demos/py_simple/showimage.py index 768d640..b952078 100755 --- a/demos/py_simple/showimage.py +++ b/demos/py_simple/showimage.py @@ -5,6 +5,7 @@ import sys import gfxprim.core as core import gfxprim.loaders as loaders import gfxprim.backends as backends +import gfxprim.input as input def main(): if len(sys.argv) != 2: @@ -19,9 +20,17 @@ def main(): img.Blit(0, 0, bk.context, 0, 0, img.w, img.h) bk.Flip() - # TODO: Input events while True: - bk.Poll() + bk.Wait() + ev = bk.GetEvent() + + input.EventDump(ev) + + if (ev.type == input.EV_KEY): + sys.exit(0) + elif (ev.type == input.EV_SYS): + if (ev.code == input.EV_SYS_QUIT): + sys.exit(0) if __name__ == '__main__': main() http://repo.or.cz/w/gfxprim.git/commit/57342d11f3b297b3094b1a7ad23c037d3695… commit 57342d11f3b297b3094b1a7ad23c037d369563b3 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Tue Mar 19 23:20:14 2013 +0100 pywrap: backends: Hacked support for input events. diff --git a/pylib/gfxprim/backends/_extend_backend.py b/pylib/gfxprim/backends/_extend_backend.py index ae351d7..97975a7 100644 --- a/pylib/gfxprim/backends/_extend_backend.py +++ b/pylib/gfxprim/backends/_extend_backend.py @@ -1,5 +1,6 @@ from ..utils import extend, add_swig_getmethod, add_swig_setmethod from . import c_backends +from ..input import c_input def extend_backend(_backend): """ @@ -29,6 +30,11 @@ def extend_backend(_backend): return c_backends.GP_BackendPoll(self) @extend(_backend) + def Wait(self): + "Waits for backend event" + return c_backends.GP_BackendWait(self) + + @extend(_backend) def SetCaption(self, caption): "Set backend window caption (if possible)" return c_backends.GP_BackendSetCaption(self, caption) @@ -37,3 +43,13 @@ def extend_backend(_backend): def Resize(self, w, h): "Resize backend window (if possible)" return c_backends.GP_BackendResize(self, w, h) + + @extend(_backend) + def GetEvent(self): + "Removes and returns event from the top of the event queue" + if c_backends.GP_BackendEventsQueued(self) == 0: + return None + ev = c_input.GP_Event(); + if c_backends.GP_BackendGetEvent(self, ev) != 0: + return ev + return None http://repo.or.cz/w/gfxprim.git/commit/7c0b661b5432f428fa62f362a45d70ee3081… commit 7c0b661b5432f428fa62f362a45d70ee3081a8d3 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Tue Mar 19 23:14:42 2013 +0100 pywrap: input: Fix & constructor for GP_Event. * Fixes the input module wrapping * Adds constructor and destructor for GP_Event diff --git a/pylib/gfxprim/input/C.py b/pylib/gfxprim/input/C.py deleted file mode 100644 index c8f987f..0000000 --- a/pylib/gfxprim/input/C.py +++ /dev/null @@ -1,3 +0,0 @@ -""" -Submodule for constants -""" diff --git a/pylib/gfxprim/input/__init__.py b/pylib/gfxprim/input/__init__.py index 31c371f..4a77b23 100644 --- a/pylib/gfxprim/input/__init__.py +++ b/pylib/gfxprim/input/__init__.py @@ -2,10 +2,7 @@ Module wrapping GfxPrim Input. """ -from . import input_c - -# Constants module -from . import C +from . import c_input def _init(module): # Import some members from the SWIG module @@ -14,13 +11,9 @@ def _init(module): def strip_GP(s): return re.sub('^GP_', '', s) - # Constants - const_regexes = ['^GP_[A-Z0-9_]*$'] - import_members(input_c, C, include=const_regexes, sub=strip_GP) - # Functions - import_members(input_c, module, sub=strip_GP, - exclude=const_regexes + [ + import_members(c_input, module, sub=strip_GP, + exclude=[ '^gfxprim$', '^w+_swigregister$', '^_w+$']) diff --git a/pylib/gfxprim/input/input.i b/pylib/gfxprim/input/input.i index a9899a3..43b5a4a 100644 --- a/pylib/gfxprim/input/input.i +++ b/pylib/gfxprim/input/input.i @@ -1,8 +1,20 @@ %include "../common.i" -%module(package="gfxprim.input") input_c +%module(package="gfxprim.input") c_input %{ +#include "core/GP_Debug.h" #include "input/GP_Input.h" %} +%extend GP_Event { + ~GP_Event() { + GP_DEBUG(2, "[wrapper] GP_Event free()"); + free($self); + } + GP_Event() { + GP_DEBUG(2, "[wrapper] GP_Event malloc()"); + return malloc(sizeof(GP_Event)); + } +}; + %include "GP_Event.h" http://repo.or.cz/w/gfxprim.git/commit/8de99349842bc33fb809ed145ac767739bde… commit 8de99349842bc33fb809ed145ac767739bdecec2 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Tue Mar 19 22:39:37 2013 +0100 demos: py_simple: New demo showimage.py. diff --git a/demos/py_simple/showimage.py b/demos/py_simple/showimage.py new file mode 100755 index 0000000..768d640 --- /dev/null +++ b/demos/py_simple/showimage.py @@ -0,0 +1,27 @@ +#!/usr/bin/env python + +import sys + +import gfxprim.core as core +import gfxprim.loaders as loaders +import gfxprim.backends as backends + +def main(): + if len(sys.argv) != 2: + print("Takes an image as an argument") + sys.exit(1) + + # Load Image + img = loaders.Load(sys.argv[1]) + + bk = backends.BackendX11Init(None, 0, 0, img.w, img.h, sys.argv[1], 0) + assert(bk) + img.Blit(0, 0, bk.context, 0, 0, img.w, img.h) + bk.Flip() + + # TODO: Input events + while True: + bk.Poll() + +if __name__ == '__main__': + main() ----------------------------------------------------------------------- Summary of changes: demos/py_simple/showimage.py | 36 +++++++++++++++++++++++++++++ pylib/gfxprim/backends/_extend_backend.py | 16 +++++++++++++ pylib/gfxprim/input/C.py | 3 -- pylib/gfxprim/input/__init__.py | 13 ++-------- pylib/gfxprim/input/input.i | 14 ++++++++++- 5 files changed, 68 insertions(+), 14 deletions(-) create mode 100755 demos/py_simple/showimage.py delete mode 100644 pylib/gfxprim/input/C.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: 2b990abb940a194551bed5dc1404fc7b6652fefc
by metan 19 Mar '13

19 Mar '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 2b990abb940a194551bed5dc1404fc7b6652fefc (commit) via 6918284bd4e44bf573d649a41de317dde14a7e7c (commit) via a2a12ec736712d3beb7aacc00bef5e0435696088 (commit) from c2fc7bc18f5c8ca729525abee47967930485ddd4 (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/2b990abb940a194551bed5dc1404fc7b6652… commit 2b990abb940a194551bed5dc1404fc7b6652fefc Author: Cyril Hrubis <metan(a)ucw.cz> Date: Tue Mar 19 22:22:17 2013 +0100 demos: py_simple: Fix *plots_AA.py diff --git a/demos/py_simple/gravplots_AA.py b/demos/py_simple/gravplots_AA.py index 284061e..7477744 100755 --- a/demos/py_simple/gravplots_AA.py +++ b/demos/py_simple/gravplots_AA.py @@ -86,18 +86,19 @@ def main(): x = int((e.x % W) * 0x100) y = int(e.y * 0x100) if e.vx > 0.2: - gfx.VLineAA(bk.context, x + 0x100, y - 0x300, y + 0x300, black) + bk.context.gfx.VLineAA(x + 0x100, y - 0x300, y + 0x300, black) if e.vx < -0.2: - gfx.VLineAA(bk.context, x - 0x100, y - 0x300, y + 0x300, black) - gfx.PutPixelAA(bk.context, x, y, bk.context.RGBToPixel(e.r, e.g, e.b)) + bk.context.gfx.VLineAA(x - 0x100, y - 0x300, y + 0x300, black) + bk.context.gfx.PutPixelAA(x, y, bk.context.RGBToPixel(e.r, e.g, e.b)) else: x = int(e.x % W) y = int(e.y) if e.vx > 0.2: - gfx.VLine(bk.context, x + 1, y - 2, y + 2, black) + bk.context.gfx.VLine(x + 1, y - 2, y + 2, black) if e.vx < -0.2: - gfx.VLine(bk.context, x - 1, y - 2, y + 2, black) - core.PutPixel(bk.context, x, y, bk.context.RGBToPixel(e.r, e.g, e.b)) + bk.context.gfx.VLine(x - 1, y - 2, y + 2, black) + bk.context.core.PutPixel(x, y, bk.context.RGBToPixel(e.r, e.g, e.b)) + bk.Poll() bk.Flip() global TIMEOUT if TIMEOUT > 0: diff --git a/demos/py_simple/sinplots_AA.py b/demos/py_simple/sinplots_AA.py index 1d29329..e0933b5 100755 --- a/demos/py_simple/sinplots_AA.py +++ b/demos/py_simple/sinplots_AA.py @@ -46,13 +46,13 @@ def main(): if AA: x = int(x * 0x100) y = int(y * 0x100) - gfx.VLineAA(bk.context, x + 0x100, y - 0x200, y + 0x200, black) - gfx.PutPixelAA(bk.context, x, y, bk.context.RGBToPixel(int(r), int(g), int(b))) + bk.context.gfx.VLineAA(x + 0x100, y - 0x200, y + 0x200, black) + bk.context.gfx.PutPixelAA(x, y, bk.context.RGBToPixel(int(r), int(g), int(b))) else: x = int(x) y = int(y) - gfx.VLine(bk.context, x + 1, y - 2, y + 2, black) - core.PutPixel(bk.context, x, y, bk.context.RGBToPixel(int(r), int(g), int(b))) + bk.context.gfx.VLine(x + 1, y - 2, y + 2, black) + bk.context.core.PutPixel(x, y, bk.context.RGBToPixel(int(r), int(g), int(b))) bk.Flip() if __name__ == '__main__': http://repo.or.cz/w/gfxprim.git/commit/6918284bd4e44bf573d649a41de317dde14a… commit 6918284bd4e44bf573d649a41de317dde14a7e7c Author: Cyril Hrubis <metan(a)ucw.cz> Date: Tue Mar 19 22:15:39 2013 +0100 pywrap: loaders: Remove unused _extend_context.py diff --git a/pylib/gfxprim/loaders/_extend_context.py b/pylib/gfxprim/loaders/_extend_context.py deleted file mode 100644 index e252b4b..0000000 --- a/pylib/gfxprim/loaders/_extend_context.py +++ /dev/null @@ -1,41 +0,0 @@ -from ..utils import extend, add_swig_getmethod, add_swig_setmethod -from . import loaders_c - -def extend_context(_context): - """ - Extends _context class with loader module methods for calling convenience. - Called once on loaders module inicialization. - """ - - @extend(_context, name='load') - @staticmethod - def Load(filename): - "Load image from given file, guess type." - c = loaders_c.GP_LoadImage_Wrap(filename) - return c - - @extend(_context) - def Save(self, filename, format=None, callback=None): - """Save the image in given format (or guess it from the extension) - - Currently, JPG, PNG and P[BGP]M are supported, but not for all - context pixel types. - """ - if not format: - format = filename.rsplit('.', 1)[-1] - format = format.lower() - if format == 'jpg': - res = loaders_c.GP_SaveJPG(self, filename, callback) - elif format == 'png': - res = loaders_c.GP_SavePNG(self, filename, callback) - elif format == 'pbm': - res = loaders_c.GP_SavePBM(filename, self, callback) - elif format == 'pgm': - res = loaders_c.GP_SavePGM(filename, self, callback) - elif format == 'ppm': - res = loaders_c.GP_SavePPM(filename, self, callback) - else: - raise Exception("Format %r not supported.", format) - if res != 0: - raise Exception("Error saving %r (code %d)", filename, res) - http://repo.or.cz/w/gfxprim.git/commit/a2a12ec736712d3beb7aacc00bef5e043569… commit a2a12ec736712d3beb7aacc00bef5e0435696088 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Tue Mar 19 22:01:42 2013 +0100 pywrap: backends: Hack it together. diff --git a/pylib/gfxprim/backends/C.py b/pylib/gfxprim/backends/C.py deleted file mode 100644 index c8f987f..0000000 --- a/pylib/gfxprim/backends/C.py +++ /dev/null @@ -1,3 +0,0 @@ -""" -Submodule for constants -""" diff --git a/pylib/gfxprim/backends/Makefile b/pylib/gfxprim/backends/Makefile index 7ecff0c..ac02d2a 100644 --- a/pylib/gfxprim/backends/Makefile +++ b/pylib/gfxprim/backends/Makefile @@ -2,6 +2,8 @@ TOPDIR=../../.. LIBNAME=backends INCLUDE=core +LDFLAGS+=$(shell $(TOPDIR)/gfxprim-config --libs-backends) + include $(TOPDIR)/pre.mk include $(TOPDIR)/pywrap.mk include $(TOPDIR)/post.mk diff --git a/pylib/gfxprim/backends/__init__.py b/pylib/gfxprim/backends/__init__.py index f0ebdae..9e94604 100644 --- a/pylib/gfxprim/backends/__init__.py +++ b/pylib/gfxprim/backends/__init__.py @@ -7,37 +7,26 @@ Accessing a context after its backend has ben freed will probably end your (program's) world """ -from . import backends_c +from . import c_backends # Pull GP_Backend -Backend = backends_c.GP_Backend - -# Constants module -from . import C +Backend = c_backends.GP_Backend def _init(module): - # Extend Context with convenience methods - from ._extend_context import extend_context - from ..core import Context - extend_context(Context) # Extend GP_Backend with convenience methods from ._extend_backend import extend_backend extend_backend(Backend) - # Import some members from the SWIG module - from ..utils import import_members + # Imports from the SWIG module import re def strip_GP(s): return re.sub('^GP_', '', s) - # Constants - const_regexes = ['^GP_[A-Z0-9_]*$'] - import_members(backends_c, C, include=const_regexes, sub=strip_GP) - - # Functions - import_members(backends_c, module, sub=strip_GP, - exclude=const_regexes + [ + # Import some members from the SWIG module + from ..utils import import_members + import_members(c_backends, module, sub=strip_GP, + exclude=[ '^GP_Backend$', '^gfxprim$', '^w+_swigregister$', diff --git a/pylib/gfxprim/backends/_extend_backend.py b/pylib/gfxprim/backends/_extend_backend.py index 31c56ef..ae351d7 100644 --- a/pylib/gfxprim/backends/_extend_backend.py +++ b/pylib/gfxprim/backends/_extend_backend.py @@ -1,5 +1,5 @@ from ..utils import extend, add_swig_getmethod, add_swig_setmethod -from . import backends_c +from . import c_backends def extend_backend(_backend): """ @@ -16,24 +16,24 @@ def extend_backend(_backend): @extend(_backend) def Flip(self): "If display is buffered, this copies content of context onto display." - return backends_c.GP_BackendFlip(self) + return c_backends.GP_BackendFlip(self) @extend(_backend) def UpdateRect(self, rect): "Update a rectangle on a buffered backend." - return backends_c.GP_BackendUpdateRect(self, rect[0], rect[1], rect[2], rect[3]) + return c_backends.GP_BackendUpdateRect(self, rect[0], rect[1], rect[2], rect[3]) @extend(_backend) def Poll(self): "Poll the backend for events." - return backends_c.GP_BackendPoll(self) + return c_backends.GP_BackendPoll(self) @extend(_backend) def SetCaption(self, caption): "Set backend window caption (if possible)" - return backends_c.GP_BackendSetCaption(self, caption) + return c_backends.GP_BackendSetCaption(self, caption) @extend(_backend) def Resize(self, w, h): "Resize backend window (if possible)" - return backends_c.GP_BackendResize(self, w, h) + return c_backends.GP_BackendResize(self, w, h) diff --git a/pylib/gfxprim/backends/_extend_context.py b/pylib/gfxprim/backends/_extend_context.py deleted file mode 100644 index f1754a5..0000000 --- a/pylib/gfxprim/backends/_extend_context.py +++ /dev/null @@ -1,8 +0,0 @@ -from ..utils import extend, add_swig_getmethod, add_swig_setmethod -from . import backends_c - -def extend_context(_context): - """ - Extends _context class with backend support. - """ - extend(_context, name='backend')(None) diff --git a/pylib/gfxprim/backends/backends.i b/pylib/gfxprim/backends/backends.i index fb3fb7d..d4b6b2c 100644 --- a/pylib/gfxprim/backends/backends.i +++ b/pylib/gfxprim/backends/backends.i @@ -1,5 +1,5 @@ %include "../common.i" -%module(package="gfxprim.backends") backends_c +%module(package="gfxprim.backends") c_backends %{ #include "GP_Backend.h" ----------------------------------------------------------------------- Summary of changes: demos/py_simple/gravplots_AA.py | 13 +++++---- demos/py_simple/sinplots_AA.py | 8 +++--- pylib/gfxprim/backends/C.py | 3 -- pylib/gfxprim/backends/Makefile | 2 + pylib/gfxprim/backends/__init__.py | 25 +++++------------ pylib/gfxprim/backends/_extend_backend.py | 12 ++++---- pylib/gfxprim/backends/_extend_context.py | 8 ----- pylib/gfxprim/backends/backends.i | 2 +- pylib/gfxprim/loaders/_extend_context.py | 41 ----------------------------- 9 files changed, 27 insertions(+), 87 deletions(-) delete mode 100644 pylib/gfxprim/backends/C.py delete mode 100644 pylib/gfxprim/backends/_extend_context.py delete mode 100644 pylib/gfxprim/loaders/_extend_context.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: c2fc7bc18f5c8ca729525abee47967930485ddd4
by metan 19 Mar '13

19 Mar '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 c2fc7bc18f5c8ca729525abee47967930485ddd4 (commit) via 1adb8662a402c4cf4bc0ea41feb1ba33dc49bfc9 (commit) via dde06dd8f774cd24f2febdf6842631691b6733ac (commit) from ff67d6e17905d01934074321a4a0136027dae253 (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/c2fc7bc18f5c8ca729525abee47967930485… commit c2fc7bc18f5c8ca729525abee47967930485ddd4 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Tue Mar 19 21:35:33 2013 +0100 demos: py_simple: Fix dither.py diff --git a/demos/py_simple/dither.py b/demos/py_simple/dither.py index dae8838..470d601 100755 --- a/demos/py_simple/dither.py +++ b/demos/py_simple/dither.py @@ -11,7 +11,7 @@ def main(): sys.exit(1) # Load Image - img = loaders.LoadImage(sys.argv[1], None) + img = loaders.Load(sys.argv[1]) # Use Floyd-Steinberg dithering res = filters.FilterFloydSteinberg_RGB888_Alloc(img, core.C.PIXEL_G1, None) # Save result into grayscale png http://repo.or.cz/w/gfxprim.git/commit/1adb8662a402c4cf4bc0ea41feb1ba33dc49… commit 1adb8662a402c4cf4bc0ea41feb1ba33dc49bfc9 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Tue Mar 19 21:34:37 2013 +0100 demos: py_simple: Fix blur.py diff --git a/demos/py_simple/blur.py b/demos/py_simple/blur.py index 36d9c5b..478af96 100755 --- a/demos/py_simple/blur.py +++ b/demos/py_simple/blur.py @@ -13,7 +13,7 @@ def main(): radii = float(sys.argv[1]) # Load Image - img = loaders.LoadImage(sys.argv[2], None) + img = loaders.Load(sys.argv[2]) # Do in-place gaussian blur filters.FilterGaussianBlur(img, img, radii, radii, None) # Save result http://repo.or.cz/w/gfxprim.git/commit/dde06dd8f774cd24f2febdf6842631691b67… commit dde06dd8f774cd24f2febdf6842631691b6733ac Author: Cyril Hrubis <metan(a)ucw.cz> Date: Tue Mar 19 21:29:08 2013 +0100 pywrap: filters: Add non-alloc filter variants too. diff --git a/pylib/gfxprim/filters/__init__.py b/pylib/gfxprim/filters/__init__.py index ae3988c..32b2efd 100644 --- a/pylib/gfxprim/filters/__init__.py +++ b/pylib/gfxprim/filters/__init__.py @@ -13,6 +13,7 @@ def _init(module): import_members(c_filters, module, sub=strip_GP, include=[ '^GP_Filter.*Alloc', + '^GP_Filter[A-Za-z0-9]*$', ]) _init(locals()) ----------------------------------------------------------------------- Summary of changes: demos/py_simple/blur.py | 2 +- demos/py_simple/dither.py | 2 +- pylib/gfxprim/filters/__init__.py | 1 + 3 files changed, 3 insertions(+), 2 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: ff67d6e17905d01934074321a4a0136027dae253
by metan 19 Mar '13

19 Mar '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 ff67d6e17905d01934074321a4a0136027dae253 (commit) via 383de9361b32daf29cd8f2b43f7a9e9facb21b6f (commit) via 9efe7cb613cda7c96883c97e89609acec1aee586 (commit) from e434f9d04602003a5e0c858acc5189cac9297e36 (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/ff67d6e17905d01934074321a4a0136027da… commit ff67d6e17905d01934074321a4a0136027dae253 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Tue Mar 19 21:08:25 2013 +0100 demos: py_simple: Fix rotate90.py diff --git a/demos/py_simple/rotate90.py b/demos/py_simple/rotate90.py index f4f2ad3..4a77835 100755 --- a/demos/py_simple/rotate90.py +++ b/demos/py_simple/rotate90.py @@ -14,11 +14,11 @@ def main(): core.SetDebugLevel(10); # Load Image - src = loaders.LoadImage(sys.argv[1], None) + src = loaders.Load(sys.argv[1]) # Rotate by 90 degrees - res = filters.FilterRotate90_Alloc(src, None) + res = filters.FilterRotate90Alloc(src) # Save Image - res.Save(sys.argv[2]) + res.loaders.Save(sys.argv[2]) if __name__ == '__main__': main() http://repo.or.cz/w/gfxprim.git/commit/383de9361b32daf29cd8f2b43f7a9e9facb2… commit 383de9361b32daf29cd8f2b43f7a9e9facb21b6f Author: Cyril Hrubis <metan(a)ucw.cz> Date: Tue Mar 19 21:07:49 2013 +0100 pywrap: Fix filters __init__.py. diff --git a/pylib/gfxprim/filters/__init__.py b/pylib/gfxprim/filters/__init__.py index 96ed8c9..ae3988c 100644 --- a/pylib/gfxprim/filters/__init__.py +++ b/pylib/gfxprim/filters/__init__.py @@ -1,26 +1,19 @@ -from . import filters_c - -from . import C +from . import c_filters def _init(module): - + "Extend Context with filters submodule" + # Imports from the SWIG module import re def strip_GP(s): return re.sub('^GP_', '', s) - # Import constants from the SWIG module - from ..utils import import_members - const_regexes = ['^GP_[A-Z0-9_]*$'] - import_members(filters_c, C, include=const_regexes, sub=strip_GP) - # Import functions from the SWIG module - import_members(filters_c, module, sub=strip_GP, - exclude=const_regexes + [ - '.*_Raw', - '^w+_swigregister$', - '^gfxprim$', - '^_w+$']) - + from ..utils import import_members + import_members(c_filters, module, sub=strip_GP, + include=[ + '^GP_Filter.*Alloc', + ]) + _init(locals()) del _init diff --git a/pylib/gfxprim/filters/filters.i b/pylib/gfxprim/filters/filters.i index d2d9618..6adf8a7 100644 --- a/pylib/gfxprim/filters/filters.i +++ b/pylib/gfxprim/filters/filters.i @@ -1,5 +1,5 @@ %include "../common.i" -%module(package="gfxprim.filters") filters_c +%module(package="gfxprim.filters") c_filters %{ #include "filters/GP_Filters.h" http://repo.or.cz/w/gfxprim.git/commit/9efe7cb613cda7c96883c97e89609acec1ae… commit 9efe7cb613cda7c96883c97e89609acec1aee586 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Tue Mar 19 20:58:51 2013 +0100 demos: py_simple: Fix loaders_example.py diff --git a/demos/py_simple/loaders_example.py b/demos/py_simple/loaders_example.py index c9db630..9b463d5 100755 --- a/demos/py_simple/loaders_example.py +++ b/demos/py_simple/loaders_example.py @@ -11,9 +11,9 @@ def main(): sys.exit(1) # Load Image - img = loaders.LoadImage(sys.argv[1], None) + img = loaders.Load(sys.argv[1]) # Save result - img.Save("out.png"); + img.loaders.Save("out.png"); if __name__ == '__main__': main() ----------------------------------------------------------------------- Summary of changes: demos/py_simple/loaders_example.py | 4 ++-- demos/py_simple/rotate90.py | 6 +++--- pylib/gfxprim/filters/__init__.py | 25 +++++++++---------------- pylib/gfxprim/filters/filters.i | 2 +- 4 files changed, 15 insertions(+), 22 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: e434f9d04602003a5e0c858acc5189cac9297e36
by metan 19 Mar '13

19 Mar '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 e434f9d04602003a5e0c858acc5189cac9297e36 (commit) from ad60769920b2f3ba4ed23b13cd7973b018ebc711 (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/e434f9d04602003a5e0c858acc5189cac929… commit e434f9d04602003a5e0c858acc5189cac9297e36 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Tue Mar 19 20:13:43 2013 +0100 build: configure: Pick config values from env variables. This allows us to use clang static analysis. diff --git a/configure b/configure index 8704716..fed17b4 100755 --- a/configure +++ b/configure @@ -301,7 +301,12 @@ if __name__ == '__main__': "Checking for backtrace() ... "], "", "", ["core"]]], cfg) parser = OptionParser(); - + + # Get configuration parameters from environment variables + for i in cfg: + if i in os.environ: + cfg[i][0] = os.environ[i] + # Enable disable libraries for linking parser.add_option("-e", "--enable", dest="enable", action="append", help="force enable library linking", metavar="libfoo") ----------------------------------------------------------------------- Summary of changes: configure | 7 ++++++- 1 files changed, 6 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: ad60769920b2f3ba4ed23b13cd7973b018ebc711
by metan 18 Mar '13

18 Mar '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 ad60769920b2f3ba4ed23b13cd7973b018ebc711 (commit) via 4c93e21d96f1a5db43a59e9056b74f66af4d1eee (commit) via 8d014173c31dedbed6c91040b31bed2bd7646531 (commit) via 55e8a9a8309c993617c0feea8f56af1fe7052fe7 (commit) via ca48ae9efdb5a90e191557deb13065691c655801 (commit) via df181198735eec35d6b59418cdebf6a6ff957b2b (commit) from b6471296e04e26c765fb2c348a728e23fde1ddf0 (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/ad60769920b2f3ba4ed23b13cd7973b018eb… commit ad60769920b2f3ba4ed23b13cd7973b018ebc711 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon Mar 18 23:46:14 2013 +0100 doc: filters: Add gaussian noise documentation. diff --git a/doc/Makefile b/doc/Makefile index aa2f80c..907bebd 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -50,6 +50,8 @@ $(PAGES): %.html: %.txt examples.html: examples.txt ../demos/c_simple/*.c ../demos/py_simple/*.py asciidoc.conf asciidoc $(ASCIIDOC_PARAMS) -a toc examples.txt +filters.html: filter_additive_gaussian_noise.txt + # # Clean up generated images # diff --git a/doc/example_gaussian_noise.txt b/doc/example_gaussian_noise.txt new file mode 100644 index 0000000..1f023d8 --- /dev/null +++ b/doc/example_gaussian_noise.txt @@ -0,0 +1,7 @@ +Gaussian Additive Noise Filter Example +-------------------------------------- + +[source,c] +------------------------------------------------------------------ +include::../demos/c_simple/gaussian_noise.c[] +------------------------------------------------------------------ diff --git a/doc/filter_additive_gaussian_noise.txt b/doc/filter_additive_gaussian_noise.txt new file mode 100644 index 0000000..c64de38 --- /dev/null +++ b/doc/filter_additive_gaussian_noise.txt @@ -0,0 +1,66 @@ +Gaussian additive noise filter +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +[source,c] +------------------------------------------------------------------------------- +#include <GP_Filters.h> +/* or */ +#include <filters/GP_GaussianNoise.h> + +int GP_FilterGaussianNoiseAddEx(const GP_Context *src, + GP_Coord x_src, GP_Coord y_src, + GP_Size w_src, GP_Size h_src, + GP_Context *dst, + GP_Coord x_dst, GP_Coord y_dst, + float sigma, float mu, + GP_ProgressCallback *callback); + +GP_Context *GP_FilterGaussianNoiseAddExAlloc(const GP_Context *src, + GP_Coord x_src, GP_Coord y_src, + GP_Size w_src, GP_Size h_src, + float sigma, float mu, + GP_ProgressCallback *callback); + +static inline int GP_FilterGaussianNoiseAdd(const GP_Context *src, + GP_Context *dst, + float sigma, float mu, + GP_ProgressCallback *callback); + +static inline GP_Context * +GP_FilterGaussianNoiseAddAlloc(const GP_Context *src, + float sigma, float mu, + GP_ProgressCallback *callback); +------------------------------------------------------------------------------- + +Gaussian additive noise filter adds gaussian distributed noise to an image +with a defined sigma and mu. Both sigma and mu are from [0,1] interval. + +TIP: See the link:example_gaussian_noise.html[source code] used to generate + following images. + +.Original Image; Gaussian Additive Noise s=0.01, s=0.02, s=0.05, s=0.7, s=0.1, s=0.05 m=0.1, s=0.05 m=-0.1 +image:images/dither/lenna_small.png[ + "Original Image", + link="images/dither/lenna.png"] +image:images/gaussian_noise/lenna_small_noise_s_0_01_m_0.png[ + "Additive Noise sigma = 0.01 mu = 0.0", + link="images/gaussian_noise/lenna_noise_s_0_01_m_0.png"] +image:images/gaussian_noise/lenna_small_noise_s_0_02_m_0.png[ + "Additive Noise sigma = 0.02 mu = 0.0", + link="images/gaussian_noise/lenna_noise_s_0_02_m_0.png"] +image:images/gaussian_noise/lenna_small_noise_s_0_05_m_0.png[ + "Additive Noise sigma = 0.05 mu = 0.0", + link="images/gaussian_noise/lenna_noise_s_0_05_m_0.png"] +image:images/gaussian_noise/lenna_small_noise_s_0_07_m_0.png[ + "Additive Noise sigma = 0.07 mu = 0.0", + link="images/gaussian_noise/lenna_noise_s_0_07_m_0.png"] +image:images/gaussian_noise/lenna_small_noise_s_0_1_m_0.png[ + "Additive Noise sigma = 0.1 mu = 0.0", + link="images/gaussian_noise/lenna_noise_s_0_1_m_0.png"] +image:images/gaussian_noise/lenna_small_noise_s_0_05_m_0_1.png[ + "Additive Noise sigma = 0.1 mu = 0.1", + link="images/gaussian_noise/lenna_noise_s_0_05_m_0_1.png"] +image:images/gaussian_noise/lenna_small_noise_s_0_05_m_-0_1.png[ + "Additive Noise sigma = 0.1 mu = -0.1", + link="images/gaussian_noise/lenna_noise_s_0_05_m_-0_1.png"] + diff --git a/doc/filters.txt b/doc/filters.txt index 7a3251c..c4f2049 100644 --- a/doc/filters.txt +++ b/doc/filters.txt @@ -253,6 +253,8 @@ GP_Context *GP_FilterInvert(const GP_Context *src, GP_Context *dst, Inverts the image, for each channel the result value is computed as "chan_max - val". +include::filter_additive_gaussian_noise.txt[] + Arithmetic filters ~~~~~~~~~~~~~~~~~~ diff --git a/doc/images/gaussian_noise/lenna_noise_s_0_01_m_0.png b/doc/images/gaussian_noise/lenna_noise_s_0_01_m_0.png new file mode 100644 index 0000000..bc12a44 Binary files /dev/null and b/doc/images/gaussian_noise/lenna_noise_s_0_01_m_0.png differ diff --git a/doc/images/gaussian_noise/lenna_noise_s_0_02_m_0.png b/doc/images/gaussian_noise/lenna_noise_s_0_02_m_0.png new file mode 100644 index 0000000..dbdd21a Binary files /dev/null and b/doc/images/gaussian_noise/lenna_noise_s_0_02_m_0.png differ diff --git a/doc/images/gaussian_noise/lenna_noise_s_0_05_m_-0_1.png b/doc/images/gaussian_noise/lenna_noise_s_0_05_m_-0_1.png new file mode 100644 index 0000000..ae7fa9d Binary files /dev/null and b/doc/images/gaussian_noise/lenna_noise_s_0_05_m_-0_1.png differ diff --git a/doc/images/gaussian_noise/lenna_noise_s_0_05_m_0.png b/doc/images/gaussian_noise/lenna_noise_s_0_05_m_0.png new file mode 100644 index 0000000..e62bfa1 Binary files /dev/null and b/doc/images/gaussian_noise/lenna_noise_s_0_05_m_0.png differ diff --git a/doc/images/gaussian_noise/lenna_noise_s_0_05_m_0_1.png b/doc/images/gaussian_noise/lenna_noise_s_0_05_m_0_1.png new file mode 100644 index 0000000..61cc142 Binary files /dev/null and b/doc/images/gaussian_noise/lenna_noise_s_0_05_m_0_1.png differ diff --git a/doc/images/gaussian_noise/lenna_noise_s_0_07_m_0.png b/doc/images/gaussian_noise/lenna_noise_s_0_07_m_0.png new file mode 100644 index 0000000..bc33cbe Binary files /dev/null and b/doc/images/gaussian_noise/lenna_noise_s_0_07_m_0.png differ diff --git a/doc/images/gaussian_noise/lenna_noise_s_0_1_m_0.png b/doc/images/gaussian_noise/lenna_noise_s_0_1_m_0.png new file mode 100644 index 0000000..abbb1d3 Binary files /dev/null and b/doc/images/gaussian_noise/lenna_noise_s_0_1_m_0.png differ diff --git a/doc/images/gaussian_noise/lenna_small_noise_s_0_01_m_0.png b/doc/images/gaussian_noise/lenna_small_noise_s_0_01_m_0.png new file mode 100644 index 0000000..6ea5246 Binary files /dev/null and b/doc/images/gaussian_noise/lenna_small_noise_s_0_01_m_0.png differ diff --git a/doc/images/gaussian_noise/lenna_small_noise_s_0_02_m_0.png b/doc/images/gaussian_noise/lenna_small_noise_s_0_02_m_0.png new file mode 100644 index 0000000..a1e89c1 Binary files /dev/null and b/doc/images/gaussian_noise/lenna_small_noise_s_0_02_m_0.png differ diff --git a/doc/images/gaussian_noise/lenna_small_noise_s_0_05_m_-0_1.png b/doc/images/gaussian_noise/lenna_small_noise_s_0_05_m_-0_1.png new file mode 100644 index 0000000..55f5165 Binary files /dev/null and b/doc/images/gaussian_noise/lenna_small_noise_s_0_05_m_-0_1.png differ diff --git a/doc/images/gaussian_noise/lenna_small_noise_s_0_05_m_0.png b/doc/images/gaussian_noise/lenna_small_noise_s_0_05_m_0.png new file mode 100644 index 0000000..745431a Binary files /dev/null and b/doc/images/gaussian_noise/lenna_small_noise_s_0_05_m_0.png differ diff --git a/doc/images/gaussian_noise/lenna_small_noise_s_0_05_m_0_1.png b/doc/images/gaussian_noise/lenna_small_noise_s_0_05_m_0_1.png new file mode 100644 index 0000000..d70c7d6 Binary files /dev/null and b/doc/images/gaussian_noise/lenna_small_noise_s_0_05_m_0_1.png differ diff --git a/doc/images/gaussian_noise/lenna_small_noise_s_0_07_m_0.png b/doc/images/gaussian_noise/lenna_small_noise_s_0_07_m_0.png new file mode 100644 index 0000000..cb773b6 Binary files /dev/null and b/doc/images/gaussian_noise/lenna_small_noise_s_0_07_m_0.png differ diff --git a/doc/images/gaussian_noise/lenna_small_noise_s_0_1_m_0.png b/doc/images/gaussian_noise/lenna_small_noise_s_0_1_m_0.png new file mode 100644 index 0000000..82ffaad Binary files /dev/null and b/doc/images/gaussian_noise/lenna_small_noise_s_0_1_m_0.png differ http://repo.or.cz/w/gfxprim.git/commit/4c93e21d96f1a5db43a59e9056b74f66af4d… commit 4c93e21d96f1a5db43a59e9056b74f66af4d1eee Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon Mar 18 23:38:56 2013 +0100 demos: c_simple: Add gaussian additive noise example. diff --git a/demos/c_simple/Makefile b/demos/c_simple/Makefile index 3e741cc..547fdfd 100644 --- a/demos/c_simple/Makefile +++ b/demos/c_simple/Makefile @@ -19,7 +19,7 @@ APPS=backend_example loaders_example loaders filters_symmetry gfx_koch v4l2_show v4l2_grab convolution weighted_median shapetest koch input_example fileview linetest randomshapetest fonttest loaders_register blittest textaligntest abort sin_AA x11_windows- debug_handler + debug_handler gaussian_noise ifeq ($(HAVE_LIBSDL),yes) APPS+=SDL_glue diff --git a/demos/c_simple/gaussian_noise.c b/demos/c_simple/gaussian_noise.c new file mode 100644 index 0000000..21425ce --- /dev/null +++ b/demos/c_simple/gaussian_noise.c @@ -0,0 +1,85 @@ +/***************************************************************************** + * This file is part of gfxprim library. * + * * + * Gfxprim is free software; you can redistribute it and/or * + * modify it under the terms of the GNU Lesser General Public * + * License as published by the Free Software Foundation; either * + * version 2.1 of the License, or (at your option) any later version. * + * * + * Gfxprim is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with gfxprim; if not, write to the Free Software * + * Foundation, Inc., 51 Franklin Street, Fifth Floor, * + * Boston, MA 02110-1301 USA * + * * + * Copyright (C) 2009-2013 Cyril Hrubis <metan(a)ucw.cz> * + * * + *****************************************************************************/ + + /* + + Gaussian additive noise example. + + */ + +#include <stdio.h> +#include <unistd.h> +#include <string.h> +#include <errno.h> + +#include <GP.h> + +static void help(const char *app) +{ + printf("usage: %s -s float -m float input.img output.imgnn", app); + printf(" -s [0,1] sigma in pixelsn"); + printf(" -m [0,1] mu in pixelsn"); +} + +int main(int argc, char *argv[]) +{ + GP_Context *img; + float sigma = 0.1, mu = 0.1; + int opt; + + while ((opt = getopt(argc, argv, "s:m:")) != -1) { + switch (opt) { + case 's': + sigma = atof(optarg); + break; + case 'm': + mu = atof(optarg); + break; + default: + help(argv[0]); + return 1; + } + } + + if (argc - optind != 2) { + help(argv[0]); + return 1; + } + + img = GP_LoadImage(argv[optind], NULL); + + if (img == NULL) { + fprintf(stderr, "Failed to load image '%s': %sn", + argv[optind], strerror(errno)); + return 1; + } + + GP_Context *res = GP_FilterGaussianNoiseAddAlloc(img, sigma, mu, NULL); + + if (GP_SaveImage(res, argv[optind + 1], NULL)) { + fprintf(stderr, "Failed to save image '%s': %s", + argv[optind + 1], strerror(errno)); + return 1; + } + + return 0; +} http://repo.or.cz/w/gfxprim.git/commit/8d014173c31dedbed6c91040b31bed2bd764… commit 8d014173c31dedbed6c91040b31bed2bd7646531 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon Mar 18 22:34:45 2013 +0100 include: filters: Unify ifdefs fix some whitespaces. diff --git a/include/filters/GP_Filters.h b/include/filters/GP_Filters.h index cd06035..f79c2d2 100644 --- a/include/filters/GP_Filters.h +++ b/include/filters/GP_Filters.h @@ -29,8 +29,8 @@ */ -#ifndef GP_FILTERS_H -#define GP_FILTERS_H +#ifndef FILTERS_GP_FILTERS_H +#define FILTERS_GP_FILTERS_H /* Filter per channel parameter passing interface */ #include "filters/GP_FilterParam.h" @@ -77,4 +77,4 @@ /* Gaussian noise filter */ #include "filters/GP_GaussianNoise.h" -#endif /* GP_FILTERS_H */ +#endif /* FILTERS_GP_FILTERS_H */ diff --git a/include/filters/GP_GaussianNoise.h b/include/filters/GP_GaussianNoise.h index 9e9274e..135712b 100644 --- a/include/filters/GP_GaussianNoise.h +++ b/include/filters/GP_GaussianNoise.h @@ -30,8 +30,8 @@ */ -#ifndef GP_FILTERS_GAUSSIAN_NOISE_H -#define GP_FILTERS_GAUSSIAN_NOISE_H +#ifndef FILTERS_GP_GAUSSIAN_NOISE_H +#define FILTERS_GP_GAUSSIAN_NOISE_H #include "GP_Filter.h" @@ -67,4 +67,4 @@ GP_FilterGaussianNoiseAddAlloc(const GP_Context *src, sigma, mu, callback); } -#endif /* GP_FILTERS_GAUSSIAN_NOISE_H */ +#endif /* FILTERS_GP_GAUSSIAN_NOISE_H */ diff --git a/include/filters/GP_Median.h b/include/filters/GP_Median.h index 4a479cf..4755961 100644 --- a/include/filters/GP_Median.h +++ b/include/filters/GP_Median.h @@ -31,8 +31,8 @@ */ -#ifndef GP_FILTERS_MEDIAN_H -#define GP_FILTERS_MEDIAN_H +#ifndef FILTERS_GP_MEDIAN_H +#define FILTERS_GP_MEDIAN_H #include "GP_Filter.h" @@ -67,4 +67,4 @@ static inline GP_Context *GP_FilterMedianAlloc(const GP_Context *src, xmed, ymed, callback); } -#endif /* GP_FILTERS_MEDIAN_H */ +#endif /* FILTERS_GP_MEDIAN_H */ diff --git a/include/filters/GP_Sigma.h b/include/filters/GP_Sigma.h index a9e35e9..e7db9d0 100644 --- a/include/filters/GP_Sigma.h +++ b/include/filters/GP_Sigma.h @@ -37,32 +37,32 @@ */ -#ifndef GP_FILTERS_SIGMA_H -#define GP_FILTERS_SIGMA_H +#ifndef FILTERS_GP_SIGMA_H +#define FILTERS_GP_SIGMA_H #include "GP_Filter.h" int GP_FilterSigmaEx(const GP_Context *src, - GP_Coord x_src, GP_Coord y_src, - GP_Size w_src, GP_Size h_src, - GP_Context *dst, - GP_Coord x_dst, GP_Coord y_dst, - int xrad, int yrad, - unsigned int min, float sigma, - GP_ProgressCallback *callback); + GP_Coord x_src, GP_Coord y_src, + GP_Size w_src, GP_Size h_src, + GP_Context *dst, + GP_Coord x_dst, GP_Coord y_dst, + int xrad, int yrad, + unsigned int min, float sigma, + GP_ProgressCallback *callback); GP_Context *GP_FilterSigmaExAlloc(const GP_Context *src, - GP_Coord x_src, GP_Coord y_src, - GP_Size w_src, GP_Size h_src, - int xrad, int yrad, - unsigned int min, float sigma, - GP_ProgressCallback *callback); - -static inline int GP_FilterSigma(const GP_Context *src, - GP_Context *dst, + GP_Coord x_src, GP_Coord y_src, + GP_Size w_src, GP_Size h_src, int xrad, int yrad, unsigned int min, float sigma, - GP_ProgressCallback *callback) + GP_ProgressCallback *callback); + +static inline int GP_FilterSigma(const GP_Context *src, + GP_Context *dst, + int xrad, int yrad, + unsigned int min, float sigma, + GP_ProgressCallback *callback) { return GP_FilterSigmaEx(src, 0, 0, src->w, src->h, dst, 0, 0, xrad, yrad, min, sigma, callback); @@ -77,4 +77,4 @@ static inline GP_Context *GP_FilterSigmaAlloc(const GP_Context *src, xrad, yrad, min, sigma, callback); } -#endif /* GP_FILTERS_SIGMA_H */ +#endif /* FILTERS_GP_SIGMA_H */ diff --git a/include/filters/GP_WeightedMedian.h b/include/filters/GP_WeightedMedian.h index 8219abd..82dd8e4 100644 --- a/include/filters/GP_WeightedMedian.h +++ b/include/filters/GP_WeightedMedian.h @@ -25,8 +25,8 @@ */ -#ifndef GP_FILTERS_WEIGHTED_MEDIAN_H -#define GP_FILTERS_WEIGHTED_MEDIAN_H +#ifndef FILTERS_GP_WEIGHTED_MEDIAN_H +#define FILTERS_GP_WEIGHTED_MEDIAN_H #include "GP_Filter.h" @@ -67,4 +67,4 @@ static inline GP_Context *GP_FilterWeightedMedianAlloc(const GP_Context *src, weights, callback); } -#endif /* GP_FILTERS_MEDIAN_H */ +#endif /* FILTERS_GP_WEIGHTED_MEDIAN_H */ http://repo.or.cz/w/gfxprim.git/commit/55e8a9a8309c993617c0feea8f56af1fe705… commit 55e8a9a8309c993617c0feea8f56af1fe7052fe7 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon Mar 18 22:14:05 2013 +0100 filters: symmetry: Change _Alloc to Alloc. diff --git a/demos/c_simple/filters_symmetry.c b/demos/c_simple/filters_symmetry.c index c1f5068..3f130a4 100644 --- a/demos/c_simple/filters_symmetry.c +++ b/demos/c_simple/filters_symmetry.c @@ -99,7 +99,7 @@ int main(int argc, char *argv[]) } /* Apply a symmetry filter */ - res = GP_FilterSymmetry_Alloc(src, sym, NULL); + res = GP_FilterSymmetryAlloc(src, sym, NULL); /* Save Image */ if (GP_SaveImage(res, argv[optind+1], NULL)) { diff --git a/demos/grinder/grinder.c b/demos/grinder/grinder.c index 758804b..1f8eccb 100644 --- a/demos/grinder/grinder.c +++ b/demos/grinder/grinder.c @@ -227,13 +227,13 @@ static int rotate(GP_Context **c, const char *params) switch (rot) { case 0: - res = GP_FilterRotate90_Alloc(*c, progress_callback); + res = GP_FilterRotate90Alloc(*c, progress_callback); break; case 1: - res = GP_FilterRotate180_Alloc(*c, progress_callback); + res = GP_FilterRotate180Alloc(*c, progress_callback); break; case 2: - res = GP_FilterRotate270_Alloc(*c, progress_callback); + res = GP_FilterRotate270Alloc(*c, progress_callback); break; } diff --git a/demos/spiv/spiv.c b/demos/spiv/spiv.c index e7befb2..d4f305f 100644 --- a/demos/spiv/spiv.c +++ b/demos/spiv/spiv.c @@ -262,15 +262,15 @@ static void update_display(struct loader_params *params, GP_Context *img) break; case 90: callback.priv = "Rotating image (90)"; - img = GP_FilterRotate90_Alloc(img, &callback); + img = GP_FilterRotate90Alloc(img, &callback); break; case 180: callback.priv = "Rotating image (180)"; - img = GP_FilterRotate180_Alloc(img, &callback); + img = GP_FilterRotate180Alloc(img, &callback); break; case 270: callback.priv = "Rotating image (270)"; - img = GP_FilterRotate270_Alloc(img, &callback); + img = GP_FilterRotate270Alloc(img, &callback); break; } diff --git a/doc/filters.txt b/doc/filters.txt index adc5ce7..7a3251c 100644 --- a/doc/filters.txt +++ b/doc/filters.txt @@ -357,7 +357,7 @@ Rotation and Symmetry filters int GP_FilterMirrorH(const GP_Context *src, GP_Context *dst, GP_ProgressCallback *callback); -GP_Context *GP_FilterMirrorH_Alloc(const GP_Context *src, +GP_Context *GP_FilterMirrorHAlloc(const GP_Context *src, GP_ProgressCallback *callback); ------------------------------------------------------------------------------- @@ -377,7 +377,7 @@ as large as source. int GP_FilterMirrorV(const GP_Context *src, GP_Context *dst, GP_ProgressCallback *callback); -GP_Context *GP_FilterMirrorV_Alloc(const GP_Context *src, +GP_Context *GP_FilterMirrorVAlloc(const GP_Context *src, GP_ProgressCallback *callback); ------------------------------------------------------------------------------- @@ -397,7 +397,7 @@ as large as source. int GP_FilterRotate90(const GP_Context *src, GP_Context *dst, GP_ProgressCallback *callback); -GP_Context *GP_FilterRotate90_Alloc(const GP_Context *src, +GP_Context *GP_FilterRotate90Alloc(const GP_Context *src, GP_ProgressCallback *callback); ------------------------------------------------------------------------------- @@ -417,7 +417,7 @@ fit rotated context (i.e. W and H are swapped). int GP_FilterRotate180(const GP_Context *src, GP_Context *dst, GP_ProgressCallback *callback); -GP_Context *GP_FilterRotate180_Alloc(const GP_Context *src, +GP_Context *GP_FilterRotate180Alloc(const GP_Context *src, GP_ProgressCallback *callback); ------------------------------------------------------------------------------- @@ -437,7 +437,7 @@ as large as source. int GP_FilterRotate270(const GP_Context *src, GP_Context *dst, GP_ProgressCallback *callback); -GP_Context *GP_FilterRotate270_Alloc(const GP_Context *src, +GP_Context *GP_FilterRotate270Alloc(const GP_Context *src, GP_ProgressCallback *callback); ------------------------------------------------------------------------------- diff --git a/include/filters/GP_Rotate.h b/include/filters/GP_Rotate.h index bafc37a..1da96c8 100644 --- a/include/filters/GP_Rotate.h +++ b/include/filters/GP_Rotate.h @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, * * Boston, MA 02110-1301 USA * * * - * Copyright (C) 2009-2012 Cyril Hrubis <metan(a)ucw.cz> * + * Copyright (C) 2009-2013 Cyril Hrubis <metan(a)ucw.cz> * * * *****************************************************************************/ @@ -62,8 +62,8 @@ int GP_FilterMirrorH(const GP_Context *src, GP_Context *dst, * Returns pointer to newly allocated context, or NULL if malloc() has failed * or operation was aborted from withing a callback. */ -GP_Context *GP_FilterMirrorH_Alloc(const GP_Context *src, - GP_ProgressCallback *callback); +GP_Context *GP_FilterMirrorHAlloc(const GP_Context *src, + GP_ProgressCallback *callback); /* * Mirror vertically @@ -95,8 +95,8 @@ int GP_FilterMirrorV(const GP_Context *src, GP_Context *dst, * Returns pointer to newly allocated context, or NULL if malloc() has failed * or operation was aborted from withing a callback. */ -GP_Context *GP_FilterMirrorV_Alloc(const GP_Context *src, - GP_ProgressCallback *callback); +GP_Context *GP_FilterMirrorVAlloc(const GP_Context *src, + GP_ProgressCallback *callback); /* * Rotate context by 90, 180 and 270. @@ -123,20 +123,20 @@ int GP_FilterRotate270_Raw(const GP_Context *src, GP_Context *dst, int GP_FilterRotate90(const GP_Context *src, GP_Context *dst, GP_ProgressCallback *callback); -GP_Context *GP_FilterRotate90_Alloc(const GP_Context *src, - GP_ProgressCallback *callback); +GP_Context *GP_FilterRotate90Alloc(const GP_Context *src, + GP_ProgressCallback *callback); int GP_FilterRotate180(const GP_Context *src, GP_Context *dst, GP_ProgressCallback *callback); -GP_Context *GP_FilterRotate180_Alloc(const GP_Context *src, +GP_Context *GP_FilterRotate180Alloc(const GP_Context *src, GP_ProgressCallback *callback); int GP_FilterRotate270(const GP_Context *src, GP_Context *dst, GP_ProgressCallback *callback); -GP_Context *GP_FilterRotate270_Alloc(const GP_Context *src, - GP_ProgressCallback *callback); +GP_Context *GP_FilterRotate270Alloc(const GP_Context *src, + GP_ProgressCallback *callback); /* * Calls a symmetry filter on bitmap. @@ -172,7 +172,7 @@ int GP_FilterSymmetry(const GP_Context *src, GP_Context *dst, GP_FilterSymmetries symmetry, GP_ProgressCallback *callback); -GP_Context *GP_FilterSymmetry_Alloc(const GP_Context *src, +GP_Context *GP_FilterSymmetryAlloc(const GP_Context *src, GP_FilterSymmetries symmetry, GP_ProgressCallback *callback); diff --git a/libs/filters/GP_Rotate.c b/libs/filters/GP_Rotate.c index 9e4690b..99fac5b 100644 --- a/libs/filters/GP_Rotate.c +++ b/libs/filters/GP_Rotate.c @@ -87,7 +87,7 @@ int GP_FilterMirrorH(const GP_Context *src, GP_Context *dst, return 0; } -GP_Context *GP_FilterMirrorH_Alloc(const GP_Context *src, +GP_Context *GP_FilterMirrorHAlloc(const GP_Context *src, GP_ProgressCallback *callback) { GP_Context *res; @@ -121,7 +121,7 @@ int GP_FilterMirrorV(const GP_Context *src, GP_Context *dst, return 0; } -GP_Context *GP_FilterMirrorV_Alloc(const GP_Context *src, +GP_Context *GP_FilterMirrorVAlloc(const GP_Context *src, GP_ProgressCallback *callback) { GP_Context *res; @@ -166,7 +166,7 @@ int GP_FilterRotate90(const GP_Context *src, GP_Context *dst, return 0; } -GP_Context *GP_FilterRotate90_Alloc(const GP_Context *src, +GP_Context *GP_FilterRotate90Alloc(const GP_Context *src, GP_ProgressCallback *callback) { GP_Context *res; @@ -201,7 +201,7 @@ int GP_FilterRotate180(const GP_Context *src, GP_Context *dst, return 0; } -GP_Context *GP_FilterRotate180_Alloc(const GP_Context *src, +GP_Context *GP_FilterRotate180Alloc(const GP_Context *src, GP_ProgressCallback *callback) { GP_Context *res; @@ -236,7 +236,7 @@ int GP_FilterRotate270(const GP_Context *src, GP_Context *dst, return 0; } -GP_Context *GP_FilterRotate270_Alloc(const GP_Context *src, +GP_Context *GP_FilterRotate270Alloc(const GP_Context *src, GP_ProgressCallback *callback) { GP_Context *res; @@ -277,21 +277,21 @@ int GP_FilterSymmetryByName(const char *symmetry) return -1; } -GP_Context *GP_FilterSymmetry_Alloc(const GP_Context *src, +GP_Context *GP_FilterSymmetryAlloc(const GP_Context *src, GP_FilterSymmetries symmetry, GP_ProgressCallback *callback) { switch (symmetry) { case GP_ROTATE_90: - return GP_FilterRotate90_Alloc(src, callback); + return GP_FilterRotate90Alloc(src, callback); case GP_ROTATE_180: - return GP_FilterRotate180_Alloc(src, callback); + return GP_FilterRotate180Alloc(src, callback); case GP_ROTATE_270: - return GP_FilterRotate270_Alloc(src, callback); + return GP_FilterRotate270Alloc(src, callback); case GP_MIRROR_H: - return GP_FilterMirrorH_Alloc(src, callback); + return GP_FilterMirrorHAlloc(src, callback); case GP_MIRROR_V: - return GP_FilterMirrorV_Alloc(src, callback); + return GP_FilterMirrorVAlloc(src, callback); default: GP_DEBUG(1, "Invalid symmetry %i", (int) symmetry); return NULL; diff --git a/tests/filters/APICoverage.gen.c.t b/tests/filters/APICoverage.gen.c.t index fdffabe..b7d153f 100644 --- a/tests/filters/APICoverage.gen.c.t +++ b/tests/filters/APICoverage.gen.c.t @@ -40,23 +40,23 @@ %% set API_List = [['MirrorH', 'GP_Context:in', 'GP_Context:out', 'GP_ProgressCallback'], - ['MirrorH_Alloc', 'GP_Context:in', 'GP_ProgressCallback'], + ['MirrorHAlloc', 'GP_Context:in', 'GP_ProgressCallback'], ['MirrorV', 'GP_Context:in', 'GP_Context:out', 'GP_ProgressCallback'], - ['MirrorV_Alloc', 'GP_Context:in', 'GP_ProgressCallback'], + ['MirrorVAlloc', 'GP_Context:in', 'GP_ProgressCallback'], ['Rotate90', 'GP_Context:in', 'GP_Context:out', 'GP_ProgressCallback'], - ['Rotate90_Alloc', 'GP_Context:in', 'GP_ProgressCallback'], + ['Rotate90Alloc', 'GP_Context:in', 'GP_ProgressCallback'], ['Rotate180', 'GP_Context:in', 'GP_Context:out', 'GP_ProgressCallback'], - ['Rotate180_Alloc', 'GP_Context:in', 'GP_ProgressCallback'], + ['Rotate180Alloc', 'GP_Context:in', 'GP_ProgressCallback'], ['Rotate270', 'GP_Context:in', 'GP_Context:out', 'GP_ProgressCallback'], - ['Rotate270_Alloc', 'GP_Context:in', 'GP_ProgressCallback'], + ['Rotate270Alloc', 'GP_Context:in', 'GP_ProgressCallback'], ['Convolution', 'GP_Context:in', 'GP_Context:out', 'GP_FilterKernel2D:kernel', 'GP_ProgressCallback'], http://repo.or.cz/w/gfxprim.git/commit/ca48ae9efdb5a90e191557deb13065691c65… commit ca48ae9efdb5a90e191557deb13065691c655801 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon Mar 18 21:32:36 2013 +0100 doc: Makefile: Add check for dvipng. diff --git a/doc/Makefile b/doc/Makefile index 87ead82..aa2f80c 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -37,7 +37,9 @@ toolcheck: @if [ ! -d "/usr/share/graphviz" ] ; then echo "ERROR: Could not find 'graphviz'" ; exit 127 ; fi @if [ -z `which latex 2>/dev/null` ] ; then - echo "ERROR: Could not find 'latex'" ; exit 127 ; fi + echo "error: could not find 'latex'" ; exit 127 ; fi + @if [ -z `which dvipng 2>/dev/null` ] ; then + echo "error: could not find 'dvipng'" ; exit 127 ; fi # # Create page for each part of API description http://repo.or.cz/w/gfxprim.git/commit/df181198735eec35d6b59418cdebf6a6ff95… commit df181198735eec35d6b59418cdebf6a6ff957b2b Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon Mar 18 21:22:22 2013 +0100 filters: Rotate: Remove unused variable. diff --git a/libs/filters/GP_Rotate.c b/libs/filters/GP_Rotate.c index a164886..9e4690b 100644 --- a/libs/filters/GP_Rotate.c +++ b/libs/filters/GP_Rotate.c @@ -47,8 +47,6 @@ int GP_FilterMirrorH_Raw(const GP_Context *src, GP_Context *dst, uint8_t *dl1 = GP_PIXEL_ADDR(dst, 0, y); uint8_t *dl2 = GP_PIXEL_ADDR(dst, 0, src->h - y - 1); - int i; - memcpy(buf, sl1, bpr); memcpy(dl1, sl2, bpr); memcpy(dl2, buf, bpr); ----------------------------------------------------------------------- Summary of changes: demos/c_simple/Makefile | 2 +- demos/c_simple/filters_symmetry.c | 2 +- demos/c_simple/{showimage.c => gaussian_noise.c} | 77 ++++++++++---------- demos/grinder/grinder.c | 6 +- demos/spiv/spiv.c | 6 +- doc/Makefile | 6 ++- ...registration.txt => example_gaussian_noise.txt} | 6 +- doc/filter_additive_gaussian_noise.txt | 66 +++++++++++++++++ doc/filters.txt | 12 ++-- .../gaussian_noise/lenna_noise_s_0_01_m_0.png | Bin 0 -> 437216 bytes .../gaussian_noise/lenna_noise_s_0_02_m_0.png | Bin 0 -> 499974 bytes .../gaussian_noise/lenna_noise_s_0_05_m_-0_1.png | Bin 0 -> 595580 bytes .../gaussian_noise/lenna_noise_s_0_05_m_0.png | Bin 0 -> 597207 bytes .../gaussian_noise/lenna_noise_s_0_05_m_0_1.png | Bin 0 -> 600729 bytes .../gaussian_noise/lenna_noise_s_0_07_m_0.png | Bin 0 -> 640843 bytes .../gaussian_noise/lenna_noise_s_0_1_m_0.png | Bin 0 -> 692490 bytes .../lenna_small_noise_s_0_01_m_0.png | Bin 0 -> 121712 bytes .../lenna_small_noise_s_0_02_m_0.png | Bin 0 -> 133915 bytes .../lenna_small_noise_s_0_05_m_-0_1.png | Bin 0 -> 152935 bytes .../lenna_small_noise_s_0_05_m_0.png | Bin 0 -> 153507 bytes .../lenna_small_noise_s_0_05_m_0_1.png | Bin 0 -> 154283 bytes .../lenna_small_noise_s_0_07_m_0.png | Bin 0 -> 162795 bytes .../gaussian_noise/lenna_small_noise_s_0_1_m_0.png | Bin 0 -> 174738 bytes include/filters/GP_Filters.h | 6 +- include/filters/GP_GaussianNoise.h | 6 +- include/filters/GP_Median.h | 6 +- include/filters/GP_Rotate.h | 22 +++--- include/filters/GP_Sigma.h | 38 +++++----- include/filters/GP_WeightedMedian.h | 6 +- libs/filters/GP_Rotate.c | 24 +++---- tests/filters/APICoverage.gen.c.t | 10 ++-- 31 files changed, 187 insertions(+), 114 deletions(-) copy demos/c_simple/{showimage.c => gaussian_noise.c} (66%) copy doc/{example_loader_registration.txt => example_gaussian_noise.txt} (54%) create mode 100644 doc/filter_additive_gaussian_noise.txt create mode 100644 doc/images/gaussian_noise/lenna_noise_s_0_01_m_0.png create mode 100644 doc/images/gaussian_noise/lenna_noise_s_0_02_m_0.png create mode 100644 doc/images/gaussian_noise/lenna_noise_s_0_05_m_-0_1.png create mode 100644 doc/images/gaussian_noise/lenna_noise_s_0_05_m_0.png create mode 100644 doc/images/gaussian_noise/lenna_noise_s_0_05_m_0_1.png create mode 100644 doc/images/gaussian_noise/lenna_noise_s_0_07_m_0.png create mode 100644 doc/images/gaussian_noise/lenna_noise_s_0_1_m_0.png create mode 100644 doc/images/gaussian_noise/lenna_small_noise_s_0_01_m_0.png create mode 100644 doc/images/gaussian_noise/lenna_small_noise_s_0_02_m_0.png create mode 100644 doc/images/gaussian_noise/lenna_small_noise_s_0_05_m_-0_1.png create mode 100644 doc/images/gaussian_noise/lenna_small_noise_s_0_05_m_0.png create mode 100644 doc/images/gaussian_noise/lenna_small_noise_s_0_05_m_0_1.png create mode 100644 doc/images/gaussian_noise/lenna_small_noise_s_0_07_m_0.png create mode 100644 doc/images/gaussian_noise/lenna_small_noise_s_0_1_m_0.png 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: b6471296e04e26c765fb2c348a728e23fde1ddf0
by metan 18 Mar '13

18 Mar '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 b6471296e04e26c765fb2c348a728e23fde1ddf0 (commit) via d6aa7076c6f1dc065a9dcbd3aa693ca5559a9638 (commit) via 69ba492486b7e674f62accfe5c41f4d7b0e27489 (commit) via 8bababd6a7972a3d0e724ac8fb4c3ee8495a7e16 (commit) from c12d40497d99bf25873566a9b848cd474319c7cd (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/b6471296e04e26c765fb2c348a728e23fde1… commit b6471296e04e26c765fb2c348a728e23fde1ddf0 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon Mar 18 21:03:53 2013 +0100 pywrap:core: Make members of GP_DebugMsg immutable. diff --git a/pylib/gfxprim/core/core.i b/pylib/gfxprim/core/core.i index b7725eb..6e616a1 100644 --- a/pylib/gfxprim/core/core.i +++ b/pylib/gfxprim/core/core.i @@ -11,13 +11,23 @@ %include "GP_Common.h" %include "GP_Core.h" -%include "GP_Debug.h" %include "GP_Types.h" %include "GP_Transform.h" %include "GP_GetSetBits.h" %include "GP_Transform.h" %include "GP_ProgressCallback.h" +/* + * Make members of GP_DebugMsg structure immutable + */ + +%immutable GP_DebugMsg::level; +%immutable GP_DebugMsg::file; +%immutable GP_DebugMsg::fn; +%immutable GP_DebugMsg::line; +%immutable GP_DebugMsg::msg; + +%include "GP_Debug.h" /* * Color and pixel types http://repo.or.cz/w/gfxprim.git/commit/d6aa7076c6f1dc065a9dcbd3aa693ca5559a… commit d6aa7076c6f1dc065a9dcbd3aa693ca5559a9638 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon Mar 18 20:57:12 2013 +0100 pylib:templates,gfxprim_config: Add 16bit Grayscale. Add 16 bit grayscale into the config, fix filter templates. diff --git a/gfxprim_config.py b/gfxprim_config.py index b0aafed..cb3fb44 100644 --- a/gfxprim_config.py +++ b/gfxprim_config.py @@ -121,6 +121,9 @@ config = GfxPrimConfig( PixelType(name='G8', pixelsize=PS_8BPP, chanslist=[ ('V', 0, 8)]), + + PixelType(name='G16', pixelsize=PS_16BPP, chanslist=[ + ('V', 0, 16)]), # # Experiments diff --git a/pylib/templates/filter.arithmetic.c.t b/pylib/templates/filter.arithmetic.c.t index d74ddce..1bbeab1 100644 --- a/pylib/templates/filter.arithmetic.c.t +++ b/pylib/templates/filter.arithmetic.c.t @@ -57,7 +57,7 @@ static int GP_Filter{{ name }}_{{ pt.name }}(const GP_Context *src_a, const GP_C */ %% macro filter_arithmetic_per_bpp(name, filter_op, opts="") %% for ps in pixelsizes -%% if ps.size <= 8 and ps.size > 1 +%% if ps.size > 1 static int GP_Filter{{ name }}_{{ ps.suffix }}(const GP_Context *src_a, const GP_Context *src_b, GP_Context *dst, {{ maybe_opts_r(opts) }}GP_ProgressCallback *callback) { diff --git a/pylib/templates/filter.point.c.t b/pylib/templates/filter.point.c.t index c084efd..dde4ce4 100644 --- a/pylib/templates/filter.point.c.t +++ b/pylib/templates/filter.point.c.t @@ -50,7 +50,7 @@ static int GP_Filter{{ name }}_{{ pt.name }}(const GP_Context *src, GP_Context * */ %% macro filter_point_per_bpp(name, opts="", filter_op) %% for ps in pixelsizes -%% if ps.size <= 8 and ps.size > 1 +%% if ps.size > 1 static int GP_Filter{{ name }}_{{ ps.suffix }}(const GP_Context *src, GP_Context *dst, {{ maybe_opts_r(opts) }}GP_ProgressCallback *callback) { diff --git a/pylib/templates/filter.stats.c.t b/pylib/templates/filter.stats.c.t index 14779a9..5b65f3b 100644 --- a/pylib/templates/filter.stats.c.t +++ b/pylib/templates/filter.stats.c.t @@ -46,7 +46,7 @@ static int GP_Filter{{ name }}_{{ pt.name }}(const GP_Context *src, */ %% macro filter_point_per_bpp(name, opts="", filter_op) %% for ps in pixelsizes -%% if ps.size <= 8 and ps.size > 1 +%% if ps.size > 1 static int GP_Filter{{ name }}_{{ ps.suffix }}(const GP_Context *src, {{ maybe_opts_r(opts) }}GP_ProgressCallback *callback) { http://repo.or.cz/w/gfxprim.git/commit/69ba492486b7e674f62accfe5c41f4d7b0e2… commit 69ba492486b7e674f62accfe5c41f4d7b0e27489 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon Mar 18 20:46:24 2013 +0100 loaders: PSP: Fix 'set but not used' warnings. diff --git a/libs/loaders/GP_PSP.c b/libs/loaders/GP_PSP.c index d77ee29..7585d91 100644 --- a/libs/loaders/GP_PSP.c +++ b/libs/loaders/GP_PSP.c @@ -303,7 +303,6 @@ static int psp_read_composite_image_block(FILE *f, struct psp_img_attrs *attrs, GP_ProgressCallback *callback) { uint8_t buf[8]; - uint32_t chunk_size; uint32_t i, composite_image_count; /* we are allready in subblock -> error */ @@ -317,7 +316,6 @@ static int psp_read_composite_image_block(FILE *f, struct psp_img_attrs *attrs, return EIO; } - chunk_size = BUF_TO_4(buf, 0); composite_image_count = BUF_TO_4(buf, 4); //TODO: utilize chunk_size @@ -366,15 +364,12 @@ static int psp_read_composite_attributes_block(FILE *f, struct psp_img_attrs *at { uint8_t buf[24]; struct psp_comp_img_attr_info info; - uint32_t chunk_size; if (fread(buf, sizeof(buf), 1, f) < 1) { GP_DEBUG(1, "Failed to read Composite Image Bank Info Chunk"); return EIO; } - chunk_size = BUF_TO_4(buf, 0); - info.w = BUF_TO_4(buf, 4); info.h = BUF_TO_4(buf, 8); info.bit_depth = BUF_TO_2(buf, 12); @@ -404,7 +399,6 @@ static int psp_read_jpeg(FILE *f, struct psp_img_attrs *attrs, GP_ProgressCallback *callback) { uint8_t buf[14]; - uint32_t chunk_size; int err; if (fread(buf, sizeof(buf), 1, f) < 1) { @@ -412,8 +406,6 @@ static int psp_read_jpeg(FILE *f, struct psp_img_attrs *attrs, return EIO; } - chunk_size = BUF_TO_4(buf, 0); - //TODO: utilize chunk_size GP_DEBUG(5, "JPEG Chunk"); http://repo.or.cz/w/gfxprim.git/commit/8bababd6a7972a3d0e724ac8fb4c3ee8495a… commit 8bababd6a7972a3d0e724ac8fb4c3ee8495a7e16 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon Mar 18 20:41:37 2013 +0100 core: Convert_Scale: Add support for > 8bits. Add support for conversion macros up to 32bits per channel and also make the header more readable by writing the shift as a C shift. diff --git a/include/core/GP_Convert_Scale.gen.h.t b/include/core/GP_Convert_Scale.gen.h.t index c358576..a7dae41 100644 --- a/include/core/GP_Convert_Scale.gen.h.t +++ b/include/core/GP_Convert_Scale.gen.h.t @@ -3,7 +3,7 @@ {% block descr %}Fast value scaling macros{% endblock %} {% macro multcoef(s1, s2) -%} -(0{% for i in range((s2 + s1 - 1) // s1) %}+{{ 2 ** (i * s1) }}{% endfor %}) +(0{% for i in range((s2 + s1 - 1) // s1) %}+(2<<{{ (i * s1) }}){% endfor %}) {%- endmacro %} %% block body @@ -15,8 +15,8 @@ #define GP_SCALE_VAL(s1, s2, val) ( GP_SCALE_VAL_##s1##_##s2(val) ) -%% for s1 in range(1,9) -%% for s2 in range(1,9) +%% for s1 in range(1,33) +%% for s2 in range(1,33) %% if s2>s1 #define GP_SCALE_VAL_{{s1}}_{{s2}}(val) (((val) * {{ multcoef(s1, s2) }}) >> {{ (-s2) % s1 }}) %% else ----------------------------------------------------------------------- Summary of changes: gfxprim_config.py | 3 +++ include/core/GP_Convert_Scale.gen.h.t | 6 +++--- libs/loaders/GP_PSP.c | 8 -------- pylib/gfxprim/core/core.i | 12 +++++++++++- pylib/templates/filter.arithmetic.c.t | 2 +- pylib/templates/filter.point.c.t | 2 +- pylib/templates/filter.stats.c.t | 2 +- 7 files changed, 20 insertions(+), 15 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: c12d40497d99bf25873566a9b848cd474319c7cd
by metan 10 Mar '13

10 Mar '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 c12d40497d99bf25873566a9b848cd474319c7cd (commit) from 7ed201b00c522cc717ae55bc2e801cbceecccc8c (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/c12d40497d99bf25873566a9b848cd474319… commit c12d40497d99bf25873566a9b848cd474319c7cd Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun Mar 10 17:19:56 2013 +0100 libs: filters: Don't abort on unimplemented filter The library now returns failure instead. diff --git a/libs/filters/GP_Median.c b/libs/filters/GP_Median.c index e6dca7d..130ad92 100644 --- a/libs/filters/GP_Median.c +++ b/libs/filters/GP_Median.c @@ -16,10 +16,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, * * Boston, MA 02110-1301 USA * * * - * Copyright (C) 2009-2012 Cyril Hrubis <metan(a)ucw.cz> * + * Copyright (C) 2009-2013 Cyril Hrubis <metan(a)ucw.cz> * * * *****************************************************************************/ +#include <errno.h> + #include "core/GP_Context.h" #include "core/GP_GetPutPixel.h" #include "core/GP_TempAlloc.h" @@ -176,8 +178,10 @@ static int GP_FilterMedian_Raw(const GP_Context *src, int i, x, y; unsigned int trigger = ((2*xmed+1)*(2*ymed+1))/2; - //TODO - GP_CHECK(src->pixel_type == GP_PIXEL_RGB888); + if (src->pixel_type != GP_PIXEL_RGB888) { + errno = ENOSYS; + return -1; + } GP_DEBUG(1, "Median filter size %ux%u xmed=%u ymed=%u", w_src, h_src, 2 * xmed + 1, 2 * ymed + 1); diff --git a/libs/filters/GP_Sigma.c b/libs/filters/GP_Sigma.c index 2d1f6aa..d6d78c8 100644 --- a/libs/filters/GP_Sigma.c +++ b/libs/filters/GP_Sigma.c @@ -16,10 +16,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, * * Boston, MA 02110-1301 USA * * * - * Copyright (C) 2009-2012 Cyril Hrubis <metan(a)ucw.cz> * + * Copyright (C) 2009-2013 Cyril Hrubis <metan(a)ucw.cz> * * * *****************************************************************************/ +#include <errno.h> + #include "core/GP_Context.h" #include "core/GP_GetPutPixel.h" #include "core/GP_TempAlloc.h" @@ -44,7 +46,10 @@ static int GP_FilterSigma_Raw(const GP_Context *src, int x, y; unsigned int x1, y1; - GP_CHECK(src->pixel_type == GP_PIXEL_RGB888); + if (src->pixel_type != GP_PIXEL_RGB888) { + errno = ENOSYS; + return -1; + } GP_DEBUG(1, "Sigma Mean filter size %ux%u xrad=%u yrad=%u sigma=%.2f", w_src, h_src, xrad, yrad, sigma); diff --git a/libs/filters/GP_WeightedMedian.c b/libs/filters/GP_WeightedMedian.c index a34193d..aac0c75 100644 --- a/libs/filters/GP_WeightedMedian.c +++ b/libs/filters/GP_WeightedMedian.c @@ -16,10 +16,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, * * Boston, MA 02110-1301 USA * * * - * Copyright (C) 2009-2012 Cyril Hrubis <metan(a)ucw.cz> * + * Copyright (C) 2009-2013 Cyril Hrubis <metan(a)ucw.cz> * * * *****************************************************************************/ +#include <errno.h> + #include "core/GP_Context.h" #include "core/GP_GetPutPixel.h" #include "core/GP_TempAlloc.h" @@ -86,7 +88,10 @@ static int GP_FilterWeightedMedian_Raw(const GP_Context *src, int x, y, sum = sum_weights(weights); unsigned int x1, y1; - GP_CHECK(src->pixel_type == GP_PIXEL_RGB888); + if (src->pixel_type != GP_PIXEL_RGB888) { + errno = ENOSYS; + return -1; + } GP_DEBUG(1, "Weighted Median filter size %ux%u xmed=%u ymed=%u sum=%u", w_src, h_src, weights->w, weights->h, sum); ----------------------------------------------------------------------- Summary of changes: libs/filters/GP_Median.c | 10 +++++++--- libs/filters/GP_Sigma.c | 9 +++++++-- libs/filters/GP_WeightedMedian.c | 9 +++++++-- 3 files changed, 21 insertions(+), 7 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: 7ed201b00c522cc717ae55bc2e801cbceecccc8c
by metan 10 Mar '13

10 Mar '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 7ed201b00c522cc717ae55bc2e801cbceecccc8c (commit) from 14a7c31c3b039f035cbb271888cc5fa44c578802 (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/7ed201b00c522cc717ae55bc2e801cbceecc… commit 7ed201b00c522cc717ae55bc2e801cbceecccc8c Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun Mar 10 17:13:08 2013 +0100 tests: filters: Fix coverage filter params. For the rotation filters the rotated context must fit into the destination, fix this for now by making the predefined context square. diff --git a/tests/filters/APICoverage.gen.c.t b/tests/filters/APICoverage.gen.c.t index 32dfd0e..fdffabe 100644 --- a/tests/filters/APICoverage.gen.c.t +++ b/tests/filters/APICoverage.gen.c.t @@ -97,7 +97,7 @@ ] %% macro prep_context(id, pt) - GP_Context *{{ id }} = GP_ContextAlloc(113, 900, GP_PIXEL_{{ pt.name }}); + GP_Context *{{ id }} = GP_ContextAlloc(331, 331, GP_PIXEL_{{ pt.name }}); %% endmacro %% macro prep_float(id) ----------------------------------------------------------------------- Summary of changes: tests/filters/APICoverage.gen.c.t | 2 +- 1 files changed, 1 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: 14a7c31c3b039f035cbb271888cc5fa44c578802
by metan 08 Mar '13

08 Mar '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 14a7c31c3b039f035cbb271888cc5fa44c578802 (commit) from cb2c440163c18fe8cdbe96969ea28fe38da3fb56 (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/14a7c31c3b039f035cbb271888cc5fa44c57… commit 14a7c31c3b039f035cbb271888cc5fa44c578802 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Fri Mar 8 15:26:50 2013 +0100 tests: filters: Add a few initializers to APICoverage. diff --git a/tests/filters/APICoverage.gen.c.t b/tests/filters/APICoverage.gen.c.t index 3b46006..32dfd0e 100644 --- a/tests/filters/APICoverage.gen.c.t +++ b/tests/filters/APICoverage.gen.c.t @@ -38,24 +38,34 @@ #include "tst_test.h" -%% set API_List = [['MirrorH', 'GP_Context:in', 'GP_Context:out', 'GP_ProgressCallback'], +%% set API_List = [['MirrorH', 'GP_Context:in', 'GP_Context:out', + 'GP_ProgressCallback'], ['MirrorH_Alloc', 'GP_Context:in', 'GP_ProgressCallback'], - ['MirrorV', 'GP_Context:in', 'GP_Context:out', 'GP_ProgressCallback'], + ['MirrorV', 'GP_Context:in', 'GP_Context:out', + 'GP_ProgressCallback'], ['MirrorV_Alloc', 'GP_Context:in', 'GP_ProgressCallback'], - ['Rotate90', 'GP_Context:in', 'GP_Context:out', 'GP_ProgressCallback'], - ['Rotate90_Alloc', 'GP_Context:in', 'GP_ProgressCallback'], + ['Rotate90', 'GP_Context:in', 'GP_Context:out', + 'GP_ProgressCallback'], + ['Rotate90_Alloc', 'GP_Context:in', 'GP_ProgressCallback'], - ['Rotate180', 'GP_Context:in', 'GP_Context:out', 'GP_ProgressCallback'], - ['Rotate180_Alloc', 'GP_Context:in', 'GP_ProgressCallback'], + ['Rotate180', 'GP_Context:in', 'GP_Context:out', + 'GP_ProgressCallback'], + ['Rotate180_Alloc', 'GP_Context:in', 'GP_ProgressCallback'], - ['Rotate270', 'GP_Context:in', 'GP_Context:out', 'GP_ProgressCallback'], - ['Rotate270_Alloc', 'GP_Context:in', 'GP_ProgressCallback'], - - ['GaussianBlur', 'GP_Context:in', 'GP_Context:out', + ['Rotate270', 'GP_Context:in', 'GP_Context:out', + 'GP_ProgressCallback'], + ['Rotate270_Alloc', 'GP_Context:in', 'GP_ProgressCallback'], + + ['Convolution', 'GP_Context:in', 'GP_Context:out', + 'GP_FilterKernel2D:kernel', 'GP_ProgressCallback'], + ['ConvolutionAlloc', 'GP_Context:in', + 'GP_FilterKernel2D:kernel', 'GP_ProgressCallback'], + + ['GaussianBlur', 'GP_Context:in', 'GP_Context:out', 'float:sigma_x', 'float:sigma_y', 'GP_ProgressCallback'], - ['GaussianBlurAlloc', 'GP_Context:in', 'float:sigma_x', + ['GaussianBlurAlloc', 'GP_Context:in', 'float:sigma_x', 'float:sigma_y', 'GP_ProgressCallback'], ['GaussianNoiseAdd', 'GP_Context:in', 'GP_Context:out', @@ -68,13 +78,22 @@ ['MedianAlloc', 'GP_Context:in', 'int:xmed', 'int:ymed', 'GP_ProgressCallback'], - ['Sigma', 'GP_Context:in', 'GP_Context:out', - 'int:xrad', 'int:yrad', 'int:min', 'float:sigma', 'GP_ProgressCallback'], - ['SigmaAlloc', 'GP_Context:in', - 'int:xrad', 'int:yrad', 'int:min', 'float:sigma', 'GP_ProgressCallback'], - - ['ResizeNN', 'GP_Context:in', 'GP_Context:out', 'GP_ProgressCallback'], - ['ResizeNNAlloc', 'GP_Context:in', 'int:w', 'int:h', 'GP_ProgressCallback'], + ['WeightedMedian', 'GP_Context:in', 'GP_Context:out', + 'GP_MedianWeights:weights', 'GP_ProgressCallback'], + ['WeightedMedianAlloc', 'GP_Context:in', + 'GP_MedianWeights:weights', 'GP_ProgressCallback'], + + ['Sigma', 'GP_Context:in', 'GP_Context:out', + 'int:xrad', 'int:yrad', 'int:min', 'float:sigma', + 'GP_ProgressCallback'], + ['SigmaAlloc', 'GP_Context:in', + 'int:xrad', 'int:yrad', 'int:min', 'float:sigma', + 'GP_ProgressCallback'], + + ['ResizeNN', 'GP_Context:in', 'GP_Context:out', + 'GP_ProgressCallback'], + ['ResizeNNAlloc', 'GP_Context:in', 'int:w', 'int:h', + 'GP_ProgressCallback'], ] %% macro prep_context(id, pt) @@ -89,6 +108,41 @@ int {{ id }} = 2; %% endmacro +%% macro prep_median_weights(id) + + unsigned int {{ id }}_w[] = { + 1, 2, 1, + 2, 4, 2, + 1, 2, 1, + }; + + GP_MedianWeights {{ id }}_s = { + .w = 3, + .h = 3, + .weights = {{ id }}_w, + }; + + GP_MedianWeights *{{ id }} = &{{ id }}_s; + +%% endmacro + +%% macro prep_filter_kernel_2d(id) + float {{ id }}_kern[] = { + 1, 1, 1, + 1, 1, 1, + 1, 1, 1, + }; + + GP_FilterKernel2D {{ id }}_s = { + .w = 3, + .h = 3, + .div = 9, + .kernel = {{ id }}_kern, + }; + + GP_FilterKernel2D *{{ id }} = &{{ id }}_s; +%% endmacro + %% macro prep_param(param, pt) %% if (param.split(':', 1)[0] == 'GP_Context') {{ prep_context(param.split(':', 1)[1], pt) }} @@ -99,27 +153,33 @@ %% if (param.split(':', 1)[0] == 'int') {{ prep_int(param.split(':', 1)[1]) }} %% endif +%% if (param.split(':', 1)[0] == 'GP_MedianWeights') +{{ prep_median_weights(param.split(':', 1)[1]) }} +%% endif +%% if (param.split(':', 1)[0] == 'GP_FilterKernel2D') +{{ prep_filter_kernel_2d(param.split(':', 1)[1]) }} +%% endif %% endmacro {% macro get_param(param) %}{% if len(param.split(':', 1)) == 1 %}NULL{% else %}{{ param.split(':', 1)[1] }}{% endif %}{% endmacro %} -%% for pt in pixeltypes -%% if not pt.is_unknown() %% for fn in API_List +%% for pt in pixeltypes +%% if not pt.is_unknown() static int Filter_{{ fn[0]}}_{{ pt.name }}(void) { -%% for param in fn[1:] +%% for param in fn[1:] {{ prep_param(param, pt) }} -%% endfor +%% endfor GP_Filter{{ fn[0] }}({{ get_param(fn[1]) }}{% for param in fn[2:] %}, {{ get_param(param) }}{% endfor %}); return TST_SUCCESS; } -%% endfor -%% endif +%% endif +%% endfor %% endfor const struct tst_suite tst_suite = { ----------------------------------------------------------------------- Summary of changes: tests/filters/APICoverage.gen.c.t | 108 ++++++++++++++++++++++++++++-------- 1 files changed, 84 insertions(+), 24 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