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, pywrap has been updated via 88080e9a2b9c406de4214a878cc42bc478785132 (commit) via 1832d27ef46a9075db864ed0c5dee236ce1ac940 (commit) via ca4d1e00c41ace34e8db1f806204fe0aa36dc0d9 (commit) via 967e802a258863e45da3f143f66d298cb5201824 (commit) via 61a39f1c06288ddae8c94a7c1c2e363d14619839 (commit) via 07d8a923162114629fa898af720d16e41160285d (commit) via 567aafbadcf454ab32ea74f81d6dba8cd872e1d2 (commit) via e0d46203381e3dd146a17fe0078af68a1d2e8b40 (commit) via 923ee620ce7cc8acf847c29b9da82ba5899ae520 (commit) via 6b71d7fd13d9e9f9bd596d75e07d196c8042205c (commit) via 188e3a319e7a0f9eb12cfd5d06a0ac7aa996d771 (commit) via b3b9438ff87b573ce38bde2602edb0b07086560d (commit) via 1434e01b44e30a1e00c7f10d92d87304ce7f8f3a (commit) via 7d9c51d82767ee65ed41023f8851ba8e89d1e1e5 (commit) via ef3231da764cd212ba973958aafd57ce1c286ce6 (commit) via 584ef7b40c75f90ad55347dac6e4fd95a4ff54af (commit) via 565271d45d92a19f90b6f8ec637e8626fe8c1f0f (commit) via 6e4677159b0d9febdd48f359e335277b53991093 (commit) via 8c91f2055c2d8a0f47593811e9ddb7261234d7b2 (commit) via 8dafb4ba1c30fc36d48f86e166212af3b7cf329c (commit) via 763bca3b9ac509c837ca940dcede58e58b86d21b (commit) via 02901b7585b1265cedf68d019e7eb8ec5263c5a7 (commit) via d170475005b04f6e2a1d69283760c0bc03bc4d64 (commit) via 173957cead4c3099479976cfd3a5b62f3d2b0f56 (commit) via e659d64782d1f5d6c93fc1547c81d941b5ea45bc (commit) via c9a9d19055f9add550845b8e3c9050e7e32467c2 (commit) via b98ab667d547b2de4ad9d8fdb2c5d1dee4e65419 (commit) via 4c14716c974906c490a2f96bdbd0cef840fe1812 (commit) via c5bfa31f9116879d4bf934536c238427fb5c0f19 (commit) via 52bed540fa7128ba565a2a6ab8bb3f91674c04d1 (commit) via 7949b70ee58a7ce28bf21767e1b29efe56ef68e0 (commit) via 076239276ea6205aaf69d5338bfd529d40592c4b (commit) via 2954919a806b005e125f1bc08542dc38f94138c8 (commit) via 504c3a5c6858d9af39bc640b2a16638b984226a7 (commit) via 150058b75f541d901eda178e485d65112ab77e5b (commit) via cb293ded8c994e9df465ad5af0b0777def55f680 (commit) via 89d86e0b6926dd8f6a5f650a89920e104ea52b00 (commit) via 995986f457f6cc5d2ea615622cb6d3a310f51e9d (commit) via 9b6212e7e083c6a78dca9cf322553c27baea66b2 (commit) via d17743a7cfa2617c5f50d47f801f8722480553fc (commit) via 66cbe1a3b25ba7d4c3361d420fa9de364c02557e (commit) via 446922190513e6535202e8f45ab897bc622390ee (commit) via 09241d96413a6376d399b4e81219fdf2d9fb1462 (commit) via 1d97b3f64cb80fea14245d253f6c7db64b8495b2 (commit) via f6d646faac5ebf7a3f0831af73a79709fae9d36a (commit) via 47b078113632ec8cf3e760af0dce2e0bf0c01c92 (commit) via 7850ea0241dc2bef8cd4d45d3c22697206788cc9 (commit) via d093866437ca8adc100d6bc2a40011a26c26e813 (commit) via c5d3e2a62fabfd142f86d47f51e313680d363ea3 (commit) via bccb0491d955bfbd1c0cb8d9ca7add8c886c50fe (commit) via 6f7a48cf329d250dea4f2c4a34cf9f0e84c78c39 (commit) via 76102f7788b5e16a479e7b3543dbac60b60eae0b (commit) via b369dc80bc0313dd846091ab433f265af1b2b081 (commit) via 2f32bbb6ab45e8648e9f1023b1ed7ca167f1a4a1 (commit) via ea35af9019e34da61945dd72615c57d3e303a743 (commit) via 0f58139e80e4a6da1385034144d9f67e146ff6b8 (commit) via 36f12d07e7626a423264eca355c4000fc392dbf6 (commit) via b549f66c9fc9e0ccb125692a7a2570bbe2016cdc (commit) via 4d4ca995c2d6ae58d85863cae26c4369d5bd0967 (commit) via 357771c22372e5584d8c0e9126e7877783784073 (commit) via 4c798878c771c9306afdffb5416ca817f625d8cd (commit) via 89f781e8da4907c3e34db57714777601227a3719 (commit) via 713e4f3f13172cb63b59ac501b54992a2309b314 (commit) via 03dc78a368cf8724cfaf79b6e149bdbe2d709205 (commit) via 97369ab9d2fc879e4d491f7f0813db4fa191b5e8 (commit) via b02edef9bfce2083f3692ffccd6a3acd750b79da (commit) via 4134b186f31ff445db42c9ef938b05abe240d689 (commit) via 85ff34bf491fb4653020c474b9bc79d54d69a167 (commit) via 59bcc6a412d016392c5ea5aaf5f0fac674e06150 (commit) via 2452f86d8fc399fb31bc2688a1c1f0cdea4c4156 (commit) via 1bd709f7b02e6cf8c47318125d75d21092a8bcd9 (commit) via bf70bc758e8d915a99250ce0422f05f414785e5d (commit) via e5db2b1f3508e1630b9af36a397a68ef069a56a2 (commit) via 566ed587e8f01232c84c2aba46d1861a20cd0c27 (commit) via 870edf9002091a710e94dd929c2e9583af590f34 (commit) via 30d9e3ba8aa2412e028bb51b34d3be44ddf7a92b (commit) via 183e450a847b698b96f2f7ecbd08ed785e58879f (commit) via b0791316458c7edc23a03dc8eb1d9bc346dc3b3a (commit) via a52536952b40f8337b4415fe265217c5976f2f77 (commit) via 9f1c5605ccc309bc66b098c26590a3a1e35025b2 (commit) via 0850c45f543489686dc6a2984cf104ed2e89b4aa (commit) via 39de4836f42404f669d76cf0ebd759a0a32f41b9 (commit) via 261533840975611674984ee1e3a8ea2b83085dae (commit) via 1bac6fdd5618b074d38c9f7d4da6e867b302ba16 (commit) via af6a9007db86d114595f630d6a6be24519a2b0df (commit) via 0c39d1adbaeb40591a13cbf965d773374fb8194b (commit) via 4d91a70e678339b10b0ed4b35ba9a18ccc84fa67 (commit) via 584415285129a73670aa799560d765a94707850e (commit) via 9743963133809d6610a4986dbe1514e333e87589 (commit) via d9e3b063bae380e838bf4ae99ddc5ca387b73877 (commit) via 25e3933b27e047c26e4eefd3024d51bd44fca741 (commit) via 69614535beec61f64ac9b3d5c5016896d0a27beb (commit) via d05b5939892335e58f0f578928a89a05df78f2a0 (commit) via 5f476be6ba4492daf8d71abb03656c7dcefec959 (commit) via 91989ac6cef96d62797a104a2f99cca17f6151de (commit) via d10318c0369619faa73b93abe840ea8e67cb5a52 (commit) via db1bbab2baeb3c556862cacaa9ac9e0fa15ce859 (commit) via 2f824b15387739be5c32dd417b6fabbf54234bc8 (commit) via 0c88946ef930d04eb2c3ea3afe202ab8248150b4 (commit) via 36a72a1ec467da8e2b49ed57e98be58f911d01f7 (commit) via 3c4a561ca197f91aa1b3040a18ced825667e63dc (commit) via 42ad59f700932298c5d6441054ca7d6d7590a9e1 (commit) via 5777210fdacd7e722325dbad7a3df78bfa587462 (commit) via e8994a4be0338cc1d5edc52ea60612157eed9c2b (commit) via a19d7e22a4d18fc9ada59ce5968b3ea382ff6498 (commit) via b4d70c436ceb9fa60ed951a3a5259db2dc4159d5 (commit) from 0f2c026b6360e700cf3f1a87d0031a5760523886 (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/88080e9a2b9c406de4214a878cc42bc478785... commit 88080e9a2b9c406de4214a878cc42bc478785132 Merge: 1832d27 0f2c026 Author: Tomas Gavenciak <gavento@ucw.cz> Date: Wed Feb 22 18:35:40 2012 +0100 Merge branch 'pywrap' of ssh://repo.or.cz/srv/git/gfxprim into pywrap diff --cc configure index 7d0ffd6,3157690..24fc5f2 --- a/configure +++ b/configure @@@ -147,8 -138,9 +147,9 @@@ if __name__ == '__main__' # Dictionary for default configuration parameters # cfg = {'CC' : ['gcc', 'Path/name of the C compiler'], - 'CFLAGS' : ['-W -Wall -Wextra -fPIC -O2', 'C compiler flags'], + 'CFLAGS' : ['-W -Wall -Wextra -fPIC -O2 -ggdb', 'C compiler flags'], 'PYTHON_BIN' : ['python', 'Path/name of python interpreter'], + 'SWIG' : ['swig', 'Simplified Wrapper and Interface Generator'], 'include_path': ['/usr/include', 'Path to the system headers']} # http://repo.or.cz/w/gfxprim.git/commit/1832d27ef46a9075db864ed0c5dee236ce1ac... commit 1832d27ef46a9075db864ed0c5dee236ce1ac940 Author: Tomas Gavenciak <gavento@ucw.cz> Date: Wed Feb 22 16:57:35 2012 +0100 Creating gfxprim module structure diff --git a/pylib/gfxprim/Makefile b/pylib/gfxprim/Makefile new file mode 100644 index 0000000..03e42fa --- /dev/null +++ b/pylib/gfxprim/Makefile @@ -0,0 +1,16 @@ +TOPDIR=../.. + +include $(TOPDIR)/include.mk + +# Core +core/gfxprim_core_c.py core/gfxprim_core_wrap.c: $(TOPDIR)/include/core/gfxprim_core.swig + swig -python -Wall -I/usr/include/ + $(TOPDIR)/include/core/gfxprim_core.swig + +$(TOPDIR)/build/_gfxprim_core_c.so: core/gfxprim_core_wrap.c + gcc -shared core/gfxprim_core_wrap.c -L $(TOPDIR)/build/ -I /usr/include/python2.6/ -I$(TOPDIR)/include/ + -fPIC -Wall -lGP -lpng -ljpeg -lm -ldl -o $(TOPDIR)/build/_gfxprim_core_c.so + + +all: $(TOPDIR)/build/_gfxprim_core_c.so + diff --git a/pylib/gfxprim/__init__.py b/pylib/gfxprim/__init__.py new file mode 100644 index 0000000..4710136 --- /dev/null +++ b/pylib/gfxprim/__init__.py @@ -0,0 +1,17 @@ +""" +GFXPrim Python bindings. Mostly generated using SWIG. + +Structure: +gfxprim: + core: + context: module defining Context + Context - wrapper class, with many proxy methods + [Context from context] + gfxprim_core_c: - SWIG module + [almost * from gfxprim_core_c] + loaders: + gfxprim_loaders_c - SWIG submodule + [almost * from gfxprim_loaders_c] + +""" + diff --git a/pylib/gfxprim/core/__init__.py b/pylib/gfxprim/core/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/pylib/context.py b/pylib/gfxprim/core/context.py similarity index 100% rename from pylib/context.py rename to pylib/gfxprim/core/context.py diff --git a/pylib/gfxprim/loaders/__init__.py b/pylib/gfxprim/loaders/__init__.py new file mode 100644 index 0000000..e69de29 http://repo.or.cz/w/gfxprim.git/commit/ca4d1e00c41ace34e8db1f806204fe0aa36dc... commit ca4d1e00c41ace34e8db1f806204fe0aa36dc0d9 Author: Tomas Gavenciak <gavento@ucw.cz> Date: Wed Feb 22 16:09:34 2012 +0100 Fixed include headers in SWIG file diff --git a/include/core/gfxprim_core.swig b/include/core/gfxprim_core.swig index d497c8f..0208cec 100644 --- a/include/core/gfxprim_core.swig +++ b/include/core/gfxprim_core.swig @@ -104,6 +104,4 @@ and self.thisown.") GP_Context; %include "GP_GetPutPixel.h" %import "GP_GetPutPixel.gen.h" %include "GP_WritePixel.h" - %include "GP_Blit.h" -%import "GP_Blit.gen.h" http://repo.or.cz/w/gfxprim.git/commit/967e802a258863e45da3f143f66d298cb5201... commit 967e802a258863e45da3f143f66d298cb5201824 Author: Tomas Gavenciak <gavento@ucw.cz> Date: Wed Feb 22 16:03:49 2012 +0100 Move gfxprim/ to gp_codegen, refactorize to be (more) movable * Using "import .something" might break older pythons diff --git a/pylib/bin/generate_collected_tests.py b/pylib/bin/generate_collected_tests.py index 4038bd8..72f6efb 100644 --- a/pylib/bin/generate_collected_tests.py +++ b/pylib/bin/generate_collected_tests.py @@ -5,7 +5,7 @@ # 2011 - Tomas Gavenciak <gavento@ucw.cz> # -from gfxprim import render_utils, test_collection +from gp_codegen import render_utils, test_collection import jinja2 import logging as log from optparse import OptionParser diff --git a/pylib/bin/generate_file.py b/pylib/bin/generate_file.py index b8b6b12..e642f77 100644 --- a/pylib/bin/generate_file.py +++ b/pylib/bin/generate_file.py @@ -6,7 +6,7 @@ # 2011 - Tomas Gavenciak <gavento@ucw.cz> # -from gfxprim import render_utils +from gp_codegen import render_utils import jinja2 import logging as log from optparse import OptionParser diff --git a/pylib/gfxprim/README b/pylib/gp_codegen/README similarity index 100% rename from pylib/gfxprim/README rename to pylib/gp_codegen/README diff --git a/pylib/gfxprim/__init__.py b/pylib/gp_codegen/__init__.py similarity index 100% rename from pylib/gfxprim/__init__.py rename to pylib/gp_codegen/__init__.py diff --git a/pylib/gfxprim/gfxprimconfig.py b/pylib/gp_codegen/gfxprimconfig.py similarity index 93% rename from pylib/gfxprim/gfxprimconfig.py rename to pylib/gp_codegen/gfxprimconfig.py index 9d90ae4..81d3f32 100644 --- a/pylib/gfxprim/gfxprimconfig.py +++ b/pylib/gp_codegen/gfxprimconfig.py @@ -1,13 +1,13 @@ # -# gfxprim.generators.gfxprimconfig - Class for (global) GfxPrim configuration +# gfxprimconfig - Class for (global) GfxPrim configuration # # 2011 - Tomas Gavenciak <gavento@ucw.cz> # 2011 - Cyril Hrubis <metan@ucw.cz> import os import logging as log -from gfxprim.pixeltype import PixelType -from gfxprim.pixelsize import PixelSize +from .pixeltype import PixelType +from .pixelsize import PixelSize class GfxPrimConfig(object): def __init__(self, pixel_type = None, pixel_size=None, pixelsizes=None, diff --git a/pylib/gfxprim/pixelsize.py b/pylib/gp_codegen/pixelsize.py similarity index 100% rename from pylib/gfxprim/pixelsize.py rename to pylib/gp_codegen/pixelsize.py diff --git a/pylib/gfxprim/pixeltype.py b/pylib/gp_codegen/pixeltype.py similarity index 97% rename from pylib/gfxprim/pixeltype.py rename to pylib/gp_codegen/pixeltype.py index fb2744f..08e08fe 100644 --- a/pylib/gfxprim/pixeltype.py +++ b/pylib/gp_codegen/pixeltype.py @@ -5,7 +5,7 @@ # import re -from gfxprim.pixelsize import PixelSize +from .pixelsize import PixelSize class PixelType(object): """Representation of one GP_PixelType""" diff --git a/pylib/gfxprim/render_utils.py b/pylib/gp_codegen/render_utils.py similarity index 91% rename from pylib/gfxprim/render_utils.py rename to pylib/gp_codegen/render_utils.py index b115b91..9c9c1a8 100644 --- a/pylib/gfxprim/render_utils.py +++ b/pylib/gp_codegen/render_utils.py @@ -2,12 +2,16 @@ # gfxprim.render_utils # -import jinja2 import logging as log import os import time import re +try: + import jinja2 +except: + log.fatal("Jinja 2 is required to compile gfxprim.") + def template_error(s, *args): raise Exception(s, *args) @@ -22,7 +26,7 @@ def create_environment(config, template_dir): env.globals['pixeltypes'] = config.pixeltypes env.globals['pixeltypes_dict'] = config.pixeltypes_dict env.globals['config'] = config - from gfxprim.pixelsize import LE, BE + from .pixelsize import LE, BE env.globals['LE'] = LE env.globals['BE'] = BE env.globals['len'] = len @@ -79,9 +83,9 @@ def load_gfxprimconfig(config_file = None): config_file) return None - from gfxprim.pixeltype import PixelType - from gfxprim.pixelsize import PixelSize, LE, BE - from gfxprim.gfxprimconfig import GfxPrimConfig + from .pixeltype import PixelType + from .pixelsize import PixelSize, LE, BE + from .gfxprimconfig import GfxPrimConfig l = {"PixelType": PixelType, "PixelSize": PixelSize, "LE": LE, diff --git a/pylib/gfxprim/test_collection.py b/pylib/gp_codegen/test_collection.py similarity index 97% rename from pylib/gfxprim/test_collection.py rename to pylib/gp_codegen/test_collection.py index 0d947ef..254cd21 100644 --- a/pylib/gfxprim/test_collection.py +++ b/pylib/gp_codegen/test_collection.py @@ -10,7 +10,7 @@ import os import re import glob import logging as log -from gfxprim.render_utils import create_environment, render_file +from .render_utils import create_environment, render_file testfile_patterns = ['*.test.c', '*.test.gen.c'] diff --git a/pylib/gfxprim/pylint.conf b/pylib/pylint.conf similarity index 100% rename from pylib/gfxprim/pylint.conf rename to pylib/pylint.conf http://repo.or.cz/w/gfxprim.git/commit/61a39f1c06288ddae8c94a7c1c2e363d14619... commit 61a39f1c06288ddae8c94a7c1c2e363d14619839 Merge: ce520ce 07d8a92 Author: Tomas Gavenciak <gavento@ucw.cz> Date: Wed Feb 22 13:50:34 2012 +0100 Merge branch 'master' into pywrap Conflicts: include/core/GP_Core.h include/core/GP_Counter.h diff --cc include/core/GP_Core.h index 93ce52b,043e6ce..3987d07 --- a/include/core/GP_Core.h +++ b/include/core/GP_Core.h @@@ -62,10 -59,7 +62,13 @@@ /* Color */ #include "core/GP_Color.h" +/* Progress callback */ +#include "core/GP_ProgressCallback.h" + +/* Debug counters */ +#include "core/GP_Counter.h" + + /* Mix Pixel */ + #include "core/GP_MixPixels.h" + #endif /* GP_CORE_H */ diff --cc include/core/GP_Counter.h index e501309,21eaccf..0429df9 --- a/include/core/GP_Counter.h +++ b/include/core/GP_Counter.h @@@ -54,12 -52,12 +52,12 @@@ typedef GP_Counter_t *GP_Counter /* * Increase a counter by 1. */ - -static inline void GP_IncCounter(GP_Counter counter) +static inline void GP_IncCounter(GP_Counter counter) { #ifdef GP_IMPLEMENT_COUNTERS - if (!counter) return; - (*counter) ++; + if (!counter) + return; + (*counter)++; #endif /* GP_IMPLEMENT_COUNTERS */ } @@@ -67,11 -65,11 +65,11 @@@ * Increase a counter by delta (may be negative). * No checks for underflow. */ - -static inline void GP_AddCounter(GP_Counter counter, GP_Counter_t delta) +static inline void GP_AddCounter(GP_Counter counter, GP_Counter_t delta) { #ifdef GP_IMPLEMENT_COUNTERS - if (!counter) return; + if (!counter) + return; (*counter) += delta; #endif /* GP_IMPLEMENT_COUNTERS */ } diff --cc include/core/GP_Pixel.h index 294c022,a36c9bd..c8d82e4 --- a/include/core/GP_Pixel.h +++ b/include/core/GP_Pixel.h @@@ -114,29 -115,23 +115,26 @@@ typedef struct /* * Array of size GP_PIXEL_MAX describing known pixel types */ - extern const GP_PixelTypeDescription const GP_PixelTypes[]; +#define GP_CHECK_VALID_PIXELTYPE(type) + GP_CHECK(((type) > 0) && ((type) < GP_PIXEL_MAX), "Invalid PixelType %d", (type)) + /* * Convert pixel type to name. */ - static inline const char *GP_PixelTypeName(GP_PixelType type) { - GP_CHECK(type < GP_PIXEL_MAX); + GP_CHECK_VALID_PIXELTYPE(type); return GP_PixelTypes[type].name; } /* * Returns number of bits per pixel. */ - static inline uint32_t GP_PixelSize(GP_PixelType type) { - GP_CHECK(type < GP_PIXEL_MAX); + GP_CHECK_VALID_PIXELTYPE(type); return GP_PixelTypes[type].size; } ----------------------------------------------------------------------- Summary of changes: TODO | 2 - app.mk | 2 +- build/get_objs.sh | 2 +- configure | 50 +- demos/Makefile | 2 +- demos/fbshow/Makefile | 6 +- .../GP_GetPutPixel.c => demos/fbshow/cpu_timer.c | 36 +- .../GP_Framebuffer.h => demos/fbshow/cpu_timer.h | 38 +- demos/fbshow/fbshow.c | 193 ++++--- demos/grinder/Makefile | 4 +- demos/grinder/grinder.c | 119 ++++- .../linux_input.c => demos/grinder/histogram.c | 73 ++- libs/core/GP_Debug.c => demos/grinder/histogram.h | 15 +- demos/{fbshow => particle}/Makefile | 8 +- demos/particle/particle_demo.c | 160 +++++ demos/{fbshow => particle}/runtest.sh | 0 demos/particle/space.c | 188 ++++++ .../linux_input.c => demos/particle/space.h | 66 ++- gen.mk | 23 +- include/backends/GP_Backend.h | 152 ++++-- .../GP_InputDriverSDL.h => backends/GP_Backends.h} | 20 +- .../backends/{GP_Framebuffer.h => GP_LinuxFB.h} | 35 +- .../GP_InputDriverLinux.h => backends/GP_SDL.h} | 77 +-- .../GP_Debug.c => include/core/GP_AngleUtils.h | 17 +- include/core/GP_Blit.gen.h.t | 16 - include/core/GP_Blit.h | 78 ++- include/core/GP_Common.h | 10 +- include/core/GP_Context.h | 16 +- include/core/GP_Core.h | 3 + include/core/GP_Counter.h | 36 +- include/core/GP_FixedPoint.h | 133 +++++ include/core/GP_FnPerBpp.gen.h.t | 5 - include/core/GP_FnPerBpp.h | 9 - include/core/GP_GammaCorrection.gen.h.t | 27 + include/core/GP_GammaCorrection.h | 66 ++ include/core/GP_GetPutPixel.h | 35 +- include/core/GP_MixPixels.gen.h.t | 140 +++++ .../GP_Blit.test.c => include/core/GP_MixPixels.h | 11 +- include/core/GP_Pixel.h | 4 +- include/core/GP_Transform.h | 61 ++- include/core/Makefile | 5 +- include/filters/{GP_Dither.h => GP_Arithmetic.h} | 60 ++- include/filters/GP_FilterParam.h | 4 + include/filters/GP_Filters.h | 12 +- include/filters/GP_Resize.h | 18 +- include/{loaders/GP_JPG.h => filters/GP_Stats.h} | 52 +- include/gfx/{GP_Line.h => GP_Arc.h} | 20 +- include/gfx/{GP_Triangle.h => GP_CircleSeg.h} | 52 ++- include/gfx/GP_Gfx.h | 8 + .../GP_Framebuffer.h => gfx/GP_HLineAA.h} | 40 +- .../{backends/GP_Framebuffer.h => gfx/GP_LineAA.h} | 40 +- include/{loaders/GP_JPG.h => gfx/GP_PutPixelAA.h} | 45 +- include/gfx/{GP_VLine.h => GP_RectAA.h} | 44 +- .../GP_Framebuffer.h => gfx/GP_VLineAA.h} | 40 +- include/input/GP_Event.h | 2 +- include/loaders/{GP_JPG.h => GP_BMP.h} | 40 +- include/loaders/GP_Loaders.h | 4 +- .../GP_Debug.c => include/text/GP_DefaultFont.h | 17 +- include/text/GP_Font.h | 249 +++++---- include/text/GP_Text.h | 9 +- include/text/GP_TextStyle.h | 36 +- libs/backends/GP_Backend.c | 87 --- libs/backends/{GP_Framebuffer.c => GP_LinuxFB.c} | 93 +++- libs/backends/{GP_Backend_SDL.c => GP_SDL.c} | 196 ++++--- libs/backends/Makefile | 1 + libs/core/{GP_GetPutPixel.c => GP_AngleUtils.c} | 39 +- libs/core/GP_Blit.c | 129 +++-- libs/core/GP_Blit.gen.c.t | 280 ++++++++-- libs/core/GP_Context.c | 25 + libs/core/GP_Counter.c | 30 +- libs/core/GP_GammaCorrection.gen.c.t | 39 ++ libs/core/GP_GetPutPixel.c | 5 +- libs/core/Makefile | 3 +- libs/filters/GP_Addition.gen.c.t | 24 + libs/filters/GP_Brightness.gen.c.t | 2 +- libs/filters/GP_Contrast.gen.c.t | 2 +- libs/filters/GP_Difference.gen.c.t | 23 + libs/filters/GP_FilterParam.c | 8 + libs/filters/GP_Histogram.gen.c.t | 25 + libs/filters/GP_Invert.gen.c.t | 2 +- libs/filters/GP_Linear.c | 394 +++---------- libs/filters/GP_Max.gen.c.t | 23 + libs/filters/GP_Min.gen.c.t | 23 + libs/filters/GP_Multiply.gen.c.t | 24 + libs/filters/GP_Point.gen.c.t | 2 +- libs/filters/GP_Resize.c | 551 ++++++++++++++---- .../linux_input.c => libs/filters/GP_Stats.c | 75 ++- libs/filters/Makefile | 20 +- libs/gfx/{GP_Line.c => GP_Arc.c} | 37 +- libs/gfx/GP_Circle.c | 7 +- libs/gfx/{GP_Circle.c => GP_CircleSeg.c} | 98 ++-- libs/gfx/GP_Ellipse.c | 7 +- libs/gfx/GP_HLine.c | 11 +- libs/gfx/{GP_Line.c => GP_HLineAA.c} | 42 +- libs/gfx/GP_HLineAA.gen.c.t | 62 ++ libs/gfx/GP_Line.c | 6 +- libs/gfx/{GP_Line.c => GP_LineAA.c} | 21 +- libs/gfx/GP_LineAA.gen.c.t | 139 +++++ libs/gfx/{GP_Line.c => GP_PartialEllipse.c} | 35 +- libs/gfx/GP_Polygon.c | 5 +- libs/gfx/GP_PutPixelAA.gen.c.t | 55 ++ libs/gfx/GP_Rect.c | 8 +- libs/gfx/GP_RectAA.c | 183 ++++++ libs/gfx/GP_Tetragon.c | 8 +- libs/gfx/GP_Triangle.c | 8 +- libs/gfx/GP_VLine.c | 7 +- include/gfx/GP_Gfx.h => libs/gfx/GP_VLineAA.c | 58 +- libs/gfx/GP_VLineAA.gen.c.t | 62 ++ libs/gfx/Makefile | 6 +- libs/gfx/algo/{Ellipse.algo.h => Arc.algo.h} | 99 ++-- libs/gfx/algo/{Circle.algo.h => CircleSeg.algo.h} | 30 +- .../algo/{Line.algo.h => PartialEllipse.algo.h} | 71 +-- libs/input/GP_Event.c | 43 ++- libs/loaders/GP_BMP.c | 607 +++++++++++++++++++ libs/loaders/GP_JPG.c | 39 ++- libs/loaders/GP_Loaders.c | 17 + libs/loaders/GP_PNG.c | 49 ++- libs/text/GP_DefaultFont.c | 619 +++++++++++++------- libs/text/GP_Font.c | 195 +------ libs/text/GP_FreeType.c | 201 +++++++ libs/text/GP_Text.c | 41 +-- libs/text/GP_Text.gen.c.t | 176 ++++++ libs/text/GP_TextMetric.c | 188 ++++-- libs/text/GP_TextStyle.c | 4 +- libs/text/Makefile | 8 +- libs/text/algo/Text.algo.h | 83 --- pylib/bin/generate_collected_tests.py | 2 +- pylib/bin/generate_file.py | 2 +- pylib/gfxprim/Makefile | 16 + pylib/gfxprim/__init__.py | 21 +- pylib/{ => gfxprim/core}/context.py | 0 pylib/{gfxprim => gp_codegen}/README | 0 pylib/{gfxprim => gp_codegen}/__init__.py | 0 pylib/{gfxprim => gp_codegen}/gfxprimconfig.py | 6 +- pylib/{gfxprim => gp_codegen}/pixelsize.py | 0 pylib/{gfxprim => gp_codegen}/pixeltype.py | 2 +- pylib/{gfxprim => gp_codegen}/render_utils.py | 18 +- pylib/{gfxprim => gp_codegen}/test_collection.py | 2 +- pylib/{gfxprim => }/pylint.conf | 0 pylib/templates/common.c.t | 16 + pylib/templates/filter.arithmetic.c.t | 154 +++++ pylib/templates/filter.c.t | 58 ++ pylib/templates/filter.point.c.t | 77 +--- pylib/templates/filter.stats.c.t | 102 ++++ pywrap/core/gfxprim_core.swig | 2 - tests/SDL/Makefile | 3 +- tests/SDL/{pixeltest.c => aatest.c} | 131 ++-- tests/SDL/blittest.c | 60 ++- tests/SDL/fileview.c | 28 +- tests/SDL/fonttest.c | 153 +++-- tests/SDL/linetest.c | 53 ++- tests/SDL/{pixeltest.c => mixpixeltest.c} | 123 +++- tests/SDL/randomshapetest.c | 40 +- tests/SDL/shapetest.c | 15 +- tests/SDL/sierpinsky.c | 20 +- tests/SDL/textaligntest.c | 56 +- tests/core/GP_MixPixels.test.gen.c.t | 51 ++ tests/core/Makefile | 5 +- tests/drivers/Makefile | 2 +- tests/drivers/framebuffer_test.c | 39 +- tests/drivers/sierpinsky.c | 143 ----- 161 files changed, 6658 insertions(+), 2937 deletions(-) copy libs/core/GP_GetPutPixel.c => demos/fbshow/cpu_timer.c (68%) copy include/backends/GP_Framebuffer.h => demos/fbshow/cpu_timer.h (76%) copy tests/drivers/linux_input.c => demos/grinder/histogram.c (53%) copy libs/core/GP_Debug.c => demos/grinder/histogram.h (88%) copy demos/{fbshow => particle}/Makefile (54%) create mode 100644 demos/particle/particle_demo.c copy demos/{fbshow => particle}/runtest.sh (100%) create mode 100644 demos/particle/space.c copy tests/drivers/linux_input.c => demos/particle/space.h (65%) copy include/{input/GP_InputDriverSDL.h => backends/GP_Backends.h} (83%) copy include/backends/{GP_Framebuffer.h => GP_LinuxFB.h} (75%) copy include/{input/GP_InputDriverLinux.h => backends/GP_SDL.h} (57%) copy libs/core/GP_Debug.c => include/core/GP_AngleUtils.h (87%) delete mode 100644 include/core/GP_Blit.gen.h.t create mode 100644 include/core/GP_FixedPoint.h create mode 100644 include/core/GP_GammaCorrection.gen.h.t create mode 100644 include/core/GP_GammaCorrection.h create mode 100644 include/core/GP_MixPixels.gen.h.t copy tests/core/GP_Blit.test.c => include/core/GP_MixPixels.h (88%) copy include/filters/{GP_Dither.h => GP_Arithmetic.h} (55%) copy include/{loaders/GP_JPG.h => filters/GP_Stats.h} (66%) copy include/gfx/{GP_Line.h => GP_Arc.h} (82%) copy include/gfx/{GP_Triangle.h => GP_CircleSeg.h} (55%) copy include/{backends/GP_Framebuffer.h => gfx/GP_HLineAA.h} (68%) copy include/{backends/GP_Framebuffer.h => gfx/GP_LineAA.h} (68%) copy include/{loaders/GP_JPG.h => gfx/GP_PutPixelAA.h} (66%) copy include/gfx/{GP_VLine.h => GP_RectAA.h} (57%) rename include/{backends/GP_Framebuffer.h => gfx/GP_VLineAA.h} (68%) copy include/loaders/{GP_JPG.h => GP_BMP.h} (71%) copy libs/core/GP_Debug.c => include/text/GP_DefaultFont.h (88%) delete mode 100644 libs/backends/GP_Backend.c rename libs/backends/{GP_Framebuffer.c => GP_LinuxFB.c} (80%) rename libs/backends/{GP_Backend_SDL.c => GP_SDL.c} (50%) copy libs/core/{GP_GetPutPixel.c => GP_AngleUtils.c} (73%) create mode 100644 libs/core/GP_GammaCorrection.gen.c.t create mode 100644 libs/filters/GP_Addition.gen.c.t create mode 100644 libs/filters/GP_Difference.gen.c.t create mode 100644 libs/filters/GP_Histogram.gen.c.t create mode 100644 libs/filters/GP_Max.gen.c.t create mode 100644 libs/filters/GP_Min.gen.c.t create mode 100644 libs/filters/GP_Multiply.gen.c.t copy tests/drivers/linux_input.c => libs/filters/GP_Stats.c (54%) copy libs/gfx/{GP_Line.c => GP_Arc.c} (65%) copy libs/gfx/{GP_Circle.c => GP_CircleSeg.c} (59%) copy libs/gfx/{GP_Line.c => GP_HLineAA.c} (66%) create mode 100644 libs/gfx/GP_HLineAA.gen.c.t copy libs/gfx/{GP_Line.c => GP_LineAA.c} (82%) create mode 100644 libs/gfx/GP_LineAA.gen.c.t copy libs/gfx/{GP_Line.c => GP_PartialEllipse.c} (66%) create mode 100644 libs/gfx/GP_PutPixelAA.gen.c.t create mode 100644 libs/gfx/GP_RectAA.c copy include/gfx/GP_Gfx.h => libs/gfx/GP_VLineAA.c (65%) create mode 100644 libs/gfx/GP_VLineAA.gen.c.t copy libs/gfx/algo/{Ellipse.algo.h => Arc.algo.h} (58%) copy libs/gfx/algo/{Circle.algo.h => CircleSeg.algo.h} (85%) copy libs/gfx/algo/{Line.algo.h => PartialEllipse.algo.h} (66%) create mode 100644 libs/loaders/GP_BMP.c create mode 100644 libs/text/GP_FreeType.c create mode 100644 libs/text/GP_Text.gen.c.t delete mode 100644 libs/text/algo/Text.algo.h create mode 100644 pylib/gfxprim/Makefile create mode 100644 pylib/gfxprim/core/__init__.py rename pylib/{ => gfxprim/core}/context.py (100%) create mode 100644 pylib/gfxprim/loaders/__init__.py rename pylib/{gfxprim => gp_codegen}/README (100%) copy pylib/{gfxprim => gp_codegen}/__init__.py (100%) rename pylib/{gfxprim => gp_codegen}/gfxprimconfig.py (93%) rename pylib/{gfxprim => gp_codegen}/pixelsize.py (100%) rename pylib/{gfxprim => gp_codegen}/pixeltype.py (97%) rename pylib/{gfxprim => gp_codegen}/render_utils.py (86%) rename pylib/{gfxprim => gp_codegen}/test_collection.py (97%) rename pylib/{gfxprim => }/pylint.conf (100%) create mode 100644 pylib/templates/common.c.t create mode 100644 pylib/templates/filter.arithmetic.c.t create mode 100644 pylib/templates/filter.c.t create mode 100644 pylib/templates/filter.stats.c.t copy tests/SDL/{pixeltest.c => aatest.c} (65%) copy tests/SDL/{pixeltest.c => mixpixeltest.c} (58%) create mode 100644 tests/core/GP_MixPixels.test.gen.c.t delete mode 100644 tests/drivers/sierpinsky.c repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos@gmail.com if you want to unsubscribe, or site admin admin@repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")