- Gfxprim - ucw.cz

[repo.or.cz] gfxprim.git branch master updated: 33b95fd86ead735cd54f3b0f7cf87c779a4370ad
by gavento 22 Dec '12

22 Dec '12

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 33b95fd86ead735cd54f3b0f7cf87c779a4370ad (commit) from 18f21817f0ccdf5e4024183595e127eec8ce7744 (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/33b95fd86ead735cd54f3b0f7cf87c779a43… commit 33b95fd86ead735cd54f3b0f7cf87c779a4370ad Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Sat Dec 22 22:37:06 2012 +0100 core: Add a C backtrace to GP_ABORT diff --git a/configure b/configure index 6eead34..d2f2d43 100755 --- a/configure +++ b/configure @@ -238,7 +238,7 @@ if __name__ == '__main__': # # name, description, [detection], cflags, ldflags, list of modules library is needed for # - l = libraries([["libpng", + l = libraries([["libpng", "Portable Network Graphics Library", [header_exists, "png.h"], "", "-lpng", ["loaders"]], ["libsdl", @@ -262,6 +262,10 @@ if __name__ == '__main__': ["dl", "Dynamic linker", [header_exists, "dlfcn.h"], "", "-ldl", ["core"]], + ["backtrace", + "C stack trace writeout", + [c_try_compile, "#include <execinfo.h>nint main(void) { backtrace(0, 0); }", + "Checking for backtrace() ... "], "", "", ["core"]], ["V4L2", "Video for linux 2", [header_exists, "linux/videodev2.h"], "", "", ["grabbers"]]], cfg) diff --git a/include/core/GP_Common.h b/include/core/GP_Common.h index 95731b7..1140e76 100644 --- a/include/core/GP_Common.h +++ b/include/core/GP_Common.h @@ -99,13 +99,14 @@ * and prints message and calls abort(). * GP_GENERAL_CHECK is a check with specified message prefix * (for assert and check) - * - * SWIG_print_trace() prints a trace of Python stack if a Python interpreter - * is set up. In case more wrappers are written, should print a trace - * for the currently active. */ -void SWIG_print_trace(void); +/* + * Print as much trace info as possible. Currently, the (C) call stack and + * the Python stack if a Python interpreter is set up. In case more wrappers + * are written, it should print a trace for the currently active. + */ +void GP_PrintAbortInfo(void); #define GP_INTERNAL_ABORT_BUFSIZE 1024 #define GP_INTERNAL_ABORT(str_abort_msg_, ...) do { @@ -118,8 +119,8 @@ void SWIG_print_trace(void); buf += snprintf(buf, bufend - buf, "abort()"); else buf += snprintf(buf, bufend - buf, " " __VA_ARGS__); - SWIG_print_trace(); fprintf(stderr, "%sn", bufstart); + GP_PrintAbortInfo(); abort(); } while (0) diff --git a/libs/core/GP_Common.c b/libs/core/GP_Common.c index 2cf6fc9..52c4920 100644 --- a/libs/core/GP_Common.c +++ b/libs/core/GP_Common.c @@ -24,14 +24,35 @@ #include "../config.h" -#include "core/GP_Common.h" +#include <stdio.h> + +#ifdef HAVE_BACKTRACE +#include <execinfo.h> +#endif /* HAVE_BACKTRACE */ #ifdef HAVE_DL #include <dlfcn.h> #endif /* HAVE_DL */ +#include "core/GP_Common.h" + +#define GP_ABORT_INFO_TRACE_LEVELS 20 + + +void GP_PrintCStack(void) +{ +#ifdef HAVE_BACKTRACE +#if GP_ABORT_INFO_TRACE_LEVELS > 0 + void * buffer[GP_ABORT_INFO_TRACE_LEVELS + 1]; + int size = backtrace(buffer, GP_ABORT_INFO_TRACE_LEVELS); + fprintf(stderr, "nC stack trace (most recent call first):n"); + fflush(stderr); + backtrace_symbols_fd(buffer, size, fileno(stderr)); +#endif /* GP_ABORT_INFO_TRACE_LEVELS > 0 */ +#endif /* HAVE_BACKTRACE */ +} -void SWIG_print_trace(void) +void GP_PrintPythonStack(void) { #ifdef HAVE_DL /* Print python stack trace in case python lib is loaded and @@ -40,7 +61,17 @@ void SWIG_print_trace(void) int (*dl_PyRun_SimpleString)(const char *); dl_Py_IsInitialized = dlsym(RTLD_DEFAULT, "Py_IsInitialized"); dl_PyRun_SimpleString = dlsym(RTLD_DEFAULT, "PyRun_SimpleString"); - if (dl_Py_IsInitialized && dl_PyRun_SimpleString && dl_Py_IsInitialized()) + if (dl_Py_IsInitialized && dl_PyRun_SimpleString && dl_Py_IsInitialized()) { + fprintf(stderr, "nPython stack trace (most recent call last; ignore last line):n"); + fflush(stderr); dl_PyRun_SimpleString("import traceback; traceback.print_stack();"); + } #endif /* HAVE_DL */ } + +void GP_PrintAbortInfo(void) +{ + GP_PrintPythonStack(); + GP_PrintCStack(); +} + ----------------------------------------------------------------------- Summary of changes: configure | 6 +++++- include/core/GP_Common.h | 13 +++++++------ libs/core/GP_Common.c | 37 ++++++++++++++++++++++++++++++++++--- 3 files changed, 46 insertions(+), 10 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: 18f21817f0ccdf5e4024183595e127eec8ce7744
by gavento 22 Dec '12

22 Dec '12

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 18f21817f0ccdf5e4024183595e127eec8ce7744 (commit) from a3c538fd80eb28f103161ce90aa03b05da303866 (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/18f21817f0ccdf5e4024183595e127eec8ce… commit 18f21817f0ccdf5e4024183595e127eec8ce7744 Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Sat Dec 22 02:34:59 2012 +0100 configure: update configure to look for libdl diff --git a/configure b/configure index db5733f..6eead34 100755 --- a/configure +++ b/configure @@ -259,6 +259,9 @@ if __name__ == '__main__': ["freetype", "A high-quality and portable font engine", [header_exists, "ft2build.h"], "", "`freetype-config --libs`", ["core"]], + ["dl", + "Dynamic linker", + [header_exists, "dlfcn.h"], "", "-ldl", ["core"]], ["V4L2", "Video for linux 2", [header_exists, "linux/videodev2.h"], "", "", ["grabbers"]]], cfg) ----------------------------------------------------------------------- Summary of changes: configure | 3 +++ 1 files changed, 3 insertions(+), 0 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: a3c538fd80eb28f103161ce90aa03b05da303866
by gavento 22 Dec '12

