April 2012 - Gfxprim

[repo.or.cz] gfxprim.git branch master updated: 96ac55e75beb4dd1f167ef34b5e9bad72f71c3aa
by metan 07 Apr '12

07 Apr '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 96ac55e75beb4dd1f167ef34b5e9bad72f71c3aa (commit) via e622362b6290f603262c9b2323a559bad85517d5 (commit) from a9124caa3f7c756fc3c7bdba6ffadd4307222454 (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/96ac55e75beb4dd1f167ef34b5e9bad72f71… commit 96ac55e75beb4dd1f167ef34b5e9bad72f71c3aa Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat Apr 7 20:06:04 2012 +0200 build: Now the libSDL less build actually works. diff --git a/tests/SDL/Makefile b/tests/SDL/Makefile index 529dd83..436b8b3 100644 --- a/tests/SDL/Makefile +++ b/tests/SDL/Makefile @@ -1,16 +1,16 @@ TOPDIR=../.. - -CSOURCES=$(shell echo *.c) +include $(TOPDIR)/pre.mk INCLUDE=core gfx SDL backends LDLIBS+=-lGP -L$(TOPDIR)/build/ -lGP_SDL -lSDL ifeq ($(HAVE_LIBSDL),yes) +CSOURCES=$(shell echo *.c) + APPS=pixeltest fileview fonttest linetest randomshapetest shapetest sierpinsky symbolstest textaligntest trianglefps input blittest subcontext showimage aatest mixpixeltest endif -include $(TOPDIR)/pre.mk include $(TOPDIR)/app.mk include $(TOPDIR)/post.mk http://repo.or.cz/w/gfxprim.git/commit/e622362b6290f603262c9b2323a559bad855… commit e622362b6290f603262c9b2323a559bad85517d5 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat Apr 7 20:04:14 2012 +0200 build: include config.mk in pre.mk. diff --git a/post.mk b/post.mk index fd95b0a..bafd7fb 100644 --- a/post.mk +++ b/post.mk @@ -26,8 +26,6 @@ help: @echo "'VERBOSE' shell variable as 'VERBOSE=1 make'" @echo "" -include $(TOPDIR)/config.mk - # # Determine mode (eg do not generate anything if not in compile mode # diff --git a/pre.mk b/pre.mk index b815a42..3a935a0 100644 --- a/pre.mk +++ b/pre.mk @@ -1 +1,3 @@ all: compile + +include $(TOPDIR)/config.mk ----------------------------------------------------------------------- Summary of changes: post.mk | 2 -- pre.mk | 2 ++ tests/SDL/Makefile | 6 +++--- 3 files changed, 5 insertions(+), 5 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: a9124caa3f7c756fc3c7bdba6ffadd4307222454
by metan 07 Apr '12

