- Gfxprim - ucw.cz

[repo.or.cz] gfxprim.git branch master updated: 1c8bab0eb13544cbc84b504007326432f9145515
by metan 14 Nov '11

14 Nov '11

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 1c8bab0eb13544cbc84b504007326432f9145515 (commit) from 12140ab1df18e77ad7a07908bc1f944579eccc78 (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/1c8bab0eb13544cbc84b504007326432f914… commit 1c8bab0eb13544cbc84b504007326432f9145515 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon Nov 14 23:54:24 2011 +0100 grinder: Fix script. diff --git a/demos/grinder/runtest.sh b/demos/grinder/runtest.sh index 73c9f61..163c76c 100755 --- a/demos/grinder/runtest.sh +++ b/demos/grinder/runtest.sh @@ -7,4 +7,4 @@ PROG="$1" shift echo "LD_LIBRARY_PATH=../../build/ ./$PROG $@" -LD_LIBRARY_PATH=../../build/ ./$PROG $@ +LD_LIBRARY_PATH=../../build/ ./$PROG "$@" ----------------------------------------------------------------------- Summary of changes: demos/grinder/runtest.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch master updated: 12140ab1df18e77ad7a07908bc1f944579eccc78
by metan 14 Nov '11

14 Nov '11

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 12140ab1df18e77ad7a07908bc1f944579eccc78 (commit) from db6777f82eb9c87d31fd68beed98624f4441024e (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/12140ab1df18e77ad7a07908bc1f944579ec… commit 12140ab1df18e77ad7a07908bc1f944579eccc78 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon Nov 14 23:34:53 2011 +0100 build: Fix one more Makefile. diff --git a/tests/drivers/Makefile b/tests/drivers/Makefile index 3f631db..afba820 100644 --- a/tests/drivers/Makefile +++ b/tests/drivers/Makefile @@ -1,17 +1,10 @@ -LDFLAGS=-L../../build/ -lGP -lpng -ldl -ljpeg -lm -INCLUDE=-I../../include -# Some warnings are triggered only with -O2 -# thuss added here -CFLAGS=$(INCLUDE) -ggdb -W -Wall -O2 -SOURCES=$(wildcard *.c) -TESTS=$(SOURCES:.c=) +TOPDIR=../.. -all: $(TESTS) +CSOURCES=$(shell echo *.c) -%: %.c - $(CC) $(CFLAGS) $(LDFLAGS) $(LIBRARY) $^ -o $@ +LDLIBS+=-lGP -lGP_SDL -lSDL -L$(TOPDIR)/build/ -clean: - rm -f *.o - rm -f $(TESTS) +APPS=$(CSOURCES:.c=) +include $(TOPDIR)/include.mk +include $(TOPDIR)/app.mk ----------------------------------------------------------------------- Summary of changes: tests/drivers/Makefile | 19 ++++++------------- 1 files changed, 6 insertions(+), 13 deletions(-) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch master updated: db6777f82eb9c87d31fd68beed98624f4441024e
by metan 14 Nov '11

14 Nov '11

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 db6777f82eb9c87d31fd68beed98624f4441024e (commit) from 444015ece1a074f982dbe7d8f110f295acddc90a (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/db6777f82eb9c87d31fd68beed98624f4441… commit db6777f82eb9c87d31fd68beed98624f4441024e Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon Nov 14 23:11:05 2011 +0100 build: having config removed in 'make clean' is wrong Added 'make distclean' for that. diff --git a/Makefile b/Makefile index d2d16f5..4f303c0 100644 --- a/Makefile +++ b/Makefile @@ -17,14 +17,21 @@ build: clean: ifdef VERBOSE - rm config.h config.gen.mk $(MAKE) -C build clean else - @rm config.h config.gen.mk @echo "/build" @$(MAKE) --no-print-directory -C build clean endif +distclean: +ifdef VERBOSE + rm config.h config.gen.mk + $(MAKE) clean +else + @$(MAKE) clean + @rm config.h config.gen.mk +endif + HEADER_LOC=/usr/include/ LIB_LOC=/usr/lib/ ----------------------------------------------------------------------- Summary of changes: Makefile | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch master updated: 444015ece1a074f982dbe7d8f110f295acddc90a
by metan 14 Nov '11

14 Nov '11

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 444015ece1a074f982dbe7d8f110f295acddc90a (commit) from c4ae73720b3f73c4c93cc9d697c07b4353c54ce1 (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/444015ece1a074f982dbe7d8f110f295acdd… commit 444015ece1a074f982dbe7d8f110f295acddc90a Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon Nov 14 21:04:59 2011 +0100 build: Fix some linker flags, needs to be fixed properly in future. diff --git a/app.mk b/app.mk index 9b31c14..0b301df 100644 --- a/app.mk +++ b/app.mk @@ -2,7 +2,7 @@ ifndef APPS $(error APPS not defined, fix your library Makefile) endif -LDFLAGS+=-lpng -ljpeg +LDLIBS+=-lpng -ljpeg -lm -ldl all: $(APPS) diff --git a/tests/drivers/Makefile b/tests/drivers/Makefile index 28ea051..3f631db 100644 --- a/tests/drivers/Makefile +++ b/tests/drivers/Makefile @@ -1,4 +1,4 @@ -LDFLAGS=-L../../build/ -lGP -lpng -ldl -ljpeg +LDFLAGS=-L../../build/ -lGP -lpng -ldl -ljpeg -lm INCLUDE=-I../../include # Some warnings are triggered only with -O2 # thuss added here ----------------------------------------------------------------------- Summary of changes: app.mk | 2 +- tests/drivers/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch master updated: c4ae73720b3f73c4c93cc9d697c07b4353c54ce1
by metan 14 Nov '11

14 Nov '11

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 c4ae73720b3f73c4c93cc9d697c07b4353c54ce1 (commit) from d9ac064e99ae31787e556d4f10bf3f4afd93acda (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/c4ae73720b3f73c4c93cc9d697c07b4353c5… commit c4ae73720b3f73c4c93cc9d697c07b4353c54ce1 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon Nov 14 20:53:56 2011 +0100 build: fix configure for portable shells diff --git a/configure b/configure index b252512..12c3a89 100755 --- a/configure +++ b/configure @@ -23,7 +23,7 @@ def header_exists(cfg, filename): def c_try_compile(cfg, code, msg): sys.stderr.write(msg) - ret = os.system("echo '{0}' | {1} -x c -o /dev/null - &>/dev/null".format(code, cfg["CC"][0])) + ret = os.system("echo '{0}' | {1} -x c -o /dev/null - > /dev/null 2>&1".format(code, cfg["CC"][0])) if ret: sys.stderr.write("Non") @@ -39,7 +39,7 @@ def c_compiler_exists(cfg): def python_module_installed(cfg, module): sys.stderr.write("Checking for python module {0} ... ".format(module)) - ret = os.system("echo 'import {0}' | {1}".format(module, cfg['PYTHON_BIN'][0])) + ret = os.system("echo 'import {0}' | {1} > /dev/null 2>&1".format(module, cfg['PYTHON_BIN'][0])) if ret: sys.stderr.write('Non') ----------------------------------------------------------------------- Summary of changes: configure | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch master updated: d9ac064e99ae31787e556d4f10bf3f4afd93acda
by metan 14 Nov '11

14 Nov '11

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 d9ac064e99ae31787e556d4f10bf3f4afd93acda (commit) from c5bd4df27278ea3eb1369beca15f5ac5ddf060f9 (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/d9ac064e99ae31787e556d4f10bf3f4afd93… commit d9ac064e99ae31787e556d4f10bf3f4afd93acda Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon Nov 14 20:21:44 2011 +0100 build: Get rid of old incclude/config.h. diff --git a/configure b/configure index 13c700a..b252512 100755 --- a/configure +++ b/configure @@ -148,6 +148,9 @@ if __name__ == '__main__': l = libraries([["libpng", "Portable Network Graphics Library", [header_exists, "png.h"]], + ["libsdl", + "Simple Direct Media Layer", + [header_exists, "SDL/SDL.h"]], ["jpeg", "Library to load, handle and manipulate images in the JPEG format", [header_exists, "jpeglib.h"]]], cfg) diff --git a/demos/fbshow/Makefile b/demos/fbshow/Makefile index a3bf9c3..08f9234 100644 --- a/demos/fbshow/Makefile +++ b/demos/fbshow/Makefile @@ -4,6 +4,7 @@ CSOURCES=$(shell echo *.c) INCLUDE= CFLAGS+=-pthread +LDFLAGS+=-pthread LDLIBS+=-lGP -L$(TOPDIR)/build/ APPS=fbshow diff --git a/include/config.h b/include/config.h deleted file mode 100644 index cd640ca..0000000 --- a/include/config.h +++ /dev/null @@ -1 +0,0 @@ -#define GP_HAVE_SDL 1 diff --git a/libs/backends/GP_Backend.c b/libs/backends/GP_Backend.c index 40f3d21..f705264 100644 --- a/libs/backends/GP_Backend.c +++ b/libs/backends/GP_Backend.c @@ -25,7 +25,7 @@ #include "core/GP_Core.h" #include "GP_Backend.h" -#include "config.h" +#include "../../config.h" #include <string.h> @@ -34,7 +34,7 @@ */ static struct GP_Backend *current_backend = NULL; -#ifdef GP_HAVE_SDL +#ifdef HAVE_LIBSDL extern struct GP_Backend GP_SDL_backend; @@ -45,7 +45,7 @@ struct GP_Backend *GP_InitBackend(const char *name) if (current_backend) return current_backend; -#ifdef GP_HAVE_SDL +#ifdef HAVE_LIBSDL if (!name || strcasecmp(name, "sdl") == 0) { current_backend = GP_SDL_backend.init_fn(); diff --git a/libs/backends/GP_Backend_SDL.c b/libs/backends/GP_Backend_SDL.c index a0a40e6..3b16d00 100644 --- a/libs/backends/GP_Backend_SDL.c +++ b/libs/backends/GP_Backend_SDL.c @@ -24,9 +24,9 @@ *****************************************************************************/ #include "GP_Backend.h" -#include "config.h" +#include "../../config.h" -#ifdef GP_HAVE_SDL +#ifdef HAVE_LIBSDL #include <dlfcn.h> #include <SDL/SDL.h> @@ -160,4 +160,4 @@ struct GP_Backend GP_SDL_backend = { .get_event_fn = GP_SDL_GetEventFn, }; -#endif /* GP_HAVE_SDL */ +#endif /* HAVE_LIBSDL */ ----------------------------------------------------------------------- Summary of changes: configure | 3 +++ demos/fbshow/Makefile | 1 + include/config.h | 1 - libs/backends/GP_Backend.c | 6 +++--- libs/backends/GP_Backend_SDL.c | 6 +++--- 5 files changed, 10 insertions(+), 7 deletions(-) delete mode 100644 include/config.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: c5bd4df27278ea3eb1369beca15f5ac5ddf060f9
by metan 14 Nov '11

14 Nov '11

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 c5bd4df27278ea3eb1369beca15f5ac5ddf060f9 (commit) from dca06a2b3d716c7a325793980f780c6d7052ab1b (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/c5bd4df27278ea3eb1369beca15f5ac5ddf0… commit c5bd4df27278ea3eb1369beca15f5ac5ddf060f9 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon Nov 14 20:07:28 2011 +0100 build: Quick and dirty configure script diff --git a/Makefile b/Makefile index acc8543..d2d16f5 100644 --- a/Makefile +++ b/Makefile @@ -17,8 +17,10 @@ build: clean: ifdef VERBOSE + rm config.h config.gen.mk $(MAKE) -C build clean else + @rm config.h config.gen.mk @echo "/build" @$(MAKE) --no-print-directory -C build clean endif diff --git a/config.mk b/config.mk index b37929d..9718669 100644 --- a/config.mk +++ b/config.mk @@ -1,12 +1,9 @@ -CFLAGS+=-W -Wall -Wextra -fPIC -O2 +include $(TOPDIR)/config.gen.mk CFLAGS+=-I$(TOPDIR)/include/ -LDLIBS+=-ldl # path to local module directory PYLIBSDIR=$(TOPDIR)/pylib -# Python binary/version -PYTHON_BIN=python # To test with other python versions (example): #PYTHON_BIN=${TOPDIR}/virtualpy2.4/bin/python diff --git a/configure b/configure new file mode 100755 index 0000000..13c700a --- /dev/null +++ b/configure @@ -0,0 +1,190 @@ +#!/usr/bin/env python +# +# This is simple script to detect libraries and configure +# standard features. +# +import os +import sys +from optparse import OptionParser + +def header_exists(cfg, filename): + fpath = cfg['include_path'][0] + '/' + filename + + sys.stderr.write("Checking for '{0}' ... ".format(fpath)) + + try: + st = os.stat(fpath) + sys.stderr.write("Yesn") + return True + except os.error: + sys.stderr.write("Non") + return False + +def c_try_compile(cfg, code, msg): + sys.stderr.write(msg) + + ret = os.system("echo '{0}' | {1} -x c -o /dev/null - &>/dev/null".format(code, cfg["CC"][0])) + + if ret: + sys.stderr.write("Non") + return False + else: + sys.stderr.write("Yesn") + return True + +def c_compiler_exists(cfg): + return c_try_compile(cfg, "int main(void) { return 0; }", + "Checking for working compiler ({0}) ... ".format(cfg["CC"][0])) + +def python_module_installed(cfg, module): + sys.stderr.write("Checking for python module {0} ... ".format(module)) + + ret = os.system("echo 'import {0}' | {1}".format(module, cfg['PYTHON_BIN'][0])) + + if ret: + sys.stderr.write('Non') + return False + else: + sys.stderr.write('Yesn') + return True + +# +# Library checking api +# +class libraries: + def __init__(self, libraries, cfg): + self.libraries = libraries + self.cfg = cfg; + # Create dictionary for check results + self.results = dict() + # + # Print summary + # + def print_summary(self): + sys.stderr.write("Libraries to link againstn") + sys.stderr.write("-------------------------n") + + for i in self.libraries: + sys.stderr.write("{0:10}".format(i[0])) + + if (self.results[i[0]]): + sys.stderr.write(" : Enabledn") + else: + sys.stderr.write(" : Disabledn") + + sys.stderr.write(" - {0}nn".format(i[1])) + # + # Enable/Disable library + # + def set(self, name, val): + if name not in map(lambda s: s[0], self.libraries): + sys.stderr.write("ERROR: Invalid library '{0}'n".format(name)) + exit(1) + else: + self.results[name] = val + # + # Calls a function on arguments, all is stored in array if + # not set previously + # (I know this smells like a lisp, but I can't help myself) + # + def check(self): + sys.stderr.write("Checking for librariesn") + sys.stderr.write("----------------------n") + for i in self.libraries: + if i[0] not in self.results: + self.results[i[0]] = i[2][0](self.cfg, *i[2][1:]) + sys.stderr.write("n") + # + # Writes '#define HAVE_XXX_H' into passed file + # + def write(self, f): + for i in self.libraries: + f.write("/*n * {0}n */n".format(i[1])) + if self.results[i[0]]: + f.write("#define HAVE_{0}n".format(i[0].upper())) + else: + f.write("//#define HAVE_{0}n".format(i[0].upper())) + f.write("n") + +def basic_checks(cfg): + sys.stderr.write("Basic checksn") + sys.stderr.write("------------n") + if not c_compiler_exists(cfg): + exit(1) + if not python_module_installed(cfg, 'jinja2'): + exit(1) + sys.stderr.write("n") + +# +# Write configuration files +# +def write_config_h(cfg, libs): + f = open("config.h", "w") + f.write("#ifndef CONFIG_Hn#define CONFIG_Hnn") + libs.write(f); + f.write("#endif /* CONFIG_H */n"); + sys.stderr.write("Config 'config.h' writtenn") + f.close() + +def write_config_mk(cfg, libs): + f = open('config.gen.mk', 'w') + for i in cfg: + f.write("#{0}n{1}={2}n".format(cfg[i][1], i, cfg[i][0])) + f.close() + sys.stderr.write("Config 'config.gen.mk' writtenn") + +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'], + 'PYTHON_BIN' : ['python', 'Path/name of python interpreter'], + 'include_path': ['/usr/include', 'Path to the system headers']} + + # + # Library detection/enable disable + # + l = libraries([["libpng", + "Portable Network Graphics Library", + [header_exists, "png.h"]], + ["jpeg", + "Library to load, handle and manipulate images in the JPEG format", + [header_exists, "jpeglib.h"]]], cfg) + + parser = OptionParser(); + + # Enable disable libraries for linking + parser.add_option("-e", "--enable", dest="enable", action="append", + help="force enable library linking", metavar="libfoo") + parser.add_option("-d", "--disable", dest="disable", action="append", + help="disable library linking", metavar="libfoo") + + # Add cfg config options + for i in cfg: + parser.add_option("", "--"+i, dest=i, metavar=cfg[i][0], help=cfg[i][1]) + + (options, args) = parser.parse_args(); + + # + # Enable/Disable libraries as user requested + # These are not checked later + # + if options.enable: + for i in options.enable: + l.set(i, True); + if options.disable: + for i in options.disable: + l.set(i, False); + + for i in cfg: + if getattr(options, i): + cfg[i][0] = getattr(options, i) + + basic_checks(cfg); + + l.check() + l.print_summary() + + write_config_h(cfg, l); + write_config_mk(cfg, l); ----------------------------------------------------------------------- Summary of changes: Makefile | 2 + config.mk | 5 +- configure | 190 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 193 insertions(+), 4 deletions(-) create mode 100755 configure 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: dca06a2b3d716c7a325793980f780c6d7052ab1b
by metan 14 Nov '11

14 Nov '11

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 dca06a2b3d716c7a325793980f780c6d7052ab1b (commit) via e29f0a510fc5fab3fa982c5a13506a5b72ffd40d (commit) from 2c010bf3f32376abf437e23b4edf4735adb1f957 (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/dca06a2b3d716c7a325793980f780c6d7052… commit dca06a2b3d716c7a325793980f780c6d7052ab1b Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon Nov 14 14:11:32 2011 +0100 filters: Fix some overly long lines. diff --git a/include/filters/GP_Dither.h b/include/filters/GP_Dither.h index 3ecf7bf..b0b5157 100644 --- a/include/filters/GP_Dither.h +++ b/include/filters/GP_Dither.h @@ -34,14 +34,16 @@ /* * Floyd Steinberg */ -GP_Context *GP_FilterFloydSteinberg_to_G1(const GP_Context *src, GP_Context *dst, +GP_Context *GP_FilterFloydSteinberg_to_G1(const GP_Context *src, + GP_Context *dst, GP_ProgressCallback *callback); /* * Floyd Steinberg */ -GP_Context *GP_FilterFloydSteinberg_from_RGB888(const GP_Context *src, GP_Context *dst, - GP_PixelType pixel_type, +GP_Context *GP_FilterFloydSteinberg_from_RGB888(const GP_Context *src, + GP_Context *dst, + GP_PixelType dst_pixel_type, GP_ProgressCallback *callback); /* diff --git a/libs/filters/GP_Dither.c b/libs/filters/GP_Dither.c index 84932ec..e0c6be1 100644 --- a/libs/filters/GP_Dither.c +++ b/libs/filters/GP_Dither.c @@ -48,7 +48,8 @@ int GP_FilterFloydSteinberg_to_G1_Raw(const GP_Context *src, GP_Context *dst, for (y = 0; y < (GP_Coord)src->h; y++) { for (x = 0; x < (GP_Coord)src->w; x++) { GP_Pixel pix = GP_GetPixel(src, x, y); - float val = GP_ConvertPixel(pix, src->pixel_type, GP_PIXEL_G8); + float val = GP_ConvertPixel(pix, src->pixel_type, + GP_PIXEL_G8); val += errors[y%2][x]; @@ -84,7 +85,8 @@ int GP_FilterFloydSteinberg_to_G1_Raw(const GP_Context *src, GP_Context *dst, return 0; } -GP_Context *GP_FilterFloydSteinberg_to_G1(const GP_Context *src, GP_Context *dst, +GP_Context *GP_FilterFloydSteinberg_to_G1(const GP_Context *src, + GP_Context *dst, GP_ProgressCallback *callback) { GP_Context *ret = dst; @@ -107,7 +109,8 @@ GP_Context *GP_FilterFloydSteinberg_to_G1(const GP_Context *src, GP_Context *dst return ret; } -GP_Context *GP_FilterFloydSteinberg_from_RGB888(const GP_Context *src, GP_Context *dst, +GP_Context *GP_FilterFloydSteinberg_from_RGB888(const GP_Context *src, + GP_Context *dst, GP_PixelType pixel_type, GP_ProgressCallback *callback) { http://repo.or.cz/w/gfxprim.git/commit/e29f0a510fc5fab3fa982c5a13506a5b72ff… commit e29f0a510fc5fab3fa982c5a13506a5b72ffd40d Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon Nov 14 14:05:19 2011 +0100 doc: Added docs for Floyd Steinberg dithering. diff --git a/doc/filters.txt b/doc/filters.txt index 066d04c..6750a70 100644 --- a/doc/filters.txt +++ b/doc/filters.txt @@ -265,3 +265,71 @@ downscaling. To do this reasonably fast we could cheat a little: first resize big images a little without the low-pass filter, then apply low-pass filter and finally downscale it to desired size. +Dithering +~~~~~~~~~ + +[source,c] +------------------------------------------------------------------------------- +#include <GP_Filters.h> + +GP_Context *GP_FilterFloydSteinberg_from_RGB888(const GP_Context *src, + GP_Context *dst, + GP_PixelType dst_pixel_type, + GP_ProgressCallback *callback); +------------------------------------------------------------------------------- + +Floyd-Steinberg dithering the source context must be RGB888 and the +dst_pixel_type may either be RGB or Grayscale. + +Doesn't work 'in-place' as the result has different pixel type. + +The error is distributed to neighbour pixels as follows: + +[width="10%"] +|=================== +| | X | 7/16 +| 3/16 | 5/16 | 1/16 +|=================== + +And is throwed away at the image borders. + +[source,c] +------------------------------------------------------------------------------- +#include <GP_Filters.h> + +GP_Context *GP_FilterFloydSteinberg_to_G1(const GP_Context *src, + GP_Context *dst, + GP_ProgressCallback *callback); +------------------------------------------------------------------------------- + +Same as above but the source is any pixel type and the result is stored into +1-bit Grayscale. + +Example Images +^^^^^^^^^^^^^^ +All following images were generated using 'grinder'. +(Click for bigger size) + +.Original Image; 1-bit, 2-bit, 4-bit Grayscale; 1-bit, 2-bit, 3-bit RGB +image:images/dither/lenna_small.png[ + "Original Image", + link="images/dither/lenna.png"] +image:images/dither/lenna_G1_small.png[ + "1-bit Grayscale", + link="images/dither/lenna_G1.png"] +image:images/dither/lenna_G2_small.png[ + "2-bit Grayscale", + link="images/dither/lenna_G2.png"] +image:images/dither/lenna_G4_small.png[ + "4-bit Grayscale", + link="images/dither/lenna_G4.png"] +image:images/dither/lenna_RGB111_small.png[ + "1-bit RGB", + link="images/dither/lenna_RGB111.png"] +image:images/dither/lenna_RGB222_small.png[ + "2-bit RGB", + link="images/dither/lenna_RGB222.png"] +image:images/dither/lenna_RGB333_small.png[ + "3-bit RGB", + link="images/dither/lenna_RGB333.png"] + diff --git a/doc/images/dither/lenna.png b/doc/images/dither/lenna.png new file mode 100644 index 0000000..475bc7a Binary files /dev/null and b/doc/images/dither/lenna.png differ diff --git a/doc/images/dither/lenna_G1.png b/doc/images/dither/lenna_G1.png new file mode 100644 index 0000000..9f0e2c4 Binary files /dev/null and b/doc/images/dither/lenna_G1.png differ diff --git a/doc/images/dither/lenna_G1_small.png b/doc/images/dither/lenna_G1_small.png new file mode 100644 index 0000000..0083f5d Binary files /dev/null and b/doc/images/dither/lenna_G1_small.png differ diff --git a/doc/images/dither/lenna_G2.png b/doc/images/dither/lenna_G2.png new file mode 100644 index 0000000..8854b47 Binary files /dev/null and b/doc/images/dither/lenna_G2.png differ diff --git a/doc/images/dither/lenna_G2_small.png b/doc/images/dither/lenna_G2_small.png new file mode 100644 index 0000000..3c43f97 Binary files /dev/null and b/doc/images/dither/lenna_G2_small.png differ diff --git a/doc/images/dither/lenna_G4.png b/doc/images/dither/lenna_G4.png new file mode 100644 index 0000000..207f703 Binary files /dev/null and b/doc/images/dither/lenna_G4.png differ diff --git a/doc/images/dither/lenna_G4_small.png b/doc/images/dither/lenna_G4_small.png new file mode 100644 index 0000000..f5017c5 Binary files /dev/null and b/doc/images/dither/lenna_G4_small.png differ diff --git a/doc/images/dither/lenna_RGB111.png b/doc/images/dither/lenna_RGB111.png new file mode 100644 index 0000000..732ba24 Binary files /dev/null and b/doc/images/dither/lenna_RGB111.png differ diff --git a/doc/images/dither/lenna_RGB111_small.png b/doc/images/dither/lenna_RGB111_small.png new file mode 100644 index 0000000..759ab88 Binary files /dev/null and b/doc/images/dither/lenna_RGB111_small.png differ diff --git a/doc/images/dither/lenna_RGB222.png b/doc/images/dither/lenna_RGB222.png new file mode 100644 index 0000000..9d91a5e Binary files /dev/null and b/doc/images/dither/lenna_RGB222.png differ diff --git a/doc/images/dither/lenna_RGB222_small.png b/doc/images/dither/lenna_RGB222_small.png new file mode 100644 index 0000000..92a03d2 Binary files /dev/null and b/doc/images/dither/lenna_RGB222_small.png differ diff --git a/doc/images/dither/lenna_RGB333.png b/doc/images/dither/lenna_RGB333.png new file mode 100644 index 0000000..7b2d4c9 Binary files /dev/null and b/doc/images/dither/lenna_RGB333.png differ diff --git a/doc/images/dither/lenna_RGB333_small.png b/doc/images/dither/lenna_RGB333_small.png new file mode 100644 index 0000000..45f62c9 Binary files /dev/null and b/doc/images/dither/lenna_RGB333_small.png differ diff --git a/doc/images/dither/lenna_small.png b/doc/images/dither/lenna_small.png new file mode 100644 index 0000000..ad258a1 Binary files /dev/null and b/doc/images/dither/lenna_small.png differ ----------------------------------------------------------------------- Summary of changes: doc/filters.txt | 68 ++++++++++++++++++++++++++++++ doc/images/dither/lenna.png | Bin 0 -> 394244 bytes doc/images/dither/lenna_G1.png | Bin 0 -> 44134 bytes doc/images/dither/lenna_G1_small.png | Bin 0 -> 11690 bytes doc/images/dither/lenna_G2.png | Bin 0 -> 69665 bytes doc/images/dither/lenna_G2_small.png | Bin 0 -> 18380 bytes doc/images/dither/lenna_G4.png | Bin 0 -> 92560 bytes doc/images/dither/lenna_G4_small.png | Bin 0 -> 26452 bytes doc/images/dither/lenna_RGB111.png | Bin 0 -> 109889 bytes doc/images/dither/lenna_RGB111_small.png | Bin 0 -> 27757 bytes doc/images/dither/lenna_RGB222.png | Bin 0 -> 162688 bytes doc/images/dither/lenna_RGB222_small.png | Bin 0 -> 41646 bytes doc/images/dither/lenna_RGB333.png | Bin 0 -> 196644 bytes doc/images/dither/lenna_RGB333_small.png | Bin 0 -> 52995 bytes doc/images/dither/lenna_small.png | Bin 0 -> 116129 bytes include/filters/GP_Dither.h | 8 ++- libs/filters/GP_Dither.c | 9 +++- 17 files changed, 79 insertions(+), 6 deletions(-) create mode 100644 doc/images/dither/lenna.png create mode 100644 doc/images/dither/lenna_G1.png create mode 100644 doc/images/dither/lenna_G1_small.png create mode 100644 doc/images/dither/lenna_G2.png create mode 100644 doc/images/dither/lenna_G2_small.png create mode 100644 doc/images/dither/lenna_G4.png create mode 100644 doc/images/dither/lenna_G4_small.png create mode 100644 doc/images/dither/lenna_RGB111.png create mode 100644 doc/images/dither/lenna_RGB111_small.png create mode 100644 doc/images/dither/lenna_RGB222.png create mode 100644 doc/images/dither/lenna_RGB222_small.png create mode 100644 doc/images/dither/lenna_RGB333.png create mode 100644 doc/images/dither/lenna_RGB333_small.png create mode 100644 doc/images/dither/lenna_small.png repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch master updated: 2c010bf3f32376abf437e23b4edf4735adb1f957
by metan 14 Nov '11

14 Nov '11

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 2c010bf3f32376abf437e23b4edf4735adb1f957 (commit) from 024061fd56190b6434c9b74a25a19374ca4c02c8 (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/2c010bf3f32376abf437e23b4edf4735adb1… commit 2c010bf3f32376abf437e23b4edf4735adb1f957 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon Nov 14 00:28:38 2011 +0100 grinder: Add progress callback for image loading too. diff --git a/demos/grinder/grinder.c b/demos/grinder/grinder.c index 0122417..858b2a6 100644 --- a/demos/grinder/grinder.c +++ b/demos/grinder/grinder.c @@ -35,7 +35,7 @@ static const char *progress_prefix = NULL; static int show_progress(GP_ProgressCallback *self) { - fprintf(stderr, "rFilter %s %3.2f%%", + fprintf(stderr, "r%s %3.2f%%", progress_prefix, self->percentage); return 0; @@ -502,8 +502,11 @@ static void apply_filters(GP_Context **src) GP_RetCode ret; for (i = 0; i < filter_cnt; i++) { - - progress_prefix = filters[i]->name; + char buf[255]; + + snprintf(buf, sizeof(buf), "Filter %s", filters[i]->name); + + progress_prefix = buf; if ((ret = filters[i]->apply(src, filter_params[i]))) { fprintf(stderr, "Error: %sn", GP_RetCodeName(ret)); @@ -606,11 +609,16 @@ int main(int argc, char *argv[]) snprintf(buf, sizeof(buf), "out_%i.ppm", i - optind + 1); fprintf(stderr, "Processing '%s' -> '%s'n", argv[i], buf); - if ((ret = GP_LoadImage(argv[i], &bitmap, NULL))) { + progress_prefix = "Loading image"; + + if ((ret = GP_LoadImage(argv[i], &bitmap, progress_callback))) { fprintf(stderr, "Failed to load bitmap: %sn", GP_RetCodeName(ret)); return 1; } + + if (progress_callback != NULL) + fprintf(stderr, " donen"); apply_filters(&bitmap); ----------------------------------------------------------------------- Summary of changes: demos/grinder/grinder.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch master updated: 024061fd56190b6434c9b74a25a19374ca4c02c8
by metan 13 Nov '11

13 Nov '11

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 024061fd56190b6434c9b74a25a19374ca4c02c8 (commit) from 9c29fb0086bf7531c018827337848b9ba5681242 (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/024061fd56190b6434c9b74a25a19374ca4c… commit 024061fd56190b6434c9b74a25a19374ca4c02c8 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun Nov 13 23:51:09 2011 +0100 filters: Dithering from RGB888 to any pixel, enjoy! diff --git a/demos/grinder/grinder.c b/demos/grinder/grinder.c index 2f8596a..0122417 100644 --- a/demos/grinder/grinder.c +++ b/demos/grinder/grinder.c @@ -361,16 +361,48 @@ static GP_RetCode blur(GP_Context **c, const char *params) /* dithering */ +//TODO: this should be generated +static const char *dither_formats[] = { + "g1", + "g2", + "g4", + "g8", + "rgb333", + "rgb565", + "rgb666", +}; + +static const GP_PixelType dither_pixel_types[] = { + GP_PIXEL_G1, + GP_PIXEL_G2, + GP_PIXEL_G4, + GP_PIXEL_G8, + GP_PIXEL_xRGB7333, + GP_PIXEL_RGB565, + GP_PIXEL_RGB666, +}; + static struct param dither_params[] = { + {"format", PARAM_ENUM, "pixel type to be used", dither_formats, NULL}, {NULL, 0, NULL, NULL, NULL} }; static GP_RetCode dither(GP_Context **c, const char *params) { - if (param_parse(params, dither_params, "dither", param_err)) + int fmt = -1; + + if (param_parse(params, dither_params, "dither", param_err, &fmt)) + return GP_EINVAL; + + if (fmt == -1) { + print_error("dither: invalid format or format param missing"); return GP_EINVAL; + } - GP_Context *bw = GP_FilterFloydSteinberg(*c, NULL, progress_callback); + GP_Context *bw; + bw = GP_FilterFloydSteinberg_from_RGB888(*c, NULL, + dither_pixel_types[fmt], + progress_callback); //TODO: so far we convert the context back to RGB888 //(so we can do further work with it) diff --git a/gfxprim_config.py b/gfxprim_config.py index d0de8d1..2876af0 100644 --- a/gfxprim_config.py +++ b/gfxprim_config.py @@ -76,6 +76,14 @@ config = GfxPrimConfig( ('R', 12, 6), ('G', 6, 6), ('B', 0, 6)]), + + # + # Added for dithering tests + # + PixelType(name='xRGB7333', pixelsize=PS_16BPP, chanslist=[ + ('R', 6, 3), + ('G', 3, 3), + ('B', 0, 3)]), # # Palette types # diff --git a/include/filters/GP_Dither.h b/include/filters/GP_Dither.h index 37fac43..3ecf7bf 100644 --- a/include/filters/GP_Dither.h +++ b/include/filters/GP_Dither.h @@ -32,9 +32,31 @@ #include "GP_Filter.h" /* - * Experimental Floyd Steinberg that coverts any pixel type to G1 + * Floyd Steinberg */ -GP_Context *GP_FilterFloydSteinberg(const GP_Context *src, GP_Context *dst, - GP_ProgressCallback *callback); +GP_Context *GP_FilterFloydSteinberg_to_G1(const GP_Context *src, GP_Context *dst, + GP_ProgressCallback *callback); + +/* + * Floyd Steinberg + */ +GP_Context *GP_FilterFloydSteinberg_from_RGB888(const GP_Context *src, GP_Context *dst, + GP_PixelType pixel_type, + GP_ProgressCallback *callback); + +/* + * Converts RGB888 to RGB or Grayscale bitmap. + */ +int GP_FilterFloydSteinberg_RGB888_to_XXX_Raw(const GP_Context *src, + GP_Context *dst, + GP_ProgressCallback *callback); + +/* + * Converts any bitmap to 1-bit Grayscale. + */ +int GP_FilterFloydSteinberg_XXX_to_G1_Raw(const GP_Context *src, + GP_Context *dst, + GP_ProgressCallback *callback); + #endif /* FILTERS_GP_DITHER_H */ diff --git a/libs/filters/GP_Dither.c b/libs/filters/GP_Dither.c index ffe7354..84932ec 100644 --- a/libs/filters/GP_Dither.c +++ b/libs/filters/GP_Dither.c @@ -22,40 +22,31 @@ #include "core/GP_Core.h" #include "core/GP_FnPerBpp.h" +#include "core/GP_Pixel.h" #include "GP_Dither.h" #include <string.h> -static void print_err(float *d, int size) -{ - int i; - - printf("["); - - for (i = 0; i < size; i++) - printf("%2.2f, ", d[i]); - - printf("]n"); -} - /* * Experimental Floyd Steinberg XXX -> G1 */ -int GP_FilterFloydSteinberg_Raw(const GP_Context *src, GP_Context *dst, - GP_ProgressCallback *callback) +int GP_FilterFloydSteinberg_to_G1_Raw(const GP_Context *src, GP_Context *dst, + GP_ProgressCallback *callback) { float errors[2][src->w]; - GP_DEBUG(1, "Floyd Steiberg %ux%u", src->w, src->h); + GP_DEBUG(1, "Floyd Steinberg %s to %s size %ux%u", + GP_PixelTypeName(src->pixel_type), + GP_PixelTypeName(GP_PIXEL_G1), src->w, src->h); GP_Coord x, y; memset(errors[0], 0, src->w * sizeof(float)); memset(errors[1], 0, src->w * sizeof(float)); - for (y = 0; y < src->h; y++) { - for (x = 0; x < src->w; x++) { + for (y = 0; y < (GP_Coord)src->h; y++) { + for (x = 0; x < (GP_Coord)src->w; x++) { GP_Pixel pix = GP_GetPixel(src, x, y); float val = GP_ConvertPixel(pix, src->pixel_type, GP_PIXEL_G8); @@ -71,7 +62,7 @@ int GP_FilterFloydSteinberg_Raw(const GP_Context *src, GP_Context *dst, GP_PutPixel_Raw_1BPP_LE(dst, x, y, 0); } - if (x + 1 < src->w) + if (x + 1 < (GP_Coord)src->w) errors[y%2][x+1] += 7 * err / 16; if (x > 1) @@ -79,21 +70,22 @@ int GP_FilterFloydSteinberg_Raw(const GP_Context *src, GP_Context *dst, errors[!(y%2)][x] += 5 * err / 16; - if (x + 1 < src->w) + if (x + 1 < (GP_Coord)src->w) errors[!(y%2)][x+1] += err / 16; } memset(errors[y%2], 0, src->w * sizeof(float)); - // if (GP_ProgressCallbackReport(callback, 2 * y, src->h, src->w)) - // return 1; + + if (GP_ProgressCallbackReport(callback, y, src->h, src->w)) + return 1; } -// GP_ProgressCallbackDone(callback); + GP_ProgressCallbackDone(callback); return 0; } -GP_Context *GP_FilterFloydSteinberg(const GP_Context *src, GP_Context *dst, - GP_ProgressCallback *callback) +GP_Context *GP_FilterFloydSteinberg_to_G1(const GP_Context *src, GP_Context *dst, + GP_ProgressCallback *callback) { GP_Context *ret = dst; @@ -106,7 +98,31 @@ GP_Context *GP_FilterFloydSteinberg(const GP_Context *src, GP_Context *dst, } } - if (GP_FilterFloydSteinberg_Raw(src, ret, callback)) { + if (GP_FilterFloydSteinberg_to_G1_Raw(src, ret, callback)) { + if (dst == NULL) + free(ret); + return NULL; + } + + return ret; +} + +GP_Context *GP_FilterFloydSteinberg_from_RGB888(const GP_Context *src, GP_Context *dst, + GP_PixelType pixel_type, + GP_ProgressCallback *callback) +{ + GP_Context *ret = dst; + + if (ret == NULL) { + ret = GP_ContextAlloc(src->w, src->h, pixel_type); + + if (ret == NULL) { + GP_DEBUG(1, "Malloc failed :("); + return NULL; + } + } + + if (GP_FilterFloydSteinberg_RGB888_to_XXX_Raw(src, ret, callback)) { if (dst == NULL) free(ret); return NULL; diff --git a/libs/filters/GP_Dither.gen.c.t b/libs/filters/GP_Dither.gen.c.t new file mode 100644 index 0000000..8b9e237 --- /dev/null +++ b/libs/filters/GP_Dither.gen.c.t @@ -0,0 +1,120 @@ + +%% extends "base.c.t" + +%% block descr +Floyd Steinberg dithering RGB888 -> any pixel +%% endblock + +%% block body + +#include "core/GP_Core.h" +#include "core/GP_Pixel.h" +#include "GP_Filter.h" + +#include <string.h> + +%% macro distribute_error(errors, x, y, w, err) + if ({{ x }} + 1 < {{ w }}) + {{ errors }}[{{ y }}%2][{{ x }}+1] += 7 * {{ err }} / 16; + + if ({{ x }} > 1) + {{ errors }}[!({{ y }}%2)][{{ x }}-1] += 3 * {{ err }} / 16; + + {{ errors }}[!({{ y }}%2)][{{ x }}] += 5 * {{ err }} / 16; + + if ({{ x }} + 1 < {{ w }}) + {{ errors }}[!({{ y }}%2)][{{ x }}+1] += {{ err }} / 16; +%% endmacro + +%% for pt in pixeltypes +%% if not pt.is_unknown() and not pt.is_alpha() and not pt.is_palette() +/* + * Floyd Steinberg RGB888 to {{ pt.name }} + */ +int GP_FilterFloydSteinberg_RGB888_to_{{ pt.name }}_Raw(const GP_Context *src, GP_Context *dst, + GP_ProgressCallback *callback) +{ +%% for c in pt.chanslist + float errors_{{ c[0] }}[2][src->w]; +%% endfor + + GP_DEBUG(1, "Floyd Steinberg %s to %s %ux%u", + GP_PixelTypeName(src->pixel_type), + GP_PixelTypeName(GP_PIXEL_{{ pt.name }}), + src->w, src->h); + + GP_Coord x, y; + +%% for c in pt.chanslist + memset(errors_{{ c[0] }}[0], 0, src->w * sizeof(float)); + memset(errors_{{ c[0] }}[1], 0, src->w * sizeof(float)); +%% endfor + + for (y = 0; y < (GP_Coord)src->h; y++) { + for (x = 0; x < (GP_Coord)src->w; x++) { + GP_Pixel pix = GP_GetPixel(src, x, y); + +%% for c in pt.chanslist +%% if pt.is_gray() + float val_{{ c[0] }} = GP_Pixel_GET_R_RGB888(pix) + + GP_Pixel_GET_G_RGB888(pix) + + GP_Pixel_GET_B_RGB888(pix); +%% else + float val_{{ c[0] }} = GP_Pixel_GET_{{ c[0] }}_RGB888(pix); +%% endif + val_{{ c[0] }} += errors_{{ c[0] }}[y%2][x]; + + float err_{{ c[0] }} = val_{{ c[0] }}; + +%% if pt.is_gray() + GP_Pixel res_{{ c[0] }} = {{ 2 ** c[2] - 1}} * val_{{ c[0] }} / (3 * 255); + err_{{ c[0] }} -= res_{{ c[0] }} * (3 * 255) / {{ 2 ** c[2] - 1}}; +%% else + GP_Pixel res_{{ c[0] }} = {{ 2 ** c[2] - 1}} * val_{{ c[0] }} / 255; + err_{{ c[0] }} -= res_{{ c[0] }} * 255 / {{ 2 ** c[2] - 1}}; +%% endif + +{{ distribute_error("errors_%s"|format(c[0]), 'x', 'y', '(GP_Coord)src->w', 'err_%s'|format(c[0])) }} +%% endfor + +%% if pt.is_gray() + GP_PutPixel_Raw_{{ pt.pixelsize.suffix }}(dst, x, y, res_V); +%% else + GP_Pixel res = GP_Pixel_CREATE_{{ pt.name }}(res_{{ pt.chanslist[0][0] }}{% for c in pt.chanslist[1:] %}, res_{{ c[0] }}{% endfor %}); + + GP_PutPixel_Raw_{{ pt.pixelsize.suffix }}(dst, x, y, res); +%% endif + } + +%% for c in pt.chanslist + memset(errors_{{ c[0] }}[y%2], 0, src->w * sizeof(float)); +%% endfor + + if (GP_ProgressCallbackReport(callback, y, src->h, src->w)) + return 1; + } + + GP_ProgressCallbackDone(callback); + return 0; +} + +%% endif +%% endfor + +int GP_FilterFloydSteinberg_RGB888_to_XXX_Raw(const GP_Context *src, + GP_Context *dst, + GP_ProgressCallback *callback) +{ + switch (dst->pixel_type) { +%% for pt in pixeltypes +%% if not pt.is_unknown() and not pt.is_alpha() and not pt.is_palette() + case GP_PIXEL_{{ pt.name }}: + return GP_FilterFloydSteinberg_RGB888_to_{{ pt.name }}_Raw(src, dst, callback); +%% endif +%% endfor + default: + return 1; + } +} + +%% endblock body diff --git a/libs/filters/Makefile b/libs/filters/Makefile index 8133fb0..1608647 100644 --- a/libs/filters/Makefile +++ b/libs/filters/Makefile @@ -1,6 +1,6 @@ TOPDIR=../.. GENSOURCES=GP_Brightness.gen.c GP_Contrast.gen.c GP_Invert.gen.c- GP_MirrorV.gen.c GP_Rotate.gen.c + GP_MirrorV.gen.c GP_Rotate.gen.c GP_Dither.gen.c GENHEADERS= CSOURCES=$(filter-out $(wildcard *.gen.c),$(wildcard *.c)) LIBNAME=filters ----------------------------------------------------------------------- Summary of changes: demos/grinder/grinder.c | 36 +++++++++++- gfxprim_config.py | 8 +++ include/filters/GP_Dither.h | 28 ++++++++- libs/filters/GP_Dither.c | 66 ++++++++++++++-------- libs/filters/GP_Dither.gen.c.t | 120 ++++++++++++++++++++++++++++++++++++++++ libs/filters/Makefile | 2 +- 6 files changed, 229 insertions(+), 31 deletions(-) create mode 100644 libs/filters/GP_Dither.gen.c.t 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