22 Dec '12

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 a3c538fd80eb28f103161ce90aa03b05da303866 (commit) via 7a26d926dbd69b93075025f03f71fed563484f78 (commit) via 53d752f070bb250f906844ac8ad82f10ea33c5e7 (commit) from 75d8ed70740c7f15606f382a4bba5cd14a632b24 (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/a3c538fd80eb28f103161ce90aa03b05da30… commit a3c538fd80eb28f103161ce90aa03b05da303866 Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Sat Dec 22 02:19:41 2012 +0100 Print stack trace on GP_ABORT inside active Python diff --git a/include/core/GP_Common.h b/include/core/GP_Common.h index a1e8d14..95731b7 100644 --- a/include/core/GP_Common.h +++ b/include/core/GP_Common.h @@ -100,11 +100,12 @@ * GP_GENERAL_CHECK is a check with specified message prefix * (for assert and check) * - * SWIG_exception is a dummy no-op that is used to raise an exception when wrapped. - * NOTE: Currently totally useless. Hrmmppff. + * SWIG_print_trace() prints a trace of Python stack if a Python interpreter + * is set up. In case more wrappers are written, should print a trace + * for the currently active. */ -void SWIG_exception(const char *msg); +void SWIG_print_trace(void); #define GP_INTERNAL_ABORT_BUFSIZE 1024 #define GP_INTERNAL_ABORT(str_abort_msg_, ...) do { @@ -117,7 +118,7 @@ void SWIG_exception(const char *msg); buf += snprintf(buf, bufend - buf, "abort()"); else buf += snprintf(buf, bufend - buf, " " __VA_ARGS__); - SWIG_exception(bufstart); + SWIG_print_trace(); fprintf(stderr, "%sn", bufstart); abort(); } while (0) diff --git a/libs/core/GP_Common.c b/libs/core/GP_Common.c index 92ec868..2cf6fc9 100644 --- a/libs/core/GP_Common.c +++ b/libs/core/GP_Common.c @@ -20,8 +20,27 @@ * * *****************************************************************************/ +#define _GNU_SOURCE + +#include "../config.h" + #include "core/GP_Common.h" -void SWIG_exception(const char *msg) +#ifdef HAVE_DL +#include <dlfcn.h> +#endif /* HAVE_DL */ + + +void SWIG_print_trace(void) { +#ifdef HAVE_DL + /* Print python stack trace in case python lib is loaded and + * a python interpreter is initialized */ + int (*dl_Py_IsInitialized)(); + int (*dl_PyRun_SimpleString)(const char *); + dl_Py_IsInitialized = dlsym(RTLD_DEFAULT, "Py_IsInitialized"); + dl_PyRun_SimpleString = dlsym(RTLD_DEFAULT, "PyRun_SimpleString"); + if (dl_Py_IsInitialized && dl_PyRun_SimpleString && dl_Py_IsInitialized()) + dl_PyRun_SimpleString("import traceback; traceback.print_stack();"); +#endif /* HAVE_DL */ } diff --git a/pylib/gfxprim/common.i b/pylib/gfxprim/common.i index bc99ff3..2d17c0f 100644 --- a/pylib/gfxprim/common.i +++ b/pylib/gfxprim/common.i @@ -5,6 +5,7 @@ #define __attribute__(X) %include <stdint.i> +%include <exception.i> %feature("autodoc"); http://repo.or.cz/w/gfxprim.git/commit/7a26d926dbd69b93075025f03f71fed56348… commit 7a26d926dbd69b93075025f03f71fed563484f78 Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Fri Dec 21 21:09:08 2012 +0100 Finish Context methods and wrapping diff --git a/pylib/gfxprim/core/__init__.py b/pylib/gfxprim/core/__init__.py index bcc26f4..3bf8d08 100644 --- a/pylib/gfxprim/core/__init__.py +++ b/pylib/gfxprim/core/__init__.py @@ -22,7 +22,7 @@ def _init(module): """ import re - from ..utils import extend, add_swig_getmethod, add_swig_setmethod + from ..utils import extend, extend_direct, add_swig_getmethod, add_swig_setmethod from ..utils import import_members _context = module['Context'] @@ -55,9 +55,10 @@ def _init(module): c.parent = None return c + extend_direct @extend(_context) - def Subcontext(self, x, y, w, h): - "Create a subcontext (rectangular view)." + def SubContext(self, x, y, w, h): + "Create a subcontext (a rectangular view)." c = c_core.GP_SubContextAlloc(self, x, y, w, h) c.parent = self return c @@ -74,6 +75,22 @@ def _init(module): See GP_ContextConvert() for details.""" return c_core.GP_ContextConvert(self, pixeltype_no(target_type)) + # Manipulation + extend_direct(_context, "PutPixel", c_core.GP_PutPixel, + "Set a pixel value encoded according to context PixelType. Clipped.") + + extend_direct(_context, "GetPixel", c_core.GP_GetPixel, + "Get a pixel value (encoded according to context PixelType). Clipped.") + + extend_direct(_context, "RotateCW", c_core.GP_ContextRotateCW, + "Rotate Context clockwise by changing the context orientation.") + + extend_direct(_context, "RotateCCW", c_core.GP_ContextRotateCCW, + "Rotate Context counter-clockwise by changing the context orientation.") + + extend_direct(_context, "Resize", c_core.GP_ContextResize, + "Resize the context bitmap (reallocate). Fails on subcontexts.") + # Color conversions @extend(_context) @@ -136,23 +153,23 @@ TODO: on entering any func from Python, set up error reporting on GP_ABORT ! Pixeltype table and objects -GP_PixelTypes +GP_PixelTypes - FIX ! IN Context class -GP_ContextAlloc -GP_ContextResize -GP_ContextConvertAlloc -GP_ContextPrintInfo -GP_ContextRotateCCW -GP_SubContextAlloc -GP_ContextConvert -GP_ContextRotateCW -GP_ContextFree -GP_ContextInit -GP_SubContext -GP_ContextCopy -GP_PixelAddrOffset +GP_ContextAlloc C +GP_ContextResize C +GP_ContextConvertAlloc C +GP_ContextPrintInfo N +GP_ContextRotateCCW C +GP_SubContextAlloc C +GP_ContextConvert C +GP_ContextRotateCW C +GP_ContextFree Ci +GP_ContextInit N +GP_SubContext N +GP_ContextCopy C +GP_PixelAddrOffset N ! ? @@ -168,8 +185,8 @@ GP_PixelAddrOffset ! Color conversion -GP_RGBA8888ToPixel -GP_RGB888ToPixel +GP_RGBA8888ToPixel N +GP_RGB888ToPixel N GP_PixelToRGB888 GP_PixelToRGBA8888 GP_ColorNameToPixel @@ -212,12 +229,12 @@ Blit - reimplement with keyword args, no raw ! IN Context - basic drawing -GP_PutPixel -GP_GetPixel +GP_PutPixel C +GP_GetPixel C ! ? -# GP_NrThreads +# GP_NrThreads # GP_NrThreadsSet # GP_ProgressCallbackMP # SWIG_exception diff --git a/pylib/gfxprim/core/_extend_context.py b/pylib/gfxprim/core/_extend_context.py deleted file mode 100644 index 4b73ec9..0000000 --- a/pylib/gfxprim/core/_extend_context.py +++ /dev/null @@ -1,60 +0,0 @@ -from ..utils import extend, add_swig_getmethod, add_swig_setmethod -from . import core_c - -def extend_context(_context): - """ - Extends _context class with core module methods and properties - for object-oriented usage. - Called once on module inicialization. - """ - - # Add "parent" attribute - extend(_context, name='parent')(None) - - @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, - "" if self.thisown else "not ", - "with" if self.parent else "no") - - @extend(_context) - def Subcontext(self, x, y, w, h): - "Create a subcontext (rectangular view)." - c = core_c.GP_ContextSubContext(self, None, x, y, w, h) - c.parent = self - return c - - @extend(_context) - def Copy(self, withdata): - "Copy the context to a new context. Pixel data are copie optionally." - flags = core_c.GP_COPY_WITH_PIXELS if withdata else 0 - return core_c.GP_ContextCopy(self, flags) - - @extend(_context) - def Convert(self, target_type): - """Converts context to a different pixel type, allocates new context. - See GP_ContextConvert() for details.""" - pixeltype_no = target_type ## TODO also accept PixelType - return core_c.GP_ContextConvert(self, pixeltype_no) - - @extend(_context, name='Create') - @staticmethod - def Create(w, h, pixeltype): - "Allocate a new w*h bitmap of given type." - - pixeltype_no = pixeltype if isinstance(pixeltype, int) else 0 # !!! - # TODO: actually accept a PixelType - c = core_c.GP_ContextAlloc(w, h, pixeltype_no) - return c - - @extend(_context) - def RGBToPixel(self, r, g, b): - "Convert RGB888 (values 0-255) to context pixel type." - return core_c.GP_RGBToPixel(int(r), int(g), int(b), self.pixel_type) - - @extend(_context) - def RGBAToPixel(self, r, g, b): - "Convert RGBA8888 (values 0-255) to context pixel type." - return GP_RGBToPixel(r, g, b, self.pixel_type) diff --git a/pylib/gfxprim/utils.py b/pylib/gfxprim/utils.py index 32462f1..5dc6dab 100644 --- a/pylib/gfxprim/utils.py +++ b/pylib/gfxprim/utils.py @@ -13,6 +13,17 @@ def extend(cls, name=None): return decf +def extend_direct(cls, name, call, doc, swig_doc=True): + "Decorator extending a class with a function" + def method(*args, **kwargs): + return call(*args, **kwargs) + method.__name__ = name + method.__doc__ = doc.strip() + 'n' + if swig_doc: + method.__doc__ = call.__doc__ + 'nn' + doc.strip() + 'n' + type.__setattr__(cls, name, method) + + def add_swig_getmethod(cls, name=None): "Decorator to add a property get method to a SWIG-defined class" def decf(method): http://repo.or.cz/w/gfxprim.git/commit/53d752f070bb250f906844ac8ad82f10ea33… commit 53d752f070bb250f906844ac8ad82f10ea33c5e7 Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Fri Dec 21 20:28:09 2012 +0100 First part of reworking pywrap for core diff --git a/pylib/gfxprim/core/__init__.py b/pylib/gfxprim/core/__init__.py index 7589d14..bcc26f4 100644 --- a/pylib/gfxprim/core/__init__.py +++ b/pylib/gfxprim/core/__init__.py @@ -1,30 +1,119 @@ -from . import core_c -Context = core_c.GP_Context +# Import the SWIG wrapper + +from . import c_core + + +# Constants module -# Constants from . import C -def _init(module): - # Extend Context with convenience methods - from ._extend_context import extend_context - extend_context(Context) +# Main Context proxy (extended below) + +Context = c_core.GP_Context + + +def _init(module): + """ + Extends _context class with core module methods and properties + for object-oriented usage. + Called once on module initialization. + """ - # Import some members from the SWIG module import re + from ..utils import extend, add_swig_getmethod, add_swig_setmethod from ..utils import import_members + _context = module['Context'] + + # String representation + + @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, + "" if self.thisown else "not ", + "with" if self.parent else "no") + + # Creation + + def pixeltype_no(pixeltype): + "Return pixel type number from the number or a PixelType instance" + if isinstance(pixeltype, int): + return pixeltype + if isinstance(pixeltype, c_core.GP_PixelTypeDescription): + return pixeltype.type + raise TypeError("Not a PixelType instance or number: %r", pixeltype) + + @extend(_context, name='Create') + @staticmethod + def Create(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 + + @extend(_context) + def Subcontext(self, x, y, w, h): + "Create a subcontext (rectangular view)." + c = c_core.GP_SubContextAlloc(self, x, y, w, h) + c.parent = self + return c + + @extend(_context) + def Copy(self, withdata): + "Copy the context to a new context. Pixel data are copie optionally." + flags = c_core.GP_COPY_WITH_PIXELS if withdata else 0 + return c_core.GP_ContextCopy(self, flags) + + @extend(_context) + def Convert(self, target_type): + """Converts context to a different pixel type, allocates new context. + See GP_ContextConvert() for details.""" + return c_core.GP_ContextConvert(self, pixeltype_no(target_type)) + + # Color conversions + + @extend(_context) + def RGBToPixel(self, r, g, b): + "Convert RGB888 (values 0-255) to context pixel type." + return c_core.GP_RGBToPixel(int(r), int(g), int(b), self.pixel_type) + + @extend(_context) + def RGBAToPixel(self, r, g, b, a): + "Convert RGBA8888 (values 0-255) to context pixel type." + return c_core.GP_RGBAToPixel(int(r), int(g), int(b), int(a), self.pixel_type) + + # Handle submodule methods such as context.gfx.Line(...) + _available_submodules = frozenset(['gfx', 'loaders', 'text', 'filters']) + + extend(_context, name='_submodules')({}) + + old__getattr__ = _context.__getattr__ + def Context__getattr__(self, name): + if name in _context._submodules: + assert name in _available_submodules + return _context._submodules[name](self) + if name in _available_submodules: + raise RuntimeError("GfxPrim submodule '%s' not loaded" % name) + return old__getattr__(self, name) + _context.__getattr__ = Context__getattr__ + + # Import constants into a separate module - # Constants const_regexes = [ '^GP_[A-Z0-9_]*$', '^GP_PIXEL_x[A-Z0-9_]*$'] def strip_GP(s): return re.sub('^GP_', '', s) - import_members(core_c, C, include=const_regexes, sub=strip_GP) + import_members(c_core, C, include=const_regexes, sub=strip_GP) + # every Context also points to C for convenience + extend(_context, name='C')(C) - # Functions - import_members(core_c, module, sub=strip_GP, + # Bulk import of functions - TODO: only import specified + import_members(c_core, module, sub=strip_GP, exclude=const_regexes + [ '^GP_Blitw+$', '^GP_Contextw+$', @@ -37,3 +126,100 @@ def _init(module): _init(locals()) del _init + +""" +TODO: on entering any func from Python, set up error reporting on GP_ABORT +(raise an exception, restore stack and return, possibly longjmp? +(or just force python trace?) + +!! LIST of symbols to implement + +! Pixeltype table and objects + +GP_PixelTypes + +! IN Context class + +GP_ContextAlloc +GP_ContextResize +GP_ContextConvertAlloc +GP_ContextPrintInfo +GP_ContextRotateCCW +GP_SubContextAlloc +GP_ContextConvert +GP_ContextRotateCW +GP_ContextFree +GP_ContextInit +GP_SubContext +GP_ContextCopy +GP_PixelAddrOffset + +! ? + +# GP_GammaRelease +# GP_GammaCopy +# GP_GammaAcquire + +! ? + +# GP_DebugPrint +# GP_SetDebugLevel +# GP_GetDebugLevel + +! Color conversion + +GP_RGBA8888ToPixel +GP_RGB888ToPixel +GP_PixelToRGB888 +GP_PixelToRGBA8888 +GP_ColorNameToPixel + +GP_PixelTypeByName - reimplement + +# GP_ColorToPixel +# GP_PixelRGBMatch +# GP_ColorLoadPixels +# GP_PixelRGBLookup +# GP_ColorNameToColor +# GP_ColorToColorName + +! IN Context class + +Blit - reimplement with keyword args, no raw + +# GP_BlitXYXY +# GP_BlitXYXY_Fast +# GP_BlitXYWH +# GP_BlitXYWH_Clipped +# GP_BlitXYXY_Clipped +# GP_BlitXYXY_Raw_Fast +# GP_BlitXYWH_Raw +# GP_BlitXYXY_Raw + +! Do not want + +# GP_WritePixels_1BPP_LE +# GP_WritePixels_2BPP_LE +# GP_WritePixels_4BPP_LE +# GP_WritePixels1bpp +# GP_WritePixels2bpp +# GP_WritePixels4bpp +# GP_WritePixels8bpp +# GP_WritePixels16bpp +# GP_WritePixels18bpp +# GP_WritePixels32bpp +# GP_WritePixels24bpp + +! IN Context - basic drawing + +GP_PutPixel +GP_GetPixel + +! ? + +# GP_NrThreads +# GP_NrThreadsSet +# GP_ProgressCallbackMP +# SWIG_exception +""" + diff --git a/pylib/gfxprim/core/core.i b/pylib/gfxprim/core/core.i index c679c4b..6e1d017 100644 --- a/pylib/gfxprim/core/core.i +++ b/pylib/gfxprim/core/core.i @@ -1,5 +1,5 @@ %include "../common.i" -%module(package="gfxprim.core") core_c +%module(package="gfxprim.core") c_core %{ #include "core/GP_Core.h" diff --git a/pylib/gfxprim/utils.py b/pylib/gfxprim/utils.py index 4d4bd05..32462f1 100644 --- a/pylib/gfxprim/utils.py +++ b/pylib/gfxprim/utils.py @@ -12,6 +12,7 @@ def extend(cls, name=None): return method return decf + def add_swig_getmethod(cls, name=None): "Decorator to add a property get method to a SWIG-defined class" def decf(method): @@ -21,6 +22,7 @@ def add_swig_getmethod(cls, name=None): cls.__swig_getmethods__[propname] = method return decf + def add_swig_setmethod(cls, name=None): "Decorator to add a property set method to a SWIG-defined class" def decf(method): @@ -30,6 +32,7 @@ def add_swig_setmethod(cls, name=None): cls.__swig_setmethods__[propname] = method return decf + def import_members(from_, to, include=[], exclude=[], sub=None): """Import members of `from_` to `to`. By default take all. If `exclude` is provided, use as a filter. If `include` is provided, ONLY include those. diff --git a/pywrap.mk b/pywrap.mk index 03d22cf..d8b18f6 100644 --- a/pywrap.mk +++ b/pywrap.mk @@ -3,9 +3,9 @@ $(error LIBNAME not defined, fix your library Makefile) endif SWIG_SRC=$(LIBNAME).i -SWIG_PY=$(LIBNAME)_c.py SWIG_C=$(LIBNAME)_wrap.c -SWIG_LIB=_$(LIBNAME)_c.so +SWIG_PY=c_$(LIBNAME).py +SWIG_LIB=_c_$(LIBNAME).so ifneq ($(SWIG),) ----------------------------------------------------------------------- Summary of changes: include/core/GP_Common.h | 9 +- libs/core/GP_Common.c | 21 +++- pylib/gfxprim/common.i | 1 + pylib/gfxprim/core/__init__.py | 227 +++++++++++++++++++++++++++++++-- pylib/gfxprim/core/_extend_context.py | 60 --------- pylib/gfxprim/core/core.i | 2 +- pylib/gfxprim/utils.py | 14 ++ pywrap.mk | 4 +- 8 files changed, 258 insertions(+), 80 deletions(-) delete mode 100644 pylib/gfxprim/core/_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: 75d8ed70740c7f15606f382a4bba5cd14a632b24
by metan 21 Dec '12

21 Dec '12

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 75d8ed70740c7f15606f382a4bba5cd14a632b24 (commit) via b2d6a3f08090bcd31e6e648b6a56204b31d89670 (commit) via 0b961e5fe009d0773836956507226444119eb0ec (commit) from 5a09bd55e0ab64565d12d30ef583d9572d66d6be (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/75d8ed70740c7f15606f382a4bba5cd14a63… commit 75d8ed70740c7f15606f382a4bba5cd14a632b24 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Fri Dec 21 00:47:04 2012 +0100 demos: spiv: Add help screen. diff --git a/demos/spiv/spiv.c b/demos/spiv/spiv.c index 25a7d85..cbb77a0 100644 --- a/demos/spiv/spiv.c +++ b/demos/spiv/spiv.c @@ -577,8 +577,51 @@ static void resize_backend(struct loader_params *params, float ratio, int shift_ GP_BackendResize(backend, w, h); } +static const char *keys_help[] = { + "Keyboard control:", + "", + "I - toggle show info box", + "P - toggle show progress", + "R - rotate by 90 degrees", + "] - change to next resampling method", + "[ - change to prev resampling method", + " (current method is shown in info box)", + "L - toggle low pass filter", + "D - drop image cache", + "H - toggle help", + "", + "Esc", + "Enter", + "Q - quit spiv", + "", + "PgDown - move ten image forward", + "PgUp - move ten image backward", + "", + "Right", + "Up", + "Space - move to the next image", + "", + "Left", + "Down", + "BckSpc - move to the prev image", + "", + "1 - resize spiv window to the image size", + "2 - resize spiv window to the half of the image size", + "3 - resize spiv window to the third of the image size", + "...", + "9 - resize spiv window to the ninth of the image size", + "", + "Shift 2 - resize spiv window twice of the image size", + "Shift 3 - resize spiv window three times of the image size", + "...", +}; + +static const int keys_help_len = sizeof(keys_help) / sizeof(char*); + static void print_help(void) { + int i; + printf("Usage: spiv [opts] imagesnn"); printf("-Intshow image info (filename and size)nn"); printf("-Pntshow loading progressnn"); @@ -592,36 +635,10 @@ static void print_help(void) printf("-bntpass backend init string to backend initn"); printf("tpass -b help for more infonn"); - printf("Keyboard control:nn"); - printf("I - toggle show infon"); - printf("P - toggle show progressn"); - printf("R - rotate by 90 degreesn"); - printf("] - change to next resampling methodn"); - printf("[ - change to prev resampling methodn"); - printf(" (current method is shown in infon"); - printf("L - toggle low pass filtern"); - printf("D - drop image cachen"); - printf("nEscn"); - printf("Entern"); - printf("Q - quit spivnn"); - printf("PgDown - move ten image forwardn"); - printf("PgUp - move ten image backwardn"); - printf("nRightn"); - printf("Upn"); - printf("Space - move to the next imagen"); - printf("nLeftn"); - printf("Downn"); - printf("BckSpc - move to the prev imagen"); - printf("n"); - printf("1 - resize spiv window to the image sizen"); - printf("2 - resize spiv window to the half of the image sizen"); - printf("3 - resize spiv window to the third of the image sizen"); - printf("...n"); - printf("9 - resize spiv window to the ninth of the image sizen"); - printf("n"); - printf("Shift 2 - resize spiv window twice of the image sizen"); - printf("Shift 3 - resize spiv window three times of the image sizen"); - printf("...nn"); + for (i = 0; i < keys_help_len; i++) + puts(keys_help[i]); + + puts(""); printf("Some cool options to try:nn"); printf("spiv -e G1 -f imagesn"); @@ -633,13 +650,28 @@ static void print_help(void) } +static void show_help(void) +{ + GP_Context *c = backend->context; + int i; + + GP_Fill(c, black_pixel); + + for (i = 0; i < keys_help_len; i++) { + GP_Print(c, NULL, 20, i * 15, GP_ALIGN_RIGHT|GP_VALIGN_BOTTOM, + white_pixel, black_pixel, "%s", keys_help[i]); + } + + GP_BackendFlip(backend); +} + int main(int argc, char *argv[]) { GP_Context *context = NULL; const char *backend_opts = "X11"; int sleep_sec = -1; int opt, debug_level = 0; - int shift_flag; + int shift_flag, help_flag = 0; GP_PixelType emul_type = GP_PIXEL_UNKNOWN; struct loader_params params = { @@ -749,12 +781,10 @@ int main(int argc, char *argv[]) GP_Event ev; while (GP_EventGet(&ev)) { - - GP_EventDump(&ev); - + shift_flag = GP_EventGetKey(&ev, GP_KEY_LEFT_SHIFT) || GP_EventGetKey(&ev, GP_KEY_RIGHT_SHIFT); - + switch (ev.type) { case GP_EV_REL: switch (ev.code) { @@ -772,6 +802,15 @@ int main(int argc, char *argv[]) continue; switch (ev.val.key.key) { + case GP_KEY_H: + if (help_flag) + show_image(&params, NULL); + else + show_help(); + + //TODO: remove help_flag on any other action done + help_flag = !help_flag; + break; case GP_KEY_F: if (GP_BackendIsX11(backend)) GP_BackendX11RequestFullscreen(backend, 2); http://repo.or.cz/w/gfxprim.git/commit/b2d6a3f08090bcd31e6e648b6a56204b31d8… commit b2d6a3f08090bcd31e6e648b6a56204b31d89670 Merge: 0b961e5 5a09bd5 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Fri Dec 21 00:26:05 2012 +0100 Merge ssh://repo.or.cz/srv/git/gfxprim http://repo.or.cz/w/gfxprim.git/commit/0b961e5fe009d0773836956507226444119e… commit 0b961e5fe009d0773836956507226444119eb0ec Author: Cyril Hrubis <metan(a)ucw.cz> Date: Fri Dec 21 00:16:54 2012 +0100 demos: spiv: Fix crash on empty dir, edhance err message. diff --git a/demos/spiv/image_list.c b/demos/spiv/image_list.c index 8ed726a..1376130 100644 --- a/demos/spiv/image_list.c +++ b/demos/spiv/image_list.c @@ -64,9 +64,11 @@ static int dir_filter(const struct dirent *d) if (!strcmp(d->d_name, "..")) return 0; + //TODO: filter out directories, non-image files? + + GP_DEBUG(4, "Adding file '%s'", d->d_name); - return 1; } @@ -87,11 +89,16 @@ static void try_load_dir(struct image_list *self) int ret = scandir(path, &self->dir_files, dir_filter, dir_cmp); - if (self->max_file == -1) { + if (ret == -1) { GP_WARN("Failed to scandir '%s': %s", path, strerror(errno)); return; } + if (ret == 0) { + GP_DEBUG(1, "There are no files in '%s'", path); + return; + } + self->max_file = ret; self->cur_file = 0; self->in_dir = 1; diff --git a/demos/spiv/spiv.c b/demos/spiv/spiv.c index 82a8e75..25a7d85 100644 --- a/demos/spiv/spiv.c +++ b/demos/spiv/spiv.c @@ -163,7 +163,10 @@ GP_Context *load_image(struct loader_params *params, int elevate) return NULL; GP_Fill(context, black_pixel); - GP_Print(context, NULL, context->w/2, context->h/2, + GP_Print(context, NULL, context->w/2, context->h/2 - 10, + GP_ALIGN_CENTER|GP_VALIGN_CENTER, white_pixel, black_pixel, + "'%s'", params->img_path); + GP_Print(context, NULL, context->w/2, context->h/2 + 10, GP_ALIGN_CENTER|GP_VALIGN_CENTER, white_pixel, black_pixel, "Failed to load image :( (%s)", strerror(errno)); GP_BackendFlip(backend); ----------------------------------------------------------------------- Summary of changes: demos/spiv/image_list.c | 11 ++++- demos/spiv/spiv.c | 114 ++++++++++++++++++++++++++++++++--------------- 2 files changed, 87 insertions(+), 38 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: 5a09bd55e0ab64565d12d30ef583d9572d66d6be
by gavento 21 Dec '12

21 Dec '12

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 5a09bd55e0ab64565d12d30ef583d9572d66d6be (commit) from 61678e75ea1a079599578d9590e50bdd6740def4 (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/5a09bd55e0ab64565d12d30ef583d9572d66… commit 5a09bd55e0ab64565d12d30ef583d9572d66d6be Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Fri Dec 21 00:23:25 2012 +0100 Reformulate part of codegen docs diff --git a/doc/gen.txt b/doc/gen.txt index 949f585..1cdf906 100644 --- a/doc/gen.txt +++ b/doc/gen.txt @@ -24,29 +24,45 @@ class PixelSize(object): self.suffix = suffix - self.bit_endian = bit_endian - - def needs_bit_endian(self): + self.bit_endian = bit_endian ... - + ------------------------------------------------------------------------------- The Pixel Size object represents pixel as a continous block of data. -The 'size' is size in bits and is sometimes called bpp which stands for bits -per pixel. It also contains suffix that is a string used as a suffix for -functions that manipulates with this pixel size. +The 'size' is size in bits and is sometimes called bpp which stands for "bits +per pixel". This number includes padding bits, if any. + +The 'suffix' is a string used as a suffix for functions, macros and other +identifiers that operate with this pixel size. + +The 'bit_endian' determines the ordering of pixel bits within a byte in bitmaps +and graymaps. This is significant in pixel types with pixel boundaries +within a byte, i.e. 1 bpp, 4 bpp or 17 bpp. + +It can be either 'BE' or 'LE' (i.e. most significant bit left or right in the bitmap). +Usually, the bitmap is ordered with left bits earlier in the memory, but the +earlier/later relationship is important. +This is defined in terms of natural pixel ordering within the memory. + +'BE' means that the earlier (usually left-most) pixels use the higher ("big") +bits of the byte. I.e. in 1 bpp, the first pixel would have value 128, the second 64 +and so on. + +'LE' means that the earlier (usually left-most) pixels use the lower ("little") +bits of the byte. I.e. in 1 bpp, the first pixel would have value 1, the second 2, +the eight'th 128 and so on. -The 'bit_endian' determines direction of bits in bitmaps and graymaps (i.e. -most significant bit left or right). It can be either 'BE' or 'LE'. To avoid -confusion following two figures describes bits layout in 1 bit and 2 bits +The following two figures describe bit layout in 1 bpp and 2 bpp grayscale bitmaps. The rectangles in the figures represents bytes as they are -in the buffer. The start of the image (i.e. topleft corner and coodinate 0,0) -is on the left side. The numbers describes position of the bit in the byte (as -seen by shifts and bitmask from within C language implementation). +in the bitmap memory. The start of the image (i.e. topleft corner +and coodinates (0,0)) is on the left side. +The numbers describe position of the bit in the byte, 'i' representing +value '1<<i', that is 7-th bit representing value 128 and 0-th bit value 1. BE -~~ +++ ["graphviz", "bit-endian-be-1bit.png"] ------------------------------------------------------------------------------ @@ -87,7 +103,7 @@ digraph bit_endian { ------------------------------------------------------------------------------ LE -~~ +++ ["graphviz", "bit-endian-le-1bit.png"] ------------------------------------------------------------------------------ @@ -115,9 +131,9 @@ digraph bit_endian { rankdir = LR; node0 [label = "<e> ..."]; - node1 [label = "{0 1 | 2 3 | 4 5 | <e> 6 7}"]; - node2 [label = "{ 0 1 | 2 3 | 4 5 | <e> 6 7}"]; - node3 [label = "{ 0 1 | 2 3 | 4 5 | <e> 6 7}"]; + node1 [label = "{1 0 | 3 2 | 5 4 | <e> 7 6}"]; + node2 [label = "{ 1 0 | 3 2 | 5 4 | <e> 7 6}"]; + node3 [label = "{ 1 0 | 3 2 | 5 4 | <e> 7 6}"]; node4 [label = "{ ...}"]; node0:e -> node1:b; @@ -127,9 +143,10 @@ digraph bit_endian { } ------------------------------------------------------------------------------ -NOTE: Different pixels can share the same pixel size as for certain types - of operations the function doesn't depend on actual arrangements of the - color channels in pixel (i.e. Get/Put Pixel, Rotate buffer 90 degrees, etc...). +NOTE: Different pixel types (i.e. RGB888 and BGR888) can share the same pixel + size, since certain types of operations do not depend on the actual + arrangement of the color channels in a pixel + (i.e. get/put pixel, rotate buffer 90 degrees, etc.). TODO: Rename size to bpp? ----------------------------------------------------------------------- Summary of changes: doc/gen.txt | 59 ++++++++++++++++++++++++++++++++++++++--------------------- 1 files changed, 38 insertions(+), 21 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: 61678e75ea1a079599578d9590e50bdd6740def4
by metan 20 Dec '12

20 Dec '12

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 61678e75ea1a079599578d9590e50bdd6740def4 (commit) from f7a7118fd7ba106dfcc1eb7bbff7aed723f0d6f0 (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/61678e75ea1a079599578d9590e50bdd6740… commit 61678e75ea1a079599578d9590e50bdd6740def4 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Thu Dec 20 17:47:46 2012 +0100 libs: backends: GP_X11: Add XFlush() after BackendUdate(). diff --git a/libs/backends/GP_X11.c b/libs/backends/GP_X11.c index aaa363f..33a0666 100644 --- a/libs/backends/GP_X11.c +++ b/libs/backends/GP_X11.c @@ -129,6 +129,8 @@ static void x11_flip(GP_Backend *self) XPutImage(x11->dpy, x11->win, DefaultGC(x11->dpy, x11->scr), x11->img, 0, 0, 0, 0, w, h); + XFlush(x11->dpy); + XUnlockDisplay(x11->dpy); } ----------------------------------------------------------------------- Summary of changes: libs/backends/GP_X11.c | 2 ++ 1 files changed, 2 insertions(+), 0 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: f7a7118fd7ba106dfcc1eb7bbff7aed723f0d6f0
by metan 20 Dec '12

20 Dec '12

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 f7a7118fd7ba106dfcc1eb7bbff7aed723f0d6f0 (commit) from c7b776f3628256d94d62b176ccf72743f832fa45 (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/f7a7118fd7ba106dfcc1eb7bbff7aed723f0… commit f7a7118fd7ba106dfcc1eb7bbff7aed723f0d6f0 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Thu Dec 20 17:37:14 2012 +0100 doc: Makefile: add check for source-highlight. diff --git a/doc/Makefile b/doc/Makefile index b87a688..7bda21b 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -25,6 +25,8 @@ all: toolcheck examples.html $(PAGES) api.html toolcheck: @if [ -z `which asciidoc 2>/dev/null` ] ; then echo "ERROR: Could not find 'asciidoc'" ; exit 127 ; fi + @if [ -z `which source-highlight 2>/dev/null` ] ; then + echo "ERROR: Could not find 'source-highlight'" ; exit 127 ; fi @if [ ! -d "/usr/share/graphviz" ] ; then echo "ERROR: Could not find 'graphviz'" ; exit 127 ; fi @if [ -z `which latex 2>/dev/null` ] ; then ----------------------------------------------------------------------- Summary of changes: doc/Makefile | 2 ++ 1 files changed, 2 insertions(+), 0 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: c7b776f3628256d94d62b176ccf72743f832fa45
by metan 20 Dec '12

20 Dec '12

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 c7b776f3628256d94d62b176ccf72743f832fa45 (commit) from b91ac3947efd9ef282fb01e5152b3190f5f1352e (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/c7b776f3628256d94d62b176ccf72743f832… commit c7b776f3628256d94d62b176ccf72743f832fa45 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Thu Dec 20 17:30:00 2012 +0100 spiv: Add directory traversal code. diff --git a/demos/spiv/image_list.c b/demos/spiv/image_list.c index 390275f..8ed726a 100644 --- a/demos/spiv/image_list.c +++ b/demos/spiv/image_list.c @@ -20,7 +20,13 @@ * * *****************************************************************************/ +#include <sys/types.h> +#include <sys/stat.h> +#include <unistd.h> +#include <dirent.h> #include <stdlib.h> +#include <errno.h> +#include <string.h> #include <core/GP_Debug.h> @@ -35,29 +41,129 @@ struct image_list { /* path to the currently loaded image */ char path[1024]; int path_loaded:1; + + /* directory handling */ + int in_dir:1; + + int cur_file; + int max_file; + struct dirent **dir_files; }; +static int dir_cmp(const struct dirent **a, const struct dirent **b) +{ + return strcasecmp((*a)->d_name, (*b)->d_name); +} + +static int dir_filter(const struct dirent *d) +{ + /* Ignore some filenames */ + if (!strcmp(d->d_name, ".")) + return 0; + + if (!strcmp(d->d_name, "..")) + return 0; + + GP_DEBUG(4, "Adding file '%s'", d->d_name); + + + return 1; +} + +static void try_load_dir(struct image_list *self) +{ + struct stat sb; + const char *path = self->args[self->cur_arg]; + + if (stat(path, &sb)) { + GP_WARN("Failed to stat '%s': %s", path, strerror(errno)); + return; + } + + if (!(sb.st_mode & S_IFDIR)) + return; + + GP_DEBUG(1, "Loading directory '%s' content.", path); + + int ret = scandir(path, &self->dir_files, dir_filter, dir_cmp); + + if (self->max_file == -1) { + GP_WARN("Failed to scandir '%s': %s", path, strerror(errno)); + return; + } + + self->max_file = ret; + self->cur_file = 0; + self->in_dir = 1; +} + +static void exit_dir(struct image_list *self) +{ + int i; + + GP_DEBUG(1, "Freeing directory '%s' content.", + self->args[self->cur_arg]); + + for (i = 0; i < self->max_file; i++) + free(self->dir_files[i]); + + free(self->dir_files); + + self->in_dir = 0; +} + static void next_img(struct image_list *self) { + if (self->in_dir) { + if (++self->cur_file == self->max_file) { + exit_dir(self); + } else { + self->path_loaded = 0; + return; + } + } + if (++self->cur_arg == self->max_arg) self->cur_arg = 0; + + try_load_dir(self); self->path_loaded = 0; } static void prev_img(struct image_list *self) { + if (self->in_dir) { + if (self->cur_file-- == 0) { + exit_dir(self); + } else { + self->path_loaded = 0; + return; + } + } + if (self->cur_arg == 0) self->cur_arg = self->max_arg - 1; else self->cur_arg--; + try_load_dir(self); + self->path_loaded = 0; } static void load_path(struct image_list *self) { - snprintf(self->path, sizeof(self->path), "%s", self->args[self->cur_arg]); + if (self->in_dir) { + //TODO: eliminate double / + snprintf(self->path, sizeof(self->path), "%s/%s", + self->args[self->cur_arg], + self->dir_files[self->cur_file]->d_name); + + } else { + snprintf(self->path, sizeof(self->path), "%s", + self->args[self->cur_arg]); + } self->path_loaded = 1; } @@ -92,10 +198,15 @@ struct image_list *image_list_create(const char *args[]) self->cur_arg = 0; self->path_loaded = 0; + + self->dir_files = 0; + self->in_dir = 0; self->max_arg = 0; while (args[++self->max_arg] != NULL); + try_load_dir(self); + return self; } ----------------------------------------------------------------------- Summary of changes: demos/spiv/image_list.c | 113 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 112 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: b91ac3947efd9ef282fb01e5152b3190f5f1352e
by metan 20 Dec '12

20 Dec '12

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 b91ac3947efd9ef282fb01e5152b3190f5f1352e (commit) via 208c6b8986ccb87c14f2c2d8eb88eb123d99a22b (commit) via 64d17b5956bac389cd3ea3ca2b56a8b9051f2f9f (commit) from 75c90b1ae9699e0076e8006a9818a076cd345d95 (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/b91ac3947efd9ef282fb01e5152b3190f5f1… commit b91ac3947efd9ef282fb01e5152b3190f5f1352e Author: Cyril Hrubis <metan(a)ucw.cz> Date: Thu Dec 20 17:22:35 2012 +0100 doc: Fix previous changes in Makefile. diff --git a/doc/Makefile b/doc/Makefile index eb86df8..b87a688 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -23,16 +23,12 @@ all: toolcheck examples.html $(PAGES) api.html # Check if we have all the needed tools # toolcheck: - @echo "Checking if documentation tools are present..." @if [ -z `which asciidoc 2>/dev/null` ] ; then - echo "Could not find 'asciidoc'" ; exit 127 ; fi + echo "ERROR: Could not find 'asciidoc'" ; exit 127 ; fi @if [ ! -d "/usr/share/graphviz" ] ; then - echo "Could not find 'graphviz'" ; exit 127 ; fi - @if [ ! -e "/usr/lib/graphviz/python/gv.py" ] ; then - echo "Found 'graphviz' but not Python bindings" ; exit 127 ; fi + echo "ERROR: Could not find 'graphviz'" ; exit 127 ; fi @if [ -z `which latex 2>/dev/null` ] ; then - echo "Could not find 'latex'" ; exit 127 ; fi - @echo " ...seems okay" + echo "ERROR: Could not find 'latex'" ; exit 127 ; fi # # Create page for each part of API description http://repo.or.cz/w/gfxprim.git/commit/208c6b8986ccb87c14f2c2d8eb88eb123d99… commit 208c6b8986ccb87c14f2c2d8eb88eb123d99a22b Merge: 64d17b5 75c90b1 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Thu Dec 20 17:18:32 2012 +0100 Merge ssh://repo.or.cz/srv/git/gfxprim http://repo.or.cz/w/gfxprim.git/commit/64d17b5956bac389cd3ea3ca2b56a8b9051f… commit 64d17b5956bac389cd3ea3ca2b56a8b9051f2f9f Author: Cyril Hrubis <metan(a)ucw.cz> Date: Thu Dec 20 16:19:37 2012 +0100 spiv: Fix debug message in image cache. diff --git a/demos/spiv/image_cache.c b/demos/spiv/image_cache.c index 924c392..00712c9 100644 --- a/demos/spiv/image_cache.c +++ b/demos/spiv/image_cache.c @@ -239,14 +239,14 @@ int image_cache_put(struct image_cache *self, GP_Context *ctx, const char *path, return 1; } - GP_DEBUG(2, "Adding image '%s:%10li:%10li' size %zu", - img->path, img->cookie1, img->cookie2, size); - img->ctx = ctx; img->cookie1 = cookie1; img->cookie2 = cookie2; img->elevated = 0; strcpy(img->path, path); + + GP_DEBUG(2, "Adding image '%s:%10li:%10li' size %zu", + img->path, img->cookie1, img->cookie2, size); add_img(self, img, size); ----------------------------------------------------------------------- Summary of changes: demos/spiv/image_cache.c | 6 +++--- doc/Makefile | 10 +++------- 2 files changed, 6 insertions(+), 10 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: 75c90b1ae9699e0076e8006a9818a076cd345d95
by bluebear 20 Dec '12

20 Dec '12

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 75c90b1ae9699e0076e8006a9818a076cd345d95 (commit) from 94726f09c80a120c03ee251338f2a2800bdaa076 (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/75c90b1ae9699e0076e8006a9818a076cd34… commit 75c90b1ae9699e0076e8006a9818a076cd345d95 Author: Jiri BlueBear Dluhos <jiri.bluebear.dluhos(a)gmail.com> Date: Thu Dec 20 17:17:19 2012 +0100 'make doc' checks for necessary tools. diff --git a/doc/Makefile b/doc/Makefile index eef29cd..eb86df8 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -15,7 +15,24 @@ GENIMAGES=discrete_linear_1D_convolution_alg1 discrete_linear_1D_convolution_alg PAGES=$(subst .txt,.html,$(SOURCES)) PAGES+=$(subst .txt,.html,$(EXAMPLE_SOURCES)) -all: examples.html $(PAGES) api.html +.PHONY: toolcheck clean + +all: toolcheck examples.html $(PAGES) api.html + +# +# Check if we have all the needed tools +# +toolcheck: + @echo "Checking if documentation tools are present..." + @if [ -z `which asciidoc 2>/dev/null` ] ; then + echo "Could not find 'asciidoc'" ; exit 127 ; fi + @if [ ! -d "/usr/share/graphviz" ] ; then + echo "Could not find 'graphviz'" ; exit 127 ; fi + @if [ ! -e "/usr/lib/graphviz/python/gv.py" ] ; then + echo "Found 'graphviz' but not Python bindings" ; exit 127 ; fi + @if [ -z `which latex 2>/dev/null` ] ; then + echo "Could not find 'latex'" ; exit 127 ; fi + @echo " ...seems okay" # # Create page for each part of API description ----------------------------------------------------------------------- Summary of changes: doc/Makefile | 19 ++++++++++++++++++- 1 files changed, 18 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