07 Apr '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 a9124caa3f7c756fc3c7bdba6ffadd4307222454 (commit) via 1a1deab3f85d569bdac0c221b1924c1080b6c054 (commit) via ad9c55f95d4a092aa12b9212294d87d2d57b29ae (commit) via 5b78a3437eb7f15c79b8add4a1deffc57a67839d (commit) from 8c1e7985a175989be85334919aac053c290933a3 (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/a9124caa3f7c756fc3c7bdba6ffadd430722… commit a9124caa3f7c756fc3c7bdba6ffadd4307222454 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat Apr 7 20:00:28 2012 +0200 build: Don't build SDL tests when SDL is not available. diff --git a/tests/SDL/Makefile b/tests/SDL/Makefile index 7c91120..529dd83 100644 --- a/tests/SDL/Makefile +++ b/tests/SDL/Makefile @@ -5,9 +5,11 @@ CSOURCES=$(shell echo *.c) INCLUDE=core gfx SDL backends LDLIBS+=-lGP -L$(TOPDIR)/build/ -lGP_SDL -lSDL +ifeq ($(HAVE_LIBSDL),yes) APPS=pixeltest fileview fonttest linetest randomshapetest shapetest sierpinsky symbolstest textaligntest trianglefps input blittest subcontext showimage aatest mixpixeltest +endif include $(TOPDIR)/pre.mk include $(TOPDIR)/app.mk http://repo.or.cz/w/gfxprim.git/commit/1a1deab3f85d569bdac0c221b1924c1080b6… commit 1a1deab3f85d569bdac0c221b1924c1080b6c054 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat Apr 7 19:59:57 2012 +0200 build: Allow for empty APP in app.mk. diff --git a/app.mk b/app.mk index d852703..c743505 100644 --- a/app.mk +++ b/app.mk @@ -1,7 +1,3 @@ -ifndef APPS -$(error APPS not defined, fix your library Makefile) -endif - LDLIBS+=-lm -ldl ALL+=$(APPS) http://repo.or.cz/w/gfxprim.git/commit/ad9c55f95d4a092aa12b9212294d87d2d57b… commit ad9c55f95d4a092aa12b9212294d87d2d57b29ae Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat Apr 7 19:51:00 2012 +0200 configure: Propagage HAVE_LIBFOO into config.gen.mk too. diff --git a/configure b/configure index 51840ea..f26c95e 100755 --- a/configure +++ b/configure @@ -124,8 +124,12 @@ class libraries: # def write_config_mk(self, f): for i in self.libraries: + f.write("# %s - %sn" % (i[0], i[1])) if self.results[i[0]]: - f.write("# %snCFLAGS+=%snLDFLAGS+=%sn" % (i[0], i[3], i[4])) + f.write("HAVE_%s=yesn" % i[0].upper()) + f.write("CFLAGS+=%snLDFLAGS+=%sn" % (i[3], i[4])) + else: + f.write("HAVE_%s=non" % i[0].upper()) def basic_checks(cfg): sys.stderr.write("Basic checksn") http://repo.or.cz/w/gfxprim.git/commit/5b78a3437eb7f15c79b8add4a1deffc57a67… commit 5b78a3437eb7f15c79b8add4a1deffc57a67839d Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat Apr 7 19:38:52 2012 +0200 configure: reformat the code to use 4 spaces. diff --git a/configure b/configure index 60d6e14..51840ea 100755 --- a/configure +++ b/configure @@ -1,220 +1,222 @@ #!/usr/bin/env python # -# This is simple script to detect libraries and configure -# standard features. +# 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 '%s' ... " % fpath) - - try: - st = os.stat(fpath) - sys.stderr.write("Yesn") - return True - except os.error: - sys.stderr.write("Non") - return False + fpath = cfg['include_path'][0] + '/' + filename + + sys.stderr.write("Checking for '%s' ... " % 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 '%s' | %s -x c -o /dev/null - > /dev/null 2>&1" % (code, cfg["CC"][0])) - - if ret: - sys.stderr.write("Non") - return False - else: - sys.stderr.write("Yesn") - return True + sys.stderr.write(msg) + + ret = os.system("echo '%s' | %s -x c -o /dev/null - > /dev/null 2>&1" % + (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 (%s) ... " % cfg["CC"][0]) + return c_try_compile(cfg, "int main(void) { return 0; }", + "Checking for working compiler (%s) ... " % + cfg["CC"][0]) def python_module_installed(cfg, module): - sys.stderr.write("Checking for python module %s ... " % module) + sys.stderr.write("Checking for python module %s ... " % module) - ret = os.system("echo 'import %s' | %s > /dev/null 2>&1" % (module, cfg['PYTHON_BIN'][0])) + ret = os.system("echo 'import %s' | %s > /dev/null 2>&1" % + (module, cfg['PYTHON_BIN'][0])) - if ret: - sys.stderr.write('Non') - return False - else: - sys.stderr.write('Yesn') - return True + if ret: + sys.stderr.write('Non') + return False + else: + sys.stderr.write('Yesn') + return True def check_for_swig(cfg): - sys.stderr.write("Checking for working swig ... ") + sys.stderr.write("Checking for working swig ... ") - ret = os.system("%s -version > /dev/null 2>&1" % cfg['SWIG'][0]) + ret = os.system("%s -version > /dev/null 2>&1" % cfg['SWIG'][0]) - if ret: - sys.stderr.write('Non') - cfg['SWIG'][0] = '' - else: - sys.stderr.write("Yesn") + if ret: + sys.stderr.write('Non') + cfg['SWIG'][0] = '' + else: + sys.stderr.write("Yesn") # # 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("%10s" % i[0]) - - if (self.results[i[0]]): - sys.stderr.write(" : Enabledn") - else: - sys.stderr.write(" : Disabledn") - - sys.stderr.write(" - %snn" % 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 '%s'n" % 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_config_h(self, f): - for i in self.libraries: - f.write("/*n * %sn */n" % i[1]) - if self.results[i[0]]: - f.write("#define HAVE_%sn" % i[0].upper()) - else: - f.write("//#define HAVE_%sn" % i[0].upper()) - f.write("n") - - # - # Writes LDFLAGS and CFLAGS into passed file - # - def write_config_mk(self, f): - for i in self.libraries: - if self.results[i[0]]: - f.write("# %snCFLAGS+=%snLDFLAGS+=%sn" % (i[0], i[3], i[4])) + 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("%10s" % i[0]) + + if (self.results[i[0]]): + sys.stderr.write(" : Enabledn") + else: + sys.stderr.write(" : Disabledn") + + sys.stderr.write(" - %snn" % 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 '%s'n" % 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_config_h(self, f): + for i in self.libraries: + f.write("/*n * %sn */n" % i[1]) + if self.results[i[0]]: + f.write("#define HAVE_%sn" % i[0].upper()) + else: + f.write("//#define HAVE_%sn" % i[0].upper()) + f.write("n") + + # + # Writes LDFLAGS and CFLAGS into passed file + # + def write_config_mk(self, f): + for i in self.libraries: + if self.results[i[0]]: + f.write("# %snCFLAGS+=%snLDFLAGS+=%sn" % (i[0], i[3], i[4])) 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) - check_for_swig(cfg) - sys.stderr.write("n") + 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) + check_for_swig(cfg) + 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_config_h(f); - f.write("#endif /* CONFIG_H */n"); - sys.stderr.write("Config 'config.h' writtenn") - f.close() + f = open("config.h", "w") + f.write("#ifndef CONFIG_Hn#define CONFIG_Hnn") + libs.write_config_h(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("# %sn%s=%sn" % (cfg[i][1], i, cfg[i][0])) - libs.write_config_mk(f); - f.close() - sys.stderr.write("Config 'config.gen.mk' writtenn") + f = open('config.gen.mk', 'w') + for i in cfg: + f.write("# %sn%s=%sn" % (cfg[i][1], i, cfg[i][0])) + libs.write_config_mk(f); + 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 -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']} - - # - # Library detection/enable disable - # - # name, description, [detection], cflags, ldflags - # - l = libraries([["libpng", - "Portable Network Graphics Library", - [header_exists, "png.h"], "", "-lpng"], - ["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"], "", "-ljpeg"], - ["freetype", - "A high-quality and portable font engine", - [header_exists, "ft2build.h"], "", "`freetype-config --libs`"]], 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); + # + # Dictionary for default configuration parameters + # + cfg = {'CC' : ['gcc', 'Path/name of the C compiler'], + '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']} + + # + # Library detection/enable disable + # + # name, description, [detection], cflags, ldflags + # + l = libraries([["libpng", + "Portable Network Graphics Library", + [header_exists, "png.h"], "", "-lpng"], + ["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"], "", "-ljpeg"], + ["freetype", + "A high-quality and portable font engine", + [header_exists, "ft2build.h"], "", "`freetype-config --libs`"]], 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: app.mk | 4 - configure | 374 ++++++++++++++++++++++++++-------------------------- tests/SDL/Makefile | 2 + 3 files changed, 192 insertions(+), 188 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: 8c1e7985a175989be85334919aac053c290933a3
by metan 07 Apr '12

