December 2012 - Gfxprim

[repo.or.cz] gfxprim.git branch master updated: 08e5a448761d5d3b25abcf1d42967458e8cdfa62
by metan 25 Dec '12

25 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 08e5a448761d5d3b25abcf1d42967458e8cdfa62 (commit) via 8112b2d6aa79952028fc73c6d3a831878804d84b (commit) via f0949124262c1ba843c8abe8bc85f3e21703c16a (commit) from 0d0f7852bb88e81f1e248e9776022232454d218e (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/08e5a448761d5d3b25abcf1d42967458e8cd… commit 08e5a448761d5d3b25abcf1d42967458e8cdfa62 Merge: 8112b2d 0d0f785 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Tue Dec 25 02:38:34 2012 +0100 Merge ssh://repo.or.cz/srv/git/gfxprim http://repo.or.cz/w/gfxprim.git/commit/8112b2d6aa79952028fc73c6d3a831878804… commit 8112b2d6aa79952028fc73c6d3a831878804d84b Author: Cyril Hrubis <metan(a)ucw.cz> Date: Tue Dec 25 02:38:03 2012 +0100 build: syms: Update lists of exported symbols. diff --git a/build/syms/Backend_symbols.txt b/build/syms/Backend_symbols.txt index abcd681..580f390 100644 --- a/build/syms/Backend_symbols.txt +++ b/build/syms/Backend_symbols.txt @@ -1,7 +1,13 @@ GP_BackendInit + GP_BackendLinuxFBInit + GP_BackendVirtualInit + GP_BackendX11Init +GP_BackendIsX11 +GP_BackendX11RequestFullscreen + GP_BackendSDLInit GP_ContextFromSurface diff --git a/build/syms/Core_symbols.txt b/build/syms/Core_symbols.txt index 5033860..3de2293 100644 --- a/build/syms/Core_symbols.txt +++ b/build/syms/Core_symbols.txt @@ -22,6 +22,8 @@ GP_DebugPrint GP_SetDebugLevel GP_GetDebugLevel +GP_PrintAbortInfo + GP_ColorToPixel GP_ColorLoadPixels GP_RGBA8888ToPixel http://repo.or.cz/w/gfxprim.git/commit/f0949124262c1ba843c8abe8bc85f3e21703… commit f0949124262c1ba843c8abe8bc85f3e21703c16a Author: Cyril Hrubis <metan(a)ucw.cz> Date: Tue Dec 25 02:37:14 2012 +0100 core: GP_Common: Make local functions static. diff --git a/libs/core/GP_Common.c b/libs/core/GP_Common.c index 52c4920..ae1365e 100644 --- a/libs/core/GP_Common.c +++ b/libs/core/GP_Common.c @@ -16,7 +16,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, * * Boston, MA 02110-1301 USA * * * - * Copyright (C) 2011 Tomas Gavenciak <gavento(a)ucw.cz> * + * Copyright (C) 2011-2012 Tomas Gavenciak <gavento(a)ucw.cz> * + * Copyright (C) 2012 Cyril Hrubis <metan(a)ucw.cz> * * * *****************************************************************************/ @@ -39,7 +40,7 @@ #define GP_ABORT_INFO_TRACE_LEVELS 20 -void GP_PrintCStack(void) +static void print_c_stack(void) { #ifdef HAVE_BACKTRACE #if GP_ABORT_INFO_TRACE_LEVELS > 0 @@ -52,7 +53,7 @@ void GP_PrintCStack(void) #endif /* HAVE_BACKTRACE */ } -void GP_PrintPythonStack(void) +static void print_python_stack(void) { #ifdef HAVE_DL /* Print python stack trace in case python lib is loaded and @@ -65,13 +66,13 @@ void GP_PrintPythonStack(void) 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(); + print_python_stack(); + print_c_stack(); } ----------------------------------------------------------------------- Summary of changes: build/syms/Backend_symbols.txt | 6 ++++++ build/syms/Core_symbols.txt | 2 ++ libs/core/GP_Common.c | 13 +++++++------ 3 files changed, 15 insertions(+), 6 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: 0d0f7852bb88e81f1e248e9776022232454d218e
by gavento 25 Dec '12

25 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 0d0f7852bb88e81f1e248e9776022232454d218e (commit) via 324bfb6f6762369f769774df7765f871330d262e (commit) via 9fd530170199db0cf53d4d4b7223f07b44c2554d (commit) via fb131160d2f7320ef2998d1165dab70a6ac2f97e (commit) via f5cecdf0ef17c206a2481873bedcb2b6178ccefa (commit) from 77ca5e065797236b928b1ee5a3e869c564620191 (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/0d0f7852bb88e81f1e248e9776022232454d… commit 0d0f7852bb88e81f1e248e9776022232454d218e Merge: 324bfb6 77ca5e0 Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Tue Dec 25 02:18:26 2012 +0100 Merge branch 'master' of ssh://repo.or.cz/srv/git/gfxprim http://repo.or.cz/w/gfxprim.git/commit/324bfb6f6762369f769774df7765f871330d… commit 324bfb6f6762369f769774df7765f871330d262e Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Tue Dec 25 02:15:22 2012 +0100 core: pylib: Cleanup of gfxprim.core and imports diff --git a/pylib/gfxprim/core/__init__.py b/pylib/gfxprim/core/__init__.py index 4e90c66..a4301f5 100644 --- a/pylib/gfxprim/core/__init__.py +++ b/pylib/gfxprim/core/__init__.py @@ -55,7 +55,6 @@ def _init(module): c.parent = None return c - extend_direct @extend(_context) def SubContext(self, x, y, w, h): "Create a subcontext (a rectangular view)." @@ -162,112 +161,15 @@ def _init(module): # Bulk import of functions import_members(c_core, module, sub=strip_GP, - exclude=const_regexes + [ - '^GP_Blitw+$', - '^GP_Contextw+$', - '^GP_PixelSNPrintw+$', - '^GP_WritePixelsw+$', - '.*_Raw.*', - '^w+_swigregister$', - '^cvar$', - '^_w+$']) + include=[ + '^GP_Color.*$', # Might use trimming + '^GP_[GS]etDebugLevel$', + '^GP_PixelRGB.*$', # ...Lookup and ...Match + '^GP_PixelToRGB.*$', # Needs love + '^GP_RGB.*$', # Needs filtering + #'^GP_ProgressCallback.*$', # Needs work + ]) _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 - FIX - -! IN Context class - -GP_ContextAlloc C -GP_ContextResize C -GP_ContextConvertAlloc C -GP_ContextPrintInfo N -GP_ContextRotateCCW C -GP_SubContextAlloc C -GP_ContextConvert N -GP_ContextRotateCW C -GP_ContextFree Ci -GP_ContextInit N -GP_SubContext N -GP_ContextCopy C -GP_PixelAddrOffset N - -! ? - -# GP_GammaRelease -# GP_GammaCopy -# GP_GammaAcquire - -! ? - -# GP_DebugPrint -# GP_SetDebugLevel -# GP_GetDebugLevel - -! Color conversion - -GP_RGBA8888ToPixel N -GP_RGB888ToPixel N -GP_PixelToRGB888 -GP_PixelToRGBA8888 -GP_ColorNameToPixel -GP_ColorToPixel - -GP_PixelTypeByName - reimplement - -# 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 C -GP_GetPixel C - -! ? - -# GP_NrThreads -# GP_NrThreadsSet -# GP_ProgressCallbackMP -# SWIG_exception -""" - http://repo.or.cz/w/gfxprim.git/commit/9fd530170199db0cf53d4d4b7223f07b44c2… commit 9fd530170199db0cf53d4d4b7223f07b44c2554d Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Tue Dec 25 02:14:38 2012 +0100 core: pylib: GP_PixelTypes related access diff --git a/pylib/gfxprim/core/__init__.py b/pylib/gfxprim/core/__init__.py index cc4577d..4e90c66 100644 --- a/pylib/gfxprim/core/__init__.py +++ b/pylib/gfxprim/core/__init__.py @@ -149,7 +149,18 @@ def _init(module): # every Context also points to C for convenience extend(_context, name='C')(C) - # Bulk import of functions - TODO: only import specified + # Arrays with pixel type info + module['PixelTypes'] = [c_core.GP_PixelTypes_access(i) + for i in range(C.PIXEL_MAX)] + + module['PixelTypesDict'] = dict(((t.name, t) for t in module['PixelTypes'])) + + def PixelTypeByName(name): + "Return a PixelType descriptor by name, raise KeyError if no such type exists." + return module['PixelTypesDict'][name] + module['PixelTypeByName'] = PixelTypeByName + + # Bulk import of functions import_members(c_core, module, sub=strip_GP, exclude=const_regexes + [ '^GP_Blitw+$', diff --git a/pylib/gfxprim/core/core.i b/pylib/gfxprim/core/core.i index 6e1d017..c59ae6c 100644 --- a/pylib/gfxprim/core/core.i +++ b/pylib/gfxprim/core/core.i @@ -35,6 +35,14 @@ ERROR_ON_NULL(GP_ColorToColorName); %import "GP_FnPerBpp.h" %import "GP_FnPerBpp.gen.h" +%inline %{ +const GP_PixelTypeDescription *GP_PixelTypes_access(GP_PixelType no) +{ + if (no < 0 || no >= GP_PIXEL_MAX) no = GP_PIXEL_UNKNOWN; + return &GP_PixelTypes[no]; +} +%} + /* * GP_Context wrapping */ http://repo.or.cz/w/gfxprim.git/commit/fb131160d2f7320ef2998d1165dab70a6ac2… commit fb131160d2f7320ef2998d1165dab70a6ac2f97e Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Tue Dec 25 01:40:24 2012 +0100 core: Explicit size of GP_PixelTypes diff --git a/include/core/GP_Pixel.h b/include/core/GP_Pixel.h index f40c8a6..d058ab3 100644 --- a/include/core/GP_Pixel.h +++ b/include/core/GP_Pixel.h @@ -114,7 +114,7 @@ typedef struct { /* * Array of size GP_PIXEL_MAX describing known pixel types */ -extern const GP_PixelTypeDescription const GP_PixelTypes[]; +extern const GP_PixelTypeDescription const GP_PixelTypes[GP_PIXEL_MAX]; #define GP_CHECK_VALID_PIXELTYPE(type) GP_CHECK(((type) > 0) && ((type) < GP_PIXEL_MAX), "Invalid PixelType %d", (type)) diff --git a/libs/core/GP_Pixel.gen.c.t b/libs/core/GP_Pixel.gen.c.t index f41625b..8374856 100644 --- a/libs/core/GP_Pixel.gen.c.t +++ b/libs/core/GP_Pixel.gen.c.t @@ -2,7 +2,6 @@ %% block descr Pixel type definitions and functions -Do not include directly, use GP_Pixel.h %% endblock %% block body @@ -13,7 +12,7 @@ Do not include directly, use GP_Pixel.h /* * Description of all known pixel types */ -const GP_PixelTypeDescription const GP_PixelTypes [] = { +const GP_PixelTypeDescription const GP_PixelTypes [GP_PIXEL_MAX] = { %% for pt in pixeltypes /* GP_PIXEL_{{ pt.name }} */ { .type = GP_PIXEL_{{ pt.name }}, http://repo.or.cz/w/gfxprim.git/commit/f5cecdf0ef17c206a2481873bedcb2b6178c… commit f5cecdf0ef17c206a2481873bedcb2b6178ccefa Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Tue Dec 25 01:39:30 2012 +0100 core: pylib: Pythonic Context.Blit diff --git a/pylib/gfxprim/core/__init__.py b/pylib/gfxprim/core/__init__.py index 3bf8d08..cc4577d 100644 --- a/pylib/gfxprim/core/__init__.py +++ b/pylib/gfxprim/core/__init__.py @@ -91,6 +91,26 @@ def _init(module): extend_direct(_context, "Resize", c_core.GP_ContextResize, "Resize the context bitmap (reallocate). Fails on subcontexts.") + # Blit + + @extend(_context) + def Blit(self, sx, sy, target, tx, ty, w=None, h=None, sx2=None, sy2=None, + tx2=None, ty2=None): + """Copy a rectangle from self to target. (sx,sy) and (tx,ty) define + upper-left corners, rectangle size is given by (width, height), lower-right + corner in source or lower-right corner in the target. Clipped.""" + assert sum([w is not None, sx2 is not None, tx2 is not None]) == 1 + assert sum([h is not None, sy2 is not None, ty2 is not None]) == 1 + if sx2 is not None: + w = max(0, sx2 - sx) + if tx2 is not None: + w = max(0, tx2 - tx) + if sy2 is not None: + h = max(0, sy2 - sy) + if ty2 is not None: + h = max(0, ty2 - ty) + return c_core.GP_BlitXYWH_Clipped(self, sx, sy, target, tx, ty, w, h) + # Color conversions @extend(_context) @@ -163,7 +183,7 @@ GP_ContextConvertAlloc C GP_ContextPrintInfo N GP_ContextRotateCCW C GP_SubContextAlloc C -GP_ContextConvert C +GP_ContextConvert N GP_ContextRotateCW C GP_ContextFree Ci GP_ContextInit N @@ -190,10 +210,10 @@ GP_RGB888ToPixel N GP_PixelToRGB888 GP_PixelToRGBA8888 GP_ColorNameToPixel +GP_ColorToPixel GP_PixelTypeByName - reimplement -# GP_ColorToPixel # GP_PixelRGBMatch # GP_ColorLoadPixels # GP_PixelRGBLookup ----------------------------------------------------------------------- Summary of changes: include/core/GP_Pixel.h | 2 +- libs/core/GP_Pixel.gen.c.t | 3 +- pylib/gfxprim/core/__init__.py | 147 +++++++++++----------------------------- pylib/gfxprim/core/core.i | 8 ++ 4 files changed, 50 insertions(+), 110 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: 77ca5e065797236b928b1ee5a3e869c564620191
by metan 25 Dec '12

25 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 77ca5e065797236b928b1ee5a3e869c564620191 (commit) via e8c9a59408d797c9f58085f0656450d4993005cc (commit) from 33b95fd86ead735cd54f3b0f7cf87c779a4370ad (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/77ca5e065797236b928b1ee5a3e869c56462… commit 77ca5e065797236b928b1ee5a3e869c564620191 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Tue Dec 25 02:17:09 2012 +0100 gfx: VLine: Fix the VLine implementation. diff --git a/build/syms/GFX_symbols.txt b/build/syms/GFX_symbols.txt index c8482d3..d6ed889 100644 --- a/build/syms/GFX_symbols.txt +++ b/build/syms/GFX_symbols.txt @@ -5,37 +5,21 @@ GP_HLine_Raw_32BPP GP_LineAA GP_Line_Raw_32BPP GP_HLineXYW_Raw -GP_VLine_18BPP_LE -GP_VLine_8BPP -GP_VLine_1BPP_LE GP_HLine_Raw_8BPP -GP_VLineAA GP_HLineAA -GP_VLine_4BPP_BE GP_HLineXYW -GP_VLineAA_Raw -GP_VLine_16BPP GP_HLine_Raw_1BPP_LE -GP_VLine_2BPP_LE -GP_VLine_24BPP GP_HLine_Raw_4BPP_BE GP_HLine_Raw_2BPP_BE GP_HLine_Raw_24BPP GP_Line_Raw_24BPP GP_Line_Raw_1BPP_BE -GP_VLineXYH_Raw -GP_VLine_4BPP_LE -GP_VLine_32BPP GP_HLineXXY GP_HLine_Raw_4BPP_LE GP_Line_Raw_18BPP_LE GP_Line_Raw_1BPP_LE -GP_VLineXYY_Raw GP_Line_Raw_4BPP_BE -GP_VLineXYY -GP_VLineXYH GP_HLineXXY_Raw -GP_VLine_2BPP_BE GP_HLine_Raw_1BPP_BE GP_Line GP_Line_Raw_8BPP @@ -46,7 +30,24 @@ GP_Line_Raw_16BPP GP_HLine_Raw_2BPP_LE GP_HLine_Raw_16BPP GP_LineAA_Raw -GP_VLine_1BPP_BE + +GP_VLineXYY_Raw +GP_VLineAA +GP_VLineAA_Raw +GP_VLineXYH_Raw +GP_VLineXYY +GP_VLineXYH +GP_VLine_Raw_16BPP +GP_VLine_Raw_1BPP_LE +GP_VLine_Raw_18BPP_LE +GP_VLine_Raw_2BPP_BE +GP_VLine_Raw_4BPP_BE +GP_VLine_Raw_8BPP +GP_VLine_Raw_2BPP_LE +GP_VLine_Raw_32BPP +GP_VLine_Raw_4BPP_LE +GP_VLine_Raw_24BPP +GP_VLine_Raw_1BPP_BE GP_Circle GP_Circle_Raw @@ -112,3 +113,4 @@ GP_FillRectXYWH_AA_Raw GP_AngleInRange GP_NormalizeAngle + diff --git a/include/Makefile b/include/Makefile index f098ae0..f41af14 100644 --- a/include/Makefile +++ b/include/Makefile @@ -1,3 +1,3 @@ TOPDIR=.. -SUBDIRS=core +SUBDIRS=core gfx include $(TOPDIR)/post.mk diff --git a/include/gfx/GP_VLine.gen.h.t b/include/gfx/GP_VLine.gen.h.t new file mode 100644 index 0000000..296e69a --- /dev/null +++ b/include/gfx/GP_VLine.gen.h.t @@ -0,0 +1,35 @@ +/***************************************************************************** + * 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-2012 Cyril Hrubis <metan(a)ucw.cz> * + * * + *****************************************************************************/ + +%% extends 'base.h.t' + +{% block description %}VLine generated header{% endblock %} + +{% block body %} + +%% for ps in pixelsizes +void GP_VLine_Raw_{{ ps.suffix }}(GP_Context *context, GP_Coord x, + GP_Coord y0, GP_Coord y1, GP_Pixel pixel); + +%% endfor + +{% endblock body %} diff --git a/include/gfx/GP_VLine.h b/include/gfx/GP_VLine.h index a070f53..269d57a 100644 --- a/include/gfx/GP_VLine.h +++ b/include/gfx/GP_VLine.h @@ -19,49 +19,17 @@ * Copyright (C) 2009-2011 Jiri "BlueBear" Dluhos * * <jiri.bluebear.dluhos(a)gmail.com> * * * - * Copyright (C) 2009-2011 Cyril Hrubis <metan(a)ucw.cz> * + * Copyright (C) 2009-2012 Cyril Hrubis <metan(a)ucw.cz> * * * *****************************************************************************/ -#ifndef GP_VLINE_H -#define GP_VLINE_H +#ifndef GFX_GP_VLINE_H +#define GFX_GP_VLINE_H #include "core/GP_Context.h" /* Raw per BPP HLines */ - -void GP_VLine_Raw_1BPP_LE(GP_Context *context, GP_Coord x0, GP_Coord x1, - GP_Coord y, GP_Pixel pixel); - -void GP_VLine_Raw_1BPP_BE(GP_Context *context, GP_Coord x0, GP_Coord x1, - GP_Coord y, GP_Pixel pixel); - -void GP_VLine_Raw_2BPP_LE(GP_Context *context, GP_Coord x0, GP_Coord x1, - GP_Coord y, GP_Pixel pixel); - -void GP_VLine_Raw_2BPP_BE(GP_Context *context, GP_Coord x0, GP_Coord x1, - GP_Coord y, GP_Pixel pixel); - -void GP_VLine_Raw_4BPP_LE(GP_Context *context, GP_Coord x0, GP_Coord x1, - GP_Coord y, GP_Pixel pixel); - -void GP_VLine_Raw_4BPP_BE(GP_Context *context, GP_Coord x0, GP_Coord x1, - GP_Coord y, GP_Pixel pixel); - -void GP_VLine_Raw_8BPP(GP_Context *context, GP_Coord x0, GP_Coord x1, - GP_Coord y, GP_Pixel pixel); - -void GP_VLine_Raw_18BPP_LE(GP_Context *context, GP_Coord x0, GP_Coord x1, - GP_Coord y, GP_Pixel pixel); - -void GP_VLine_Raw_16BPP(GP_Context *context, GP_Coord x0, GP_Coord x1, - GP_Coord y, GP_Pixel pixel); - -void GP_VLine_Raw_24BPP(GP_Context *context, GP_Coord x0, GP_Coord x1, - GP_Coord y, GP_Pixel pixel); - -void GP_VLine_Raw_32BPP(GP_Context *context, GP_Coord x0, GP_Coord x1, - GP_Coord y, GP_Pixel pixel); +#include "gfx/GP_VLine.gen.h" void GP_VLineXYY(GP_Context *context, GP_Coord x, GP_Coord y0, GP_Coord y1, GP_Pixel pixel); @@ -88,4 +56,4 @@ static inline void GP_VLine_Raw(GP_Context *context, GP_Coord x, GP_VLineXYY_Raw(context, x, y0, y1, pixel); } -#endif /* GP_VLINE_H */ +#endif /* GFX_GP_VLINE_H */ diff --git a/include/gfx/Makefile b/include/gfx/Makefile new file mode 100644 index 0000000..7548d55 --- /dev/null +++ b/include/gfx/Makefile @@ -0,0 +1,8 @@ +TOPDIR=../.. + +include $(TOPDIR)/pre.mk + +GENHEADERS=GP_VLine.gen.h + +include $(TOPDIR)/gen.mk +include $(TOPDIR)/post.mk diff --git a/libs/gfx/GP_VLine.c b/libs/gfx/GP_VLine.c index 910033d..08d075c 100644 --- a/libs/gfx/GP_VLine.c +++ b/libs/gfx/GP_VLine.c @@ -23,23 +23,35 @@ * * *****************************************************************************/ +#include "core/GP_Common.h" #include "core/GP_GetPutPixel.h" #include "core/GP_FnPerBpp.h" #include "gfx/GP_VLine.h" #include "gfx/GP_HLine.h" -#include "algo/VLine.algo.h" - -/* Generate drawing functions for various bit depths. */ -GP_DEF_DRAW_FN_PER_BPP(GP_VLine, DEF_VLINE_FN) +/* + * Ensures that coordinates are in correct order, and clips them. + * Exits immediately if the line is completely clipped out. + */ +#define ORDER_AND_CLIP_COORDS do { + if (y0 > y1) + GP_SWAP(y0, y1); + if (x < 0 || x >= (int) context->w || + y1 < 0 || y0 >= (int) context->h) + return; + y0 = GP_MAX(y0, 0); + y1 = GP_MIN(y1, (int) context->h - 1); +} while (0) void GP_VLineXYY_Raw(GP_Context *context, GP_Coord x, GP_Coord y0, GP_Coord y1, GP_Pixel pixel) { GP_CHECK_CONTEXT(context); + + ORDER_AND_CLIP_COORDS; - GP_FN_PER_BPP_CONTEXT(GP_VLine, context, context, x, y0, y1, pixel); + GP_FN_PER_BPP_CONTEXT(GP_VLine_Raw, context, context, x, y0, y1, pixel); } void GP_VLineXYH_Raw(GP_Context *context, GP_Coord x, GP_Coord y, GP_Size h, diff --git a/libs/gfx/GP_VLine.gen.c.t b/libs/gfx/GP_VLine.gen.c.t new file mode 100644 index 0000000..8700d8f --- /dev/null +++ b/libs/gfx/GP_VLine.gen.c.t @@ -0,0 +1,44 @@ +/***************************************************************************** + * 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-2012 Cyril Hrubis <metan(a)ucw.cz> * + * * + *****************************************************************************/ + +%% extends 'base.h.t' + +{% block description %}Vertical Line{% endblock %} + +{% block body %} + +#include "core/GP_GetPutPixel.h" +#include "gfx/GP_VLine.gen.h" + +%% for ps in pixelsizes +void GP_VLine_Raw_{{ ps.suffix }}(GP_Context *context, GP_Coord x, + GP_Coord y0, GP_Coord y1, GP_Pixel pixel) +{ + int y; + + for (y = y0; y <= y1; y++) + GP_PutPixel_Raw_{{ ps.suffix }}(context, x, y, pixel); +} + +%% endfor + +{% endblock body %} diff --git a/libs/gfx/Makefile b/libs/gfx/Makefile index d80e49a..e46a8ef 100644 --- a/libs/gfx/Makefile +++ b/libs/gfx/Makefile @@ -1,7 +1,7 @@ TOPDIR=../.. CSOURCES=$(filter-out $(wildcard *.gen.c),$(wildcard *.c)) GENSOURCES=GP_Line.gen.c GP_HLine.gen.c GP_LineAA.gen.c GP_PutPixelAA.gen.c - GP_HLineAA.gen.c GP_VLineAA.gen.c GP_FillCircle.gen.c + GP_HLineAA.gen.c GP_VLineAA.gen.c GP_FillCircle.gen.c GP_VLine.gen.c LIBNAME=gfx include $(TOPDIR)/pre.mk diff --git a/libs/gfx/algo/VLine.algo.h b/libs/gfx/algo/VLine.algo.h deleted file mode 100644 index b33a448..0000000 --- a/libs/gfx/algo/VLine.algo.h +++ /dev/null @@ -1,60 +0,0 @@ -/***************************************************************************** - * 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-2011 Jiri "BlueBear" Dluhos * - * <jiri.bluebear.dluhos(a)gmail.com> * - * * - * Copyright (C) 2009-2011 Cyril Hrubis <metan(a)ucw.cz> * - * * - *****************************************************************************/ - -/* A vertical line drawing algorithm. */ - -/* Ensures that coordinates are in correct order, and clips them. - * Exits immediately if the line is completely clipped out. - */ -#define ORDER_AND_CLIP_COORDS do { - if (y0 > y1) - GP_SWAP(y0, y1); - if (x < 0 || x >= (int) context->w || - y1 < 0 || y0 >= (int) context->h) - return; - y0 = GP_MAX(y0, 0); - y1 = GP_MIN(y1, (int) context->h - 1); -} while (0) - -/* - * This macro defines a horizontal line drawing function. - * Arguments: - * CONTEXT_T - user-defined type of drawing context (passed to PUTPIXEL) - * PIXVAL_T - user-defined pixel value type (passed to PUTPIXEL) - * PIXEL_ADDRESS - a function that returns a pointer to a pixel in memory, - * in form f(context, y, x) - * WRITE_PIXELS - a function that fills a linear block with pixel value, - * in form f(start, length, pixel) - * FN_NAME - name of the function to be defined - */ -#define DEF_VLINE_FN(FN_NAME, CONTEXT_T, PIXEL_T, PUT_PIXEL) -void FN_NAME(CONTEXT_T context, int x, int y0, int y1, PIXEL_T pixel) -{ - ORDER_AND_CLIP_COORDS; - int y; -- for (y = y0; y <= y1; y++) - PUT_PIXEL(context, x, y, pixel); -} http://repo.or.cz/w/gfxprim.git/commit/e8c9a59408d797c9f58085f0656450d49930… commit e8c9a59408d797c9f58085f0656450d4993005cc Author: Cyril Hrubis <metan(a)ucw.cz> Date: Tue Dec 25 01:23:10 2012 +0100 core: WritePixel: Small cleanup first. diff --git a/include/core/GP_Pixel.h b/include/core/GP_Pixel.h index f40c8a6..3b9d254 100644 --- a/include/core/GP_Pixel.h +++ b/include/core/GP_Pixel.h @@ -61,7 +61,6 @@ typedef uint32_t GP_Pixel; * Information about ordering of pixels in byte for 1, 2 and 4 bpp * used in a one bit variable in GP_Context */ - typedef enum { /* less significant bits contain pixels with lower indices */ /* also used for irrelevant bit-endian */ @@ -80,7 +79,6 @@ typedef enum { * A - opacity (0=transparent) * P - palette (index) */ - typedef struct { char name[8]; /* Channel name */ uint8_t offset; /* Offset in bits */ @@ -90,7 +88,6 @@ typedef struct { /* * Maximum number of channels in a PixelType */ - #define GP_PIXELTYPE_MAX_CHANNELS 8 /* @@ -98,7 +95,6 @@ typedef struct { * Assumes name with at most 15 chars * Assumes at most 8 channels */ - typedef struct { GP_PixelType type; /* Number of the type */ const char name[16]; /* Name */ diff --git a/include/core/GP_WritePixel.h b/include/core/GP_WritePixel.h index d9530f9..bb79b1f 100644 --- a/include/core/GP_WritePixel.h +++ b/include/core/GP_WritePixel.h @@ -16,15 +16,15 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, * * Boston, MA 02110-1301 USA * * * - * Copyright (C) 2009-2010 Jiri "BlueBear" Dluhos * + * Copyright (C) 2009-2012 Jiri "BlueBear" Dluhos * * <jiri.bluebear.dluhos(a)gmail.com> * * * * Copyright (C) 2009-2012 Cyril Hrubis <metan(a)ucw.cz> * * * *****************************************************************************/ -#ifndef GP_WRITEPIXEL_H -#define GP_WRITEPIXEL_H +#ifndef CORE_GP_WRITEPIXEL_H +#define CORE_GP_WRITEPIXEL_H #include <stdint.h> #include <unistd.h> @@ -52,10 +52,20 @@ void GP_WritePixels_4BPP_LE(uint8_t *start, uint8_t off, /* * These calls are not byte aligned, thus need start offset. */ -void GP_WritePixels_1BPP_BE(uint8_t *start, uint8_t off, size_t cnt, uint8_t val); -void GP_WritePixels_2BPP_BE(uint8_t *start, uint8_t off, size_t cnt, uint8_t val); -void GP_WritePixels_4BPP_BE(uint8_t *start, uint8_t off, size_t cnt, uint8_t val); -void GP_WritePixels_18BPP_BE(void *start, uint8_t off, size_t count, uint32_t value); +void GP_WritePixels_1BPP_BE(uint8_t *start, uint8_t off, + size_t cnt, uint8_t val); + +void GP_WritePixels_2BPP_BE(uint8_t *start, uint8_t off, + size_t cnt, uint8_t val); + +void GP_WritePixels_4BPP_BE(uint8_t *start, uint8_t off, + size_t cnt, uint8_t val); + +void GP_WritePixels_18BPP_BE(void *start, uint8_t off, + size_t count, uint32_t value); + +void GP_WritePixels_18BPP_LE(void *start, uint8_t off, + size_t count, uint32_t value); /* Byte-aligned calls. */ void GP_WritePixels_8BPP(void *start, size_t count, uint8_t value); @@ -63,14 +73,4 @@ void GP_WritePixels_16BPP(void *start, size_t count, uint16_t value); void GP_WritePixels_24BPP(void *start, size_t count, uint32_t value); void GP_WritePixels_32BPP(void *start, size_t count, uint32_t value); -/* aliases for older names */ -#define GP_WritePixels1bpp GP_WritePixels_1BPP_BE -#define GP_WritePixels2bpp GP_WritePixels_2BPP_BE -#define GP_WritePixels4bpp GP_WritePixels_4BPP_BE -#define GP_WritePixels18bpp GP_WritePixels_18BPP_BE -#define GP_WritePixels8bpp GP_WritePixels_8BPP -#define GP_WritePixels16bpp GP_WritePixels_16BPP -#define GP_WritePixels24bpp GP_WritePixels_24BPP -#define GP_WritePixels32bpp GP_WritePixels_32BPP - -#endif /* GP_WRITEPIXEL_H */ +#endif /* CORE_GP_WRITEPIXEL_H */ diff --git a/tests/core/WritePixel_testsuite.gen.c.t b/tests/core/WritePixel_testsuite.gen.c.t index df49d2d..0807e0f 100644 --- a/tests/core/WritePixel_testsuite.gen.c.t +++ b/tests/core/WritePixel_testsuite.gen.c.t @@ -93,7 +93,7 @@ static int WritePixel{{ "_%i_%i_%i_%i"|format(pixelsize, offset, len, aligment) %% endfor %% endfor - GP_WritePixels{{ pixelsize }}bpp(write_buf + {{aligment + offset * pixelsize//8}}, {{ len }}, 0xffffffff>>{{32 - pixelsize}}); + GP_WritePixels_{{ pixelsize }}BPP(write_buf + {{aligment + offset * pixelsize//8}}, {{ len }}, 0xffffffff>>{{32 - pixelsize}}); COMPARE_BUFFERS({{""p=%i o=%i l=%i a=%i""|format(pixelsize, offset, len, aligment)}}, write_buf, gen_buf); } ----------------------------------------------------------------------- Summary of changes: build/syms/GFX_symbols.txt | 36 ++++++------ include/Makefile | 2 +- include/core/GP_Pixel.h | 4 - include/core/GP_WritePixel.h | 36 ++++++------ .../GP_InputDriverX11.h => gfx/GP_VLine.gen.h.t} | 20 +++---- include/gfx/GP_VLine.h | 42 ++------------ include/gfx/Makefile | 8 +++ libs/gfx/GP_VLine.c | 22 ++++++-- .../gfx/GP_VLine.gen.c.t | 24 +++++--- libs/gfx/Makefile | 2 +- libs/gfx/algo/VLine.algo.h | 60 -------------------- tests/core/WritePixel_testsuite.gen.c.t | 2 +- 12 files changed, 94 insertions(+), 164 deletions(-) copy include/{input/GP_InputDriverX11.h => gfx/GP_VLine.gen.h.t} (86%) create mode 100644 include/gfx/Makefile copy include/filters/GP_LinearThreads.h => libs/gfx/GP_VLine.gen.c.t (79%) delete mode 100644 libs/gfx/algo/VLine.algo.h 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: 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