07 Apr '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 8c1e7985a175989be85334919aac053c290933a3 (commit) from 8bb3b493c0a89be19912de69a505e78708f98b19 (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/8c1e7985a175989be85334919aac053c2909… commit 8c1e7985a175989be85334919aac053c290933a3 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat Apr 7 19:31:15 2012 +0200 demos: Add simple ttf font demo. diff --git a/demos/Makefile b/demos/Makefile index 3198465..1d61deb 100644 --- a/demos/Makefile +++ b/demos/Makefile @@ -1,3 +1,3 @@ TOPDIR=.. -SUBDIRS=grinder spiv particle +SUBDIRS=grinder spiv particle ttf2img include $(TOPDIR)/post.mk diff --git a/demos/ttf2img/Makefile b/demos/ttf2img/Makefile new file mode 100644 index 0000000..aab67a7 --- /dev/null +++ b/demos/ttf2img/Makefile @@ -0,0 +1,12 @@ +TOPDIR=../.. + +CSOURCES=$(shell echo *.c) + +INCLUDE= +LDLIBS+=-lGP -L$(TOPDIR)/build/ + +APPS=ttf2img + +include $(TOPDIR)/pre.mk +include $(TOPDIR)/app.mk +include $(TOPDIR)/post.mk diff --git a/demos/ttf2img/runtest.sh b/demos/ttf2img/runtest.sh new file mode 100755 index 0000000..0794707 --- /dev/null +++ b/demos/ttf2img/runtest.sh @@ -0,0 +1,9 @@ +#!/bin/bash +# +# Run dynamically linked test. +# + +PROG="$1" +shift + +LD_LIBRARY_PATH=../../build/ ./$PROG "$@" diff --git a/demos/ttf2img/ttf2img.c b/demos/ttf2img/ttf2img.c new file mode 100644 index 0000000..0dea1fe --- /dev/null +++ b/demos/ttf2img/ttf2img.c @@ -0,0 +1,96 @@ +/***************************************************************************** + * 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> * + * * + *****************************************************************************/ + + /* + + Uses gfxprim to render small image with defined string. + + */ + +#include <GP.h> + +static const char help[] = { + "usage: ttf2img -f font.ttf -i file.png -s string [-d debug_level]n", +}; + +static void print_help(int i) +{ + fputs(help, stderr); + exit(i); +} + +int main(int argc, char *argv[]) +{ + const char *font_path = NULL; + const char *img_path = NULL; + const char *string = "Foo Bar!"; + int opt, debug_level = 0; + int img_w = 400, img_h = 100; + + while ((opt = getopt(argc, argv, "d:f:i:s:")) != -1) { + switch (opt) { + case 'f': + font_path = optarg; + break; + case 'i': + img_path = optarg; + break; + case 'd': + debug_level = atoi(optarg); + break; + case 'h': + print_help(0); + break; + case 's': + string = optarg; + break; + default: + fprintf(stderr, "Invalid paramter '%c'n", opt); + print_help(1); + } + } + + if (font_path == NULL || img_path == NULL) + print_help(1); + + GP_SetDebugLevel(debug_level); + + GP_Context *context = GP_ContextAlloc(img_w, img_h, GP_PIXEL_RGB888); + + GP_Pixel black_pixel = GP_ColorToContextPixel(GP_COL_BLACK, context); + GP_Pixel white_pixel = GP_ColorToContextPixel(GP_COL_WHITE, context); + + GP_Fill(context, white_pixel); + + GP_TextStyle style = GP_DEFAULT_TEXT_STYLE; + + style.font = GP_FontFaceLoad(font_path, 27, 0); + + GP_Text(context, &style, img_w/2, img_h/2, GP_ALIGN_CENTER|GP_VALIGN_CENTER, + black_pixel, white_pixel, string); + + GP_SavePNG(img_path, context, NULL); + + GP_ContextFree(context); + + return 0; +} ----------------------------------------------------------------------- Summary of changes: demos/Makefile | 2 +- demos/{grinder => ttf2img}/Makefile | 6 +- demos/{particle => ttf2img}/runtest.sh | 0 demos/{particle/space.h => ttf2img/ttf2img.c} | 94 +++++++++++++++---------- 4 files changed, 60 insertions(+), 42 deletions(-) copy demos/{grinder => ttf2img}/Makefile (70%) copy demos/{particle => ttf2img}/runtest.sh (100%) copy demos/{particle/space.h => ttf2img/ttf2img.c} (54%) 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: 8bb3b493c0a89be19912de69a505e78708f98b19
by metan 03 Apr '12

03 Apr '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 8bb3b493c0a89be19912de69a505e78708f98b19 (commit) from fde90a28ce68be92f54b9ca7be882ddc7eb20361 (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/8bb3b493c0a89be19912de69a505e78708f9… commit 8bb3b493c0a89be19912de69a505e78708f98b19 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Tue Apr 3 00:45:02 2012 +0200 core: Fix subcontext rotation. diff --git a/libs/core/GP_Context.c b/libs/core/GP_Context.c index ca95b46..87a44d1 100644 --- a/libs/core/GP_Context.c +++ b/libs/core/GP_Context.c @@ -161,6 +161,9 @@ GP_Context *GP_ContextSubContext(GP_Context *context, GP_Context *subcontext, GP_Coord x, GP_Coord y, GP_Size w, GP_Size h) { GP_CHECK(context, "NULL context"); + + GP_TRANSFORM_RECT(context, x, y, w, h); + GP_CHECK(context->w >= x + w, "Subcontext w out of original context."); GP_CHECK(context->h >= y + h, "Subcontext h out of original context."); ----------------------------------------------------------------------- Summary of changes: libs/core/GP_Context.c | 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