April 2012 - Gfxprim

[repo.or.cz] gfxprim.git branch master updated: 3447cc05da97de60400ac7cfbf0325e4ac84e1ad
by metan 21 Apr '12

21 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 3447cc05da97de60400ac7cfbf0325e4ac84e1ad (commit) via fb285f7f619180016cbb1bfe514dea535bef474c (commit) from b122be1293116b690cd8414d8e158aeb99910b4a (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/3447cc05da97de60400ac7cfbf0325e4ac84… commit 3447cc05da97de60400ac7cfbf0325e4ac84e1ad Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat Apr 21 12:38:49 2012 +0200 pywrap: Add simple pygtk + gfxprim example. diff --git a/demos/py_simple/pygtk_example.py b/demos/py_simple/pygtk_example.py new file mode 100755 index 0000000..e2ef4a0 --- /dev/null +++ b/demos/py_simple/pygtk_example.py @@ -0,0 +1,51 @@ +#!/usr/bin/env python + +import sys + +import pygtk +pygtk.require('2.0') +import gtk + +import gfxprim.core as core +import gfxprim.loaders as loaders +import gfxprim.filters as filters + +class HelloWorld: + def delete_event(self, widget, event, data=None): + return False + + def destroy(self, widget, data=None): + gtk.main_quit() + + def __init__(self): + self.window = gtk.Window(gtk.WINDOW_TOPLEVEL) + self.window.set_title("PyGTK Example") + self.window.connect("delete_event", self.delete_event) + self.window.connect("destroy", self.destroy) + self.window.set_border_width(1) + + self.image = gtk.Image(); + self.window.add(self.image) + + self.window.show() + self.image.show() + + img = loaders.LoadImage(sys.argv[2], None) + self.pixmap = gtk.gdk.Pixmap(None, img.w, img.h, 24) + self.gc = gtk.gdk.Drawable.new_gc(self.pixmap) + + img2 = img.Convert(core.core_c.GP_PIXEL_BGR888); + + self.pixmap.draw_rgb_image(self.gc, 0, 0, img2.w, img2.h, + gtk.gdk.RGB_DITHER_NONE, + img2._hacky_hacky_pixels_buffer()) + + self.image.set_from_pixmap(self.pixmap, None) + + + def main(self): + gtk.main() + +if __name__ == "__main__": + hello = HelloWorld() + hello.main() http://repo.or.cz/w/gfxprim.git/commit/fb285f7f619180016cbb1bfe514dea535bef… commit fb285f7f619180016cbb1bfe514dea535bef474c Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat Apr 21 12:15:47 2012 +0200 config: Add BGR888 pixel type, that's needed for interfacing other libraries. diff --git a/gfxprim_config.py b/gfxprim_config.py index 2876af0..b3eed3b 100644 --- a/gfxprim_config.py +++ b/gfxprim_config.py @@ -61,6 +61,11 @@ config = GfxPrimConfig( ('R', 16, 8), ('G', 8, 8), ('B', 0, 8)]), + + PixelType(name='BGR888', pixelsize=PS_24BPP, chanslist=[ + ('B', 16, 8), + ('G', 8, 8), + ('R', 0, 8)]), PixelType(name='RGB565', pixelsize=PS_16BPP, chanslist=[ ('R', 11, 5), ----------------------------------------------------------------------- Summary of changes: demos/py_simple/pygtk_example.py | 51 ++++++++++++++++++++++++++++++++++++++ gfxprim_config.py | 5 +++ 2 files changed, 56 insertions(+), 0 deletions(-) create mode 100755 demos/py_simple/pygtk_example.py repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch master updated: b122be1293116b690cd8414d8e158aeb99910b4a
by gavento 20 Apr '12

20 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 b122be1293116b690cd8414d8e158aeb99910b4a (commit) via 29bbc4b0bc8ad223f711517031b9bace8425e920 (commit) from 160441a217c7e9ac2c935d865ceba129b46f5260 (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/b122be1293116b690cd8414d8e158aeb9991… commit b122be1293116b690cd8414d8e158aeb99910b4a Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Fri Apr 20 17:54:48 2012 +0200 Added a simple helper to run python with GP libs And also for GP executables diff --git a/gp_run.sh b/gp_run.sh new file mode 100755 index 0000000..4c76693 --- /dev/null +++ b/gp_run.sh @@ -0,0 +1,10 @@ +#!/bin/sh + +# Very simple script to run python, ipython and GP executables + +BDIR=. + +export LD_LIBRARY_PATH=$BDIR/build/ +export PYTHONPATH=$BDIR/pylib/ + +exec "$@" http://repo.or.cz/w/gfxprim.git/commit/29bbc4b0bc8ad223f711517031b9bace8425… commit 29bbc4b0bc8ad223f711517031b9bace8425e920 Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Fri Apr 20 17:53:46 2012 +0200 Added an unsafe way to get buffer for Context pixels AND I DO NOT LIKE IT AT ALL! diff --git a/pylib/gfxprim/core/core.i b/pylib/gfxprim/core/core.i index 046481a..3668c2f 100644 --- a/pylib/gfxprim/core/core.i +++ b/pylib/gfxprim/core/core.i @@ -85,6 +85,10 @@ and self.thisown.") GP_Context; $self->w, $self->h, $self->bpp, $self->free_pixels); GP_ContextFree($self); } + PyObject *_hacky_hacky_pixels_buffer() { + GP_DEBUG(0, "Evil and dangerous _hacky_hacky_pixels_buffer() used!"); + return PyBuffer_FromMemory($self->pixels, $self->bytes_per_row * $self->h); + } }; /* Indicate new wrapper-owned GP_Context */ ----------------------------------------------------------------------- Summary of changes: gp_run.sh | 10 ++++++++++ pylib/gfxprim/core/core.i | 4 ++++ 2 files changed, 14 insertions(+), 0 deletions(-) create mode 100755 gp_run.sh 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: 160441a217c7e9ac2c935d865ceba129b46f5260
by metan 17 Apr '12

17 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 160441a217c7e9ac2c935d865ceba129b46f5260 (commit) from 2f01a11ca235142a1ab4a0bc5e9fd8d49f4c2f04 (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/160441a217c7e9ac2c935d865ceba129b46f… commit 160441a217c7e9ac2c935d865ceba129b46f5260 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Tue Apr 17 22:16:52 2012 +0200 pywrap: Swig 1.3.31 doesn't support -Wextra, remove it. diff --git a/config.mk b/config.mk index 55f6140..c65c19d 100644 --- a/config.mk +++ b/config.mk @@ -12,7 +12,7 @@ PYTHON_INCLUDE=`python-config --include` # Command to run Python with pylib/ modules PYTHON=PYTHONPATH=$$PYTHONPATH:${PYLIBSDIR} ${PYTHON_BIN} -Werror -SWIGOPTS=-Wextra -w322,314 -I/usr/include/ +SWIGOPTS=-w322,314 -I/usr/include/ # # If set to yes, rebuilds libGP* after typing make ----------------------------------------------------------------------- Summary of changes: config.mk | 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: 2f01a11ca235142a1ab4a0bc5e9fd8d49f4c2f04
by metan 17 Apr '12

17 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 2f01a11ca235142a1ab4a0bc5e9fd8d49f4c2f04 (commit) from b4f2a2519601c2f047294b39a9c72a7a6cdbd608 (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/2f01a11ca235142a1ab4a0bc5e9fd8d49f4c… commit 2f01a11ca235142a1ab4a0bc5e9fd8d49f4c2f04 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Tue Apr 17 22:06:03 2012 +0200 loaders: Fix two typos in GIF loader. diff --git a/include/loaders/GP_GIF.h b/include/loaders/GP_GIF.h index 237e74d..1eb87ff 100644 --- a/include/loaders/GP_GIF.h +++ b/include/loaders/GP_GIF.h @@ -56,6 +56,6 @@ GP_Context *GP_ReadGIF(void *f, GP_ProgressCallback *callback); /* * Does both GP_OpenGIF and GP_ReadGIF at once. */ -GP_Context *GP_LoadPNG(const char *src_path, GP_ProgressCallback *callback); +GP_Context *GP_LoadGIF(const char *src_path, GP_ProgressCallback *callback); #endif /* LOADERS_GP_GIF_H */ diff --git a/libs/loaders/GP_GIF.c b/libs/loaders/GP_GIF.c index 263a929..aa999db 100644 --- a/libs/loaders/GP_GIF.c +++ b/libs/loaders/GP_GIF.c @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, * * Boston, MA 02110-1301 USA * * * - * Copyright (C) 2009-2011 Cyril Hrubis <metan(a)ucw.cz> * + * Copyright (C) 2009-2012 Cyril Hrubis <metan(a)ucw.cz> * * * *****************************************************************************/ ----------------------------------------------------------------------- Summary of changes: include/loaders/GP_GIF.h | 2 +- libs/loaders/GP_GIF.c | 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: b4f2a2519601c2f047294b39a9c72a7a6cdbd608
by metan 17 Apr '12

17 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 b4f2a2519601c2f047294b39a9c72a7a6cdbd608 (commit) from d17b6815085fb9796a00d67d6d08994c454f88e7 (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/b4f2a2519601c2f047294b39a9c72a7a6cdb… commit b4f2a2519601c2f047294b39a9c72a7a6cdbd608 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Tue Apr 17 18:32:06 2012 +0200 loaders: Basic GIF reading support using giflib. diff --git a/configure b/configure index f26c95e..fe0350a 100755 --- a/configure +++ b/configure @@ -184,7 +184,10 @@ if __name__ == '__main__': ["jpeg", "Library to load, handle and manipulate images in the JPEG format", [header_exists, "jpeglib.h"], "", "-ljpeg"], - ["freetype", + ["giflib", + "Library to handle, display and manipulate GIF images", + [header_exists, "gif_lib.h"], "", "-lgif"], + ["freetype", "A high-quality and portable font engine", [header_exists, "ft2build.h"], "", "`freetype-config --libs`"]], cfg) diff --git a/include/loaders/GP_Loaders.h b/include/loaders/GP_GIF.h similarity index 70% copy from include/loaders/GP_Loaders.h copy to include/loaders/GP_GIF.h index dd1ff12..237e74d 100644 --- a/include/loaders/GP_Loaders.h +++ b/include/loaders/GP_GIF.h @@ -16,38 +16,46 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, * * Boston, MA 02110-1301 USA * * * - * Copyright (C) 2009-2010 Jiri "BlueBear" Dluhos * - * <jiri.bluebear.dluhos(a)gmail.com> * - * * * Copyright (C) 2009-2012 Cyril Hrubis <metan(a)ucw.cz> * * * *****************************************************************************/ /* - - Core include file for loaders API. + + GIF support using giflib library. */ -#ifndef LOADERS_GP_LOADERS_H -#define LOADERS_GP_LOADERS_H +#ifndef LOADERS_GP_GIF_H +#define LOADERS_GP_GIF_H -#include "core/GP_Context.h" #include "core/GP_ProgressCallback.h" +#include "core/GP_Context.h" -#include "GP_PBM.h" -#include "GP_PGM.h" -#include "GP_PPM.h" +/* + * The possible errno values: + * + * - EIO for read/write failure + * - ENOSYS for not implemented bitmap format + * - ENOMEM from malloc() + * - EILSEQ for wrong image signature/data + * - ECANCELED when call was aborted from callback + */ -#include "GP_BMP.h" -#include "GP_PNG.h" -#include "GP_JPG.h" +/* + * Opens up the Gif image and checks signature. + * Returns zero on success. + */ +int GP_OpenGIF(const char *src_path, void **f); /* - * Tries to load image accordingly to the file extension. - * - * If operation fails NULL is returned and errno is filled. + * Reads first image found in GIF container. + */ +GP_Context *GP_ReadGIF(void *f, GP_ProgressCallback *callback); + +/* + * Does both GP_OpenGIF and GP_ReadGIF at once. */ -GP_Context *GP_LoadImage(const char *src_path, GP_ProgressCallback *callback); +GP_Context *GP_LoadPNG(const char *src_path, GP_ProgressCallback *callback); -#endif /* LOADERS_GP_LOADERS_H */ +#endif /* LOADERS_GP_GIF_H */ diff --git a/include/loaders/GP_JPG.h b/include/loaders/GP_JPG.h index 37d7d2e..32dd5ca 100644 --- a/include/loaders/GP_JPG.h +++ b/include/loaders/GP_JPG.h @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, * * Boston, MA 02110-1301 USA * * * - * Copyright (C) 2009-2011 Cyril Hrubis <metan(a)ucw.cz> * + * Copyright (C) 2009-2012 Cyril Hrubis <metan(a)ucw.cz> * * * *****************************************************************************/ diff --git a/include/loaders/GP_Loaders.h b/include/loaders/GP_Loaders.h index dd1ff12..2b7d0d0 100644 --- a/include/loaders/GP_Loaders.h +++ b/include/loaders/GP_Loaders.h @@ -42,6 +42,7 @@ #include "GP_BMP.h" #include "GP_PNG.h" #include "GP_JPG.h" +#include "GP_GIF.h" /* * Tries to load image accordingly to the file extension. diff --git a/include/loaders/GP_PNG.h b/include/loaders/GP_PNG.h index 2710b15..937baf5 100644 --- a/include/loaders/GP_PNG.h +++ b/include/loaders/GP_PNG.h @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, * * Boston, MA 02110-1301 USA * * * - * Copyright (C) 2009-2011 Cyril Hrubis <metan(a)ucw.cz> * + * Copyright (C) 2009-2012 Cyril Hrubis <metan(a)ucw.cz> * * * *****************************************************************************/ diff --git a/libs/loaders/GP_GIF.c b/libs/loaders/GP_GIF.c new file mode 100644 index 0000000..263a929 --- /dev/null +++ b/libs/loaders/GP_GIF.c @@ -0,0 +1,310 @@ +/***************************************************************************** + * This file is part of gfxprim library. * + * * + * Gfxprim is free software; you can redistribute it and/or * + * modify it under the terms of the GNU Lesser General Public * + * License as published by the Free Software Foundation; either * + * version 2.1 of the License, or (at your option) any later version. * + * * + * Gfxprim is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with gfxprim; if not, write to the Free Software * + * Foundation, Inc., 51 Franklin Street, Fifth Floor, * + * Boston, MA 02110-1301 USA * + * * + * Copyright (C) 2009-2011 Cyril Hrubis <metan(a)ucw.cz> * + * * + *****************************************************************************/ + +/* + + GIF image support using giflib. + + */ + +#include <stdint.h> +#include <inttypes.h> + +#include <errno.h> +#include <string.h> + +#include "../../config.h" +#include "core/GP_Pixel.h" +#include "core/GP_GetPutPixel.gen.h" +#include "gfx/GP_Fill.h" +#include "core/GP_Debug.h" + +#include "GP_GIF.h" + +#ifdef HAVE_GIFLIB + +#include <gif_lib.h> + +int GP_OpenGIF(const char *src_path, void **f) +{ + GifFileType *gf; + + gf = DGifOpenFileName(src_path); + + if (gf == NULL) { + //TODO: error handling + errno = EIO; + return 1; + } + + GP_DEBUG(1, "Have GIF image %ix%i, %i colors, %i bpp", + gf->SWidth, gf->SHeight, gf->SColorResolution, + gf->SColorMap ? gf->SColorMap->BitsPerPixel : -1); + + *f = gf; + + return 0; +} + +static const char *rec_type_name(GifRecordType rec_type) +{ + switch (rec_type) { + case UNDEFINED_RECORD_TYPE: + return "Undefined"; + case SCREEN_DESC_RECORD_TYPE: + return "ScreenDesc"; + case IMAGE_DESC_RECORD_TYPE: + return "ImageDesc"; + case EXTENSION_RECORD_TYPE: + return "Extension"; + case TERMINATE_RECORD_TYPE: + return "Terminate"; + default: + return "Invalid"; + } +} + +static const char *gif_err_name(int err) +{ + switch (err) { + case E_GIF_ERR_OPEN_FAILED: + return "E_GIF_ERR_OPEN_FAILED"; + case E_GIF_ERR_WRITE_FAILED: + return "E_GIF_ERR_WRITE_FAILED"; + case E_GIF_ERR_HAS_SCRN_DSCR: + return "E_GIF_ERR_HAS_SCRN_DSCR"; + case E_GIF_ERR_HAS_IMAG_DSCR: + return "E_GIF_ERR_HAS_IMAG_DSCR"; + case E_GIF_ERR_NO_COLOR_MAP: + return "E_GIF_ERR_NO_COLOR_MAP"; + case E_GIF_ERR_DATA_TOO_BIG: + return "E_GIF_ERR_DATA_TOO_BIG"; + case E_GIF_ERR_NOT_ENOUGH_MEM: + return "E_GIF_ERR_NOT_ENOUGH_MEM"; + case E_GIF_ERR_DISK_IS_FULL: + return "E_GIF_ERR_DISK_IS_FULL"; + case E_GIF_ERR_CLOSE_FAILED: + return "E_GIF_ERR_CLOSE_FAILED"; + case E_GIF_ERR_NOT_WRITEABLE: + return "E_GIF_ERR_NOT_WRITEABLE"; + default: + return "UNKNOWN"; + } +} + +static int read_extensions(GifFileType *gf) +{ + uint8_t *gif_ext_ptr; + int gif_ext_type; + + //TODO: Should we free them? + + if (DGifGetExtension(gf, &gif_ext_type, &gif_ext_ptr) != GIF_OK) { + GP_DEBUG(1, "DGifGetExtension() error %s (%i)", + gif_err_name(GifLastError()), GifLastError()); + return EIO; + } + + GP_DEBUG(2, "Have GIF extension type %i (ignoring)", gif_ext_type); + + do { + if (DGifGetExtensionNext(gf, &gif_ext_ptr) != GIF_OK) { + GP_DEBUG(1, "DGifGetExtension() error %s (%i)", + gif_err_name(GifLastError()), GifLastError()); + return EIO; + } + + } while (gif_ext_ptr != NULL); + + return 0; +} + +static inline GifColorType *get_color_from_map(ColorMapObject *map, int idx) +{ + if (map->ColorCount <= idx) { + GP_DEBUG(1, "Invalid colormap index %i (%i max)", + map->ColorCount, idx); + return map->Colors; + } + + return &map->Colors[idx]; +} + +static inline GP_Pixel get_color(GifFileType *gf, uint32_t idx) +{ + GifColorType *color; + + //TODO: no color map? + if (gf->SColorMap == NULL) + return 0; + + color = get_color_from_map(gf->SColorMap, idx); + + return GP_Pixel_CREATE_RGB888(color->Red, color->Green, color->Blue); +} + +static int get_bg_color(GifFileType *gf, GP_Pixel *pixel) +{ + GifColorType *color; + + if (gf->SColorMap == NULL) + return 0; + + color = get_color_from_map(gf->SColorMap, gf->SBackGroundColor); + + *pixel = GP_Pixel_CREATE_RGB888(color->Red, color->Green, color->Blue); + + return 1; +} + +GP_Context *GP_ReadGIF(void *f, GP_ProgressCallback *callback) +{ + GifFileType *gf = f; + GifRecordType rec_type; + GP_Context *res = NULL; + GP_Pixel bg; + int32_t x, y; + int err; + + do { + if (DGifGetRecordType(gf, &rec_type) != GIF_OK) { + //TODO: error handling + GP_DEBUG(1, "DGifGetRecordType() error %s (%i)", + gif_err_name(GifLastError()), GifLastError()); + err = EIO; + goto err1; + } + + GP_DEBUG(2, "Have GIF record type %s", + rec_type_name(rec_type)); + + switch (rec_type) { + case EXTENSION_RECORD_TYPE: + if ((err = read_extensions(gf))) + goto err1; + continue; + case IMAGE_DESC_RECORD_TYPE: + break; + default: + continue; + } + + if (DGifGetImageDesc(gf) != GIF_OK) { + //TODO: error handling + GP_DEBUG(1, "DGifGetImageDesc() error %s (%i)", + gif_err_name(GifLastError()), GifLastError()); + err = EIO; + goto err1; + } + + GP_DEBUG(1, "Have GIF Image left-top %ix%i, width-height %ix%i," + " interlace %i, bpp %i", gf->Image.Left, gf->Image.Top, + gf->Image.Width, gf->Image.Height, gf->Image.Interlace, + gf->Image.ColorMap ? gf->Image.ColorMap->BitsPerPixel : -1); + + res = GP_ContextAlloc(gf->SWidth, gf->SHeight, GP_PIXEL_RGB888); + + if (res == NULL) { + err = ENOMEM; + goto err1; + } + + /* If background color is defined, use it */ + if (get_bg_color(gf, &bg)) { + GP_DEBUG(1, "Filling bg color %x", bg); + GP_Fill(res, bg); + } + + /* Now finally read gif image data */ + for (y = gf->Image.Top; y < gf->Image.Height; y++) { + uint8_t line[gf->Image.Width]; + + DGifGetLine(gf, line, gf->Image.Width); + + //TODO: just now we have only 8BPP + for (x = 0; x < gf->Image.Width; x++) + GP_PutPixel_Raw_24BPP(res, x + gf->Image.Left, y, get_color(gf, line[x])); + + if (GP_ProgressCallbackReport(callback, y - gf->Image.Top, + gf->Image.Height, + gf->Image.Width)) { + GP_DEBUG(1, "Operation aborted"); + err = ECANCELED; + goto err2; + } + } + + //TODO: now we exit after reading first image + break; + + } while (rec_type != TERMINATE_RECORD_TYPE); + + + DGifCloseFile(gf); + + /* No Image record found :( */ + if (res == NULL) + err = EIO; + + return res; +err2: + GP_ContextFree(res); +err1: + DGifCloseFile(gf); + errno = err; + return NULL; +} + +GP_Context *GP_LoadGIF(const char *src_path, GP_ProgressCallback *callback) +{ + void *f; + + if (GP_OpenGIF(src_path, &f)) + return NULL; + + return GP_ReadGIF(f, callback); +} + +#else + +int GP_OpenGIF(const char GP_UNUSED(*src_path), + void GP_UNUSED(**f)) +{ + errno = ENOSYS; + return 1; +} + +GP_Context *GP_ReadGIF(void GP_UNUSED(*f), + GP_ProgressCallback GP_UNUSED(*callback)) +{ + errno = ENOSYS; + return NULL; +} + +GP_Context *GP_LoadGIF(const char GP_UNUSED(*src_path), + GP_ProgressCallback GP_UNUSED(*callback)) +{ + errno = ENOSYS; + return NULL; +} + +#endif /* HAVE_GIFLIB */ diff --git a/libs/loaders/GP_JPG.c b/libs/loaders/GP_JPG.c index 00ff0c5..950ca11 100644 --- a/libs/loaders/GP_JPG.c +++ b/libs/loaders/GP_JPG.c @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, * * Boston, MA 02110-1301 USA * * * - * Copyright (C) 2009-2011 Cyril Hrubis <metan(a)ucw.cz> * + * Copyright (C) 2009-2012 Cyril Hrubis <metan(a)ucw.cz> * * * *****************************************************************************/ diff --git a/libs/loaders/GP_Loaders.c b/libs/loaders/GP_Loaders.c index 07368fe..6cb39e2 100644 --- a/libs/loaders/GP_Loaders.c +++ b/libs/loaders/GP_Loaders.c @@ -119,11 +119,22 @@ GP_Context *GP_LoadImage(const char *src_path, GP_ProgressCallback *callback) break; } break; + /* GIF */ + case 'F': + case 'f': + switch (src_path[len - 2]) { + case 'I': + case 'i': + if (src_path[len - 3] == 'G' || + src_path[len - 3] == 'g') + res = GP_LoadGIF(src_path, callback); + break; + } + break; } skip_filename_check: //TODO file signature based check - return res; } diff --git a/libs/loaders/GP_PNG.c b/libs/loaders/GP_PNG.c index 02d9980..dc1b60b 100644 --- a/libs/loaders/GP_PNG.c +++ b/libs/loaders/GP_PNG.c @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, * * Boston, MA 02110-1301 USA * * * - * Copyright (C) 2009-2011 Cyril Hrubis <metan(a)ucw.cz> * + * Copyright (C) 2009-2012 Cyril Hrubis <metan(a)ucw.cz> * * * *****************************************************************************/ ----------------------------------------------------------------------- Summary of changes: configure | 5 +- include/loaders/{GP_Loaders.h => GP_GIF.h} | 46 +++-- include/loaders/GP_JPG.h | 2 +- include/loaders/GP_Loaders.h | 1 + include/loaders/GP_PNG.h | 2 +- libs/loaders/GP_GIF.c | 310 ++++++++++++++++++++++++++++ libs/loaders/GP_JPG.c | 2 +- libs/loaders/GP_Loaders.c | 13 +- libs/loaders/GP_PNG.c | 2 +- 9 files changed, 358 insertions(+), 25 deletions(-) copy include/loaders/{GP_Loaders.h => GP_GIF.h} (70%) create mode 100644 libs/loaders/GP_GIF.c 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: d17b6815085fb9796a00d67d6d08994c454f88e7
by metan 17 Apr '12

17 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 d17b6815085fb9796a00d67d6d08994c454f88e7 (commit) via bc8762a2677421bed4a62a90953340fb151f1433 (commit) via 726c48cd8263a399242dcc0e7273b653690efddc (commit) via 3319a2a77a75332829881c5faa632110813e1aaa (commit) via 9312d0d036e98c1662b966604dd8d9ad9215c1ab (commit) from 4f696f6a05e20284f976c0ed1d99c6779adda778 (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/d17b6815085fb9796a00d67d6d08994c454f… commit d17b6815085fb9796a00d67d6d08994c454f88e7 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Tue Apr 17 16:09:35 2012 +0200 spiv: Make use of the errno from GP_LoadImage(). diff --git a/demos/spiv/spiv.c b/demos/spiv/spiv.c index bbe7ef0..1a1369f 100644 --- a/demos/spiv/spiv.c +++ b/demos/spiv/spiv.c @@ -26,8 +26,9 @@ */ -#include <signal.h> #include <unistd.h> +#include <errno.h> +#include <signal.h> #include <string.h> #include <pthread.h> @@ -129,9 +130,9 @@ static void *image_loader(void *ptr) cpu_timer_start(&timer, "Loading"); if ((img = GP_LoadImage(params->img_path, &callback)) == NULL) { GP_Fill(context, black_pixel); - GP_Text(context, NULL, context->w/2, context->h/2, - GP_ALIGN_CENTER|GP_VALIGN_CENTER, white_pixel, black_pixel, - "Failed to load image :("); + GP_Print(context, NULL, context->w/2, context->h/2, + GP_ALIGN_CENTER|GP_VALIGN_CENTER, white_pixel, black_pixel, + "Failed to load image :( (%s)", strerror(errno)); GP_BackendFlip(backend); return NULL; } http://repo.or.cz/w/gfxprim.git/commit/bc8762a2677421bed4a62a90953340fb151f… commit bc8762a2677421bed4a62a90953340fb151f1433 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Tue Apr 17 16:09:08 2012 +0200 loaders: Convert JPG loader to use errno for error reporting. diff --git a/include/loaders/GP_JPG.h b/include/loaders/GP_JPG.h index db9c51f..37d7d2e 100644 --- a/include/loaders/GP_JPG.h +++ b/include/loaders/GP_JPG.h @@ -35,26 +35,23 @@ /* * Opens up file and checks signature. */ -GP_RetCode GP_OpenJPG(const char *src_path, FILE **f); +int GP_OpenJPG(const char *src_path, FILE **f); /* * Reads JPG from an open FILE. Expects the file possition set after the eight * bytes JPG signature. */ -GP_RetCode GP_ReadJPG(FILE *f, GP_Context **res, - GP_ProgressCallback *callback); +GP_Context *GP_ReadJPG(FILE *f, GP_ProgressCallback *callback); /* * Loads a JPG file into GP_Context. The Context is newly allocated. */ -GP_RetCode GP_LoadJPG(const char *src_path, GP_Context **res, - GP_ProgressCallback *callback); +GP_Context *GP_LoadJPG(const char *src_path, GP_ProgressCallback *callback); /* * Saves JPG to a file. */ -GP_RetCode GP_SaveJPG(const char *dst_path, const GP_Context *src, - GP_ProgressCallback *callback); - +int GP_SaveJPG(const char *dst_path, const GP_Context *src, + GP_ProgressCallback *callback); #endif /* LOADERS_GP_JPG_H */ diff --git a/libs/loaders/GP_JPG.c b/libs/loaders/GP_JPG.c index 4ea6e35..00ff0c5 100644 --- a/libs/loaders/GP_JPG.c +++ b/libs/loaders/GP_JPG.c @@ -43,24 +43,27 @@ #include <jpeglib.h> -GP_RetCode GP_OpenJPG(const char *src_path, FILE **f) +int GP_OpenJPG(const char *src_path, FILE **f) { + int err; + *f = fopen(src_path, "rb"); if (*f == NULL) { + err = errno; GP_DEBUG(1, "Failed to open '%s' : %s", src_path, strerror(errno)); - return GP_EBADFILE; + errno = err; + return 1; } //TODO: check signature and rewind the stream - return GP_ESUCCESS; + return 0; } struct my_jpg_err { struct jpeg_error_mgr error_mgr; - jmp_buf setjmp_buf; }; @@ -91,21 +94,19 @@ static const char *get_colorspace(J_COLOR_SPACE color_space) }; } -GP_RetCode GP_ReadJPG(FILE *f, GP_Context **res, - GP_ProgressCallback *callback) +GP_Context *GP_ReadJPG(FILE *f, GP_ProgressCallback *callback) { struct jpeg_decompress_struct cinfo; struct my_jpg_err my_err; GP_Context *ret = NULL; + int err; cinfo.err = jpeg_std_error(&my_err.error_mgr); my_err.error_mgr.error_exit = my_error_exit; if (setjmp(my_err.setjmp_buf)) { - jpeg_destroy_decompress(&cinfo); - GP_ContextFree(ret); - fclose(f); - return GP_EBADFILE; + err = EIO; + goto err2; } jpeg_create_decompress(&cinfo); @@ -134,9 +135,8 @@ GP_RetCode GP_ReadJPG(FILE *f, GP_Context **res, if (pixel_type == GP_PIXEL_UNKNOWN) { GP_DEBUG(1, "Can't handle %s JPEG output format", get_colorspace(cinfo.out_color_space)); - jpeg_destroy_decompress(&cinfo); - fclose(f); - return GP_EBADFILE; + err = ENOSYS; + goto err1; } ret = GP_ContextAlloc(cinfo.image_width, cinfo.image_height, @@ -144,9 +144,8 @@ GP_RetCode GP_ReadJPG(FILE *f, GP_Context **res, if (ret == NULL) { GP_DEBUG(1, "Malloc failed :("); - jpeg_destroy_decompress(&cinfo); - fclose(f); - return GP_ENOMEM; + err = ENOMEM; + goto err1; } jpeg_start_decompress(&cinfo); @@ -171,60 +170,65 @@ GP_RetCode GP_ReadJPG(FILE *f, GP_Context **res, if (GP_ProgressCallbackReport(callback, y, ret->h, ret->w)) { GP_DEBUG(1, "Operation aborted"); - jpeg_destroy_decompress(&cinfo); - fclose(f); - GP_ContextFree(ret); - return GP_EINTR; + err = ECANCELED; + goto err2; } } jpeg_finish_decompress(&cinfo); jpeg_destroy_decompress(&cinfo); fclose(f); - *res = ret; GP_ProgressCallbackDone(callback); - return GP_ESUCCESS; + + return ret; +err2: + GP_ContextFree(ret); +err1: + jpeg_destroy_decompress(&cinfo); + fclose(f); + errno = err; + return NULL; } -GP_RetCode GP_LoadJPG(const char *src_path, GP_Context **res, - GP_ProgressCallback *callback) +GP_Context *GP_LoadJPG(const char *src_path, GP_ProgressCallback *callback) { FILE *f; - GP_RetCode ret; - if ((ret = GP_OpenJPG(src_path, &f))) - return ret; + if (GP_OpenJPG(src_path, &f)) + return NULL; - return GP_ReadJPG(f, res, callback); + return GP_ReadJPG(f, callback); } -GP_RetCode GP_SaveJPG(const char *dst_path, const GP_Context *src, - GP_ProgressCallback *callback) +int GP_SaveJPG(const char *dst_path, const GP_Context *src, + GP_ProgressCallback *callback) { FILE *f; - GP_RetCode ret; struct jpeg_compress_struct cinfo; struct my_jpg_err my_err; + int err; if (src->pixel_type != GP_PIXEL_RGB888 && src->pixel_type != GP_PIXEL_G8) { GP_DEBUG(1, "Can't save png with pixel type %s", GP_PixelTypeName(src->pixel_type)); - return GP_ENOIMPL; + errno = ENOSYS; + return 1; } f = fopen(dst_path, "wb"); if (f == NULL) { + err = errno; GP_DEBUG(1, "Failed to open '%s' for writing: %s", dst_path, strerror(errno)); - return GP_EBADFILE; + goto err0; } if (setjmp(my_err.setjmp_buf)) { - ret = GP_EBADFILE;; - goto err1; + err = EIO; + goto err2; } cinfo.err = jpeg_std_error(&my_err.error_mgr); @@ -267,56 +271,61 @@ GP_RetCode GP_SaveJPG(const char *dst_path, const GP_Context *src, if (GP_ProgressCallbackReport(callback, y, src->h, src->w)) { GP_DEBUG(1, "Operation aborted"); - ret = GP_EINTR; - goto err1; + err = ECANCELED; + goto err2; } } jpeg_finish_compress(&cinfo); if (fclose(f)) { + err = errno; GP_DEBUG(1, "Failed to close file '%s': %s", dst_path, strerror(errno)); - return GP_EBADFILE; + goto err1; } GP_ProgressCallbackDone(callback); - return GP_ESUCCESS; + return 0; //TODO: is cinfo allocated? -err1: +err2: jpeg_destroy_compress(&cinfo); fclose(f); +err1: unlink(dst_path); - return ret; +err0: + errno = err; + return 1; } #else -GP_RetCode GP_OpenJPG(const char GP_UNUSED(*src_path), - FILE GP_UNUSED(**f)) +int GP_OpenJPG(const char GP_UNUSED(*src_path), FILE GP_UNUSED(**f)) { - return GP_ENOIMPL; + errno = ENOSYS; + return 1; } -GP_RetCode GP_ReadJPG(FILE GP_UNUSED(*f), - GP_Context GP_UNUSED(**res), +GP_Context *GP_ReadJPG(FILE GP_UNUSED(*f), GP_ProgressCallback GP_UNUSED(*callback)) { - return GP_ENOIMPL; + errno = ENOSYS; + return NULL; } -GP_RetCode GP_LoadJPG(const char GP_UNUSED(*src_path), - GP_Context GP_UNUSED(**res), - GP_ProgressCallback GP_UNUSED(*callback)) +GP_Context *GP_LoadJPG(const char GP_UNUSED(*src_path), + GP_ProgressCallback GP_UNUSED(*callback)) { - return GP_ENOIMPL; + errno = ENOSYS; + return NULL; } -GP_RetCode GP_SaveJPG(const char GP_UNUSED(*dst_path), - const GP_Context GP_UNUSED(*src), - GP_ProgressCallback GP_UNUSED(*callback)) +int GP_SaveJPG(const char GP_UNUSED(*dst_path), + const GP_Context GP_UNUSED(*src), + GP_ProgressCallback GP_UNUSED(*callback)) { - return GP_ENOIMPL; + errno = ENOSYS; + return 1; } #endif /* HAVE_JPEG */ diff --git a/libs/loaders/GP_Loaders.c b/libs/loaders/GP_Loaders.c index 05e7c15..07368fe 100644 --- a/libs/loaders/GP_Loaders.c +++ b/libs/loaders/GP_Loaders.c @@ -71,7 +71,7 @@ GP_Context *GP_LoadImage(const char *src_path, GP_ProgressCallback *callback) case 'P': if (src_path[len - 3] == 'j' || src_path[len - 3] == 'J') - GP_LoadJPG(src_path, &res, callback); + res = GP_LoadJPG(src_path, callback); break; case 'e': case 'E': @@ -79,7 +79,7 @@ GP_Context *GP_LoadImage(const char *src_path, GP_ProgressCallback *callback) src_path[len - 3] == 'P') && (src_path[len - 4] == 'j' || src_path[len - 4] == 'J')) - GP_LoadJPG(src_path, &res, callback); + res = GP_LoadJPG(src_path, callback); break; } break; http://repo.or.cz/w/gfxprim.git/commit/726c48cd8263a399242dcc0e7273b653690e… commit 726c48cd8263a399242dcc0e7273b653690efddc Author: Cyril Hrubis <metan(a)ucw.cz> Date: Tue Apr 17 15:42:01 2012 +0200 loaders: Convert PNG loader to use errno for error reporting. diff --git a/include/loaders/GP_PNG.h b/include/loaders/GP_PNG.h index 1b4d9cf..2710b15 100644 --- a/include/loaders/GP_PNG.h +++ b/include/loaders/GP_PNG.h @@ -33,28 +33,42 @@ #include "core/GP_Context.h" /* - * Opens up file and checks signature. Upon successful return the file - * possition would be set to eight bytes (exactly after the PNG signature). + * The possible errno values: + * + * - Anything FILE operation may return (fopen(), fclose(), fseek(), ...). + * - EIO for png_read()/png_write() failure + * - ENOSYS for not implemented bitmap format + * - ENOMEM from malloc() + * - EILSEQ for wrong image signature/data + * - ECANCELED when call was aborted from callback */ -GP_RetCode GP_OpenPNG(const char *src_path, FILE **f); + +/* + * Opens up file and checks signature. Upon successful return (zero is + * returned) the file possition would be set to eight bytes (exactly after the + * PNG signature). + */ +int GP_OpenPNG(const char *src_path, FILE **f); /* * Reads PNG from an open FILE. Expects the file possition set after the eight * bytes PNG signature. + * + * Upon succesfull return pointer to newly allocated context is returned. + * Otherwise NULL is returned and errno is filled. */ -GP_RetCode GP_ReadPNG(FILE *f, GP_Context **res, - GP_ProgressCallback *callback); +GP_Context *GP_ReadPNG(FILE *f, GP_ProgressCallback *callback); /* - * Loads a PNG file into GP_Context. The Context is newly allocated. + * Does both GP_OpenPNG and GP_ReadPNG at once. */ -GP_RetCode GP_LoadPNG(const char *src_path, GP_Context **res, - GP_ProgressCallback *callback); +GP_Context *GP_LoadPNG(const char *src_path, GP_ProgressCallback *callback); /* - * Saves PNG to a file. + * Saves PNG to a file. Zero is returned on succes. Upon failure non-zero is + * returned and errno is filled accordingly. */ -GP_RetCode GP_SavePNG(const char *dst_path, const GP_Context *src, - GP_ProgressCallback *callback); +int GP_SavePNG(const char *dst_path, const GP_Context *src, + GP_ProgressCallback *callback); #endif /* LOADERS_GP_PNG_H */ diff --git a/libs/loaders/GP_Loaders.c b/libs/loaders/GP_Loaders.c index 290890a..05e7c15 100644 --- a/libs/loaders/GP_Loaders.c +++ b/libs/loaders/GP_Loaders.c @@ -65,7 +65,7 @@ GP_Context *GP_LoadImage(const char *src_path, GP_ProgressCallback *callback) case 'N': if (src_path[len - 3] == 'p' || src_path[len - 3] == 'P') - GP_LoadPNG(src_path, &res, callback); + res = GP_LoadPNG(src_path, callback); break; case 'p': case 'P': diff --git a/libs/loaders/GP_PNG.c b/libs/loaders/GP_PNG.c index c430e72..02d9980 100644 --- a/libs/loaders/GP_PNG.c +++ b/libs/loaders/GP_PNG.c @@ -41,37 +41,42 @@ #include <png.h> -GP_RetCode GP_OpenPNG(const char *src_path, FILE **f) +int GP_OpenPNG(const char *src_path, FILE **f) { uint8_t sig[8]; + int err; *f = fopen(src_path, "r"); if (*f == NULL) { + err = errno; GP_DEBUG(1, "Failed to open '%s' : %s", src_path, strerror(errno)); - return GP_EBADFILE; + goto err1; } if (fread(sig, 1, 8, *f) <= 0) { + err = errno; GP_DEBUG(1, "Failed to read '%s' : %s", src_path, strerror(errno)); - goto err; + goto err2; } if (png_sig_cmp(sig, 0, 8)) { GP_DEBUG(1, "Invalid file header, '%s' not a PNG image?", src_path); - goto err; + err = EILSEQ; + goto err2; } GP_DEBUG(1, "Found PNG signature in '%s'", src_path); - return GP_ESUCCESS; -err: + return 0; +err2: fclose(*f); - *f = NULL; - return GP_EBADFILE; +err1: + errno = err; + return 1; } static const char *interlace_type_name(int interlace) @@ -86,21 +91,21 @@ static const char *interlace_type_name(int interlace) } } -GP_RetCode GP_ReadPNG(FILE *f, GP_Context **res, - GP_ProgressCallback *callback) +GP_Context *GP_ReadPNG(FILE *f, GP_ProgressCallback *callback) { png_structp png; png_infop png_info = NULL; png_uint_32 w, h; int depth, color_type, interlace_type; GP_PixelType pixel_type = GP_PIXEL_UNKNOWN; - GP_RetCode ret; + GP_Context *res; + int err; png = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); if (png == NULL) { GP_DEBUG(1, "Failed to allocate PNG read buffer"); - ret = GP_ENOMEM; + err = ENOMEM; goto err1; } @@ -108,13 +113,14 @@ GP_RetCode GP_ReadPNG(FILE *f, GP_Context **res, if (png_info == NULL) { GP_DEBUG(1, "Failed to allocate PNG info buffer"); - ret = GP_ENOMEM; + err = ENOMEM; goto err2; } if (setjmp(png_jmpbuf(png))) { GP_DEBUG(1, "Failed to read PNG file :("); - ret = GP_EBADFILE; + //TODO: should we get better error description from libpng? + err = EIO; goto err2; } @@ -180,14 +186,14 @@ GP_RetCode GP_ReadPNG(FILE *f, GP_Context **res, if (pixel_type == GP_PIXEL_UNKNOWN) { GP_DEBUG(1, "Unimplemented png format"); - ret = GP_ENOIMPL; + err = ENOSYS; goto err2; } - *res = GP_ContextAlloc(w, h, pixel_type); + res = GP_ContextAlloc(w, h, pixel_type); - if (*res == NULL) { - ret = GP_ENOMEM; + if (res == NULL) { + err = ENOMEM; goto err2; } @@ -195,83 +201,84 @@ GP_RetCode GP_ReadPNG(FILE *f, GP_Context **res, /* start the actuall reading */ for (y = 0; y < h; y++) { - png_bytep row = GP_PIXEL_ADDR(*res, 0, y); + png_bytep row = GP_PIXEL_ADDR(res, 0, y); png_read_rows(png, &row, NULL, 1); if (GP_ProgressCallbackReport(callback, y, h, w)) { GP_DEBUG(1, "Operation aborted"); - png_destroy_read_struct(&png, &png_info, NULL); - fclose(f); - GP_ContextFree(*res); - return GP_EINTR; + err= ECANCELED; + goto err3; } } GP_ProgressCallbackDone(callback); - ret = GP_ESUCCESS; + return res; +err3: + GP_ContextFree(res); err2: png_destroy_read_struct(&png, png_info ? &png_info : NULL, NULL); err1: fclose(f); - return ret; + errno = err; + return NULL; } -GP_RetCode GP_LoadPNG(const char *src_path, GP_Context **res, - GP_ProgressCallback *callback) +GP_Context *GP_LoadPNG(const char *src_path, GP_ProgressCallback *callback) { FILE *f; - GP_RetCode ret; - if ((ret = GP_OpenPNG(src_path, &f))) - return ret; + if (GP_OpenPNG(src_path, &f)) + return NULL; - return GP_ReadPNG(f, res, callback); + return GP_ReadPNG(f, callback); } -GP_RetCode GP_SavePNG(const char *dst_path, const GP_Context *src, - GP_ProgressCallback *callback) +int GP_SavePNG(const char *dst_path, const GP_Context *src, + GP_ProgressCallback *callback) { FILE *f; - GP_RetCode ret; png_structp png; png_infop png_info = NULL; + int err; if (src->pixel_type != GP_PIXEL_RGB888) { GP_DEBUG(1, "Can't save png with pixel type %s", GP_PixelTypeName(src->pixel_type)); - return GP_ENOIMPL; + return ENOSYS; } f = fopen(dst_path, "wb"); if (f == NULL) { + err = errno; GP_DEBUG(1, "Failed to open '%s' for writing: %s", dst_path, strerror(errno)); - return GP_EBADFILE; + goto err0; } png = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); if (png == NULL) { GP_DEBUG(1, "Failed to allocate PNG write buffer"); - ret = GP_ENOMEM; - goto err1; + err = ENOMEM; + goto err2; } png_info = png_create_info_struct(png); if (png_info == NULL) { GP_DEBUG(1, "Failed to allocate PNG info buffer"); - ret = GP_ENOMEM; - goto err2; + err = ENOMEM; + goto err3; } if (setjmp(png_jmpbuf(png))) { GP_DEBUG(1, "Failed to write PNG file :("); - ret = GP_EBADFILE; - goto err2; + //TODO: should we get better error description from libpng? + err = EIO; + goto err3; } png_init_io(png, f); @@ -291,8 +298,8 @@ GP_RetCode GP_SavePNG(const char *dst_path, const GP_Context *src, if (GP_ProgressCallbackReport(callback, y, src->h, src->w)) { GP_DEBUG(1, "Operation aborted"); - ret = GP_EINTR; - goto err2; + err = ECANCELED; + goto err3; } } @@ -301,48 +308,55 @@ GP_RetCode GP_SavePNG(const char *dst_path, const GP_Context *src, png_destroy_write_struct(&png, &png_info); if (fclose(f)) { + err = errno; GP_DEBUG(1, "Failed to close file '%s': %s", dst_path, strerror(errno)); - return GP_EBADFILE; + goto err1; } GP_ProgressCallbackDone(callback); - return GP_ESUCCESS; -err2: + + return 0; +err3: png_destroy_write_struct(&png, png_info == NULL ? NULL : &png_info); -err1: +err2: fclose(f); +err1: unlink(dst_path); - return ret; +err0: + errno = err; + return 1; } #else -GP_RetCode GP_OpenPNG(const char GP_UNUSED(*src_path), - FILE GP_UNUSED(**f)) +int GP_OpenPNG(const char GP_UNUSED(*src_path), + FILE GP_UNUSED(**f)) { - return GP_ENOIMPL; + errno = ENOSYS; + return 1; } -GP_RetCode GP_ReadPNG(FILE GP_UNUSED(*f), - GP_Context GP_UNUSED(**res), - GP_ProgressCallback GP_UNUSED(*callback)) +GP_Context *GP_ReadPNG(FILE GP_UNUSED(*f), + GP_ProgressCallback GP_UNUSED(*callback)) { - return GP_ENOIMPL; + errno = ENOSYS; + return NULL; } -GP_RetCode GP_LoadPNG(const char GP_UNUSED(*src_path), - GP_Context GP_UNUSED(**res), - GP_ProgressCallback GP_UNUSED(*callback)) +GP_Context *GP_LoadPNG(const char GP_UNUSED(*src_path), + GP_ProgressCallback GP_UNUSED(*callback)) { - return GP_ENOIMPL; + errno = ENOSYS; + return NULL; } -GP_RetCode GP_SavePNG(const char GP_UNUSED(*dst_path), - const GP_Context GP_UNUSED(*src), - GP_ProgressCallback GP_UNUSED(*callback)) +int GP_SavePNG(const char GP_UNUSED(*dst_path), + const GP_Context GP_UNUSED(*src), + GP_ProgressCallback GP_UNUSED(*callback)) { - return GP_ENOIMPL; + errno = ENOSYS; + return 1; } #endif /* HAVE_LIBPNG */ http://repo.or.cz/w/gfxprim.git/commit/3319a2a77a75332829881c5faa632110813e… commit 3319a2a77a75332829881c5faa632110813e1aaa Author: Cyril Hrubis <metan(a)ucw.cz> Date: Tue Apr 17 15:02:19 2012 +0200 loaders: Convert BMP loader to use errno for error reporting. diff --git a/include/loaders/GP_BMP.h b/include/loaders/GP_BMP.h index 2f81017..e44d787 100644 --- a/include/loaders/GP_BMP.h +++ b/include/loaders/GP_BMP.h @@ -27,28 +27,39 @@ #include "core/GP_ProgressCallback.h" /* + * The possible errno values: + * + * - Anything FILE operation may return (fopen(), fclose(), fseek(), ...). + * - EIO for fread()/fwrite() failure + * - ENOSYS for not implemented bitmap format + * - ENOMEM from malloc() + * - EILSEQ for wrong image signature/data + * - ECANCELED when call was aborted from callback + */ + +/* * Opens up a bmp file, checks signature, parses metadata. * - * The width and height and pixel type are filled upon succcessful return. + * The file, width, height and pixel type are filled upon succcessful return. + * + * Upon failure, non zero return value is returned and errno is filled. */ -GP_RetCode GP_OpenBMP(const char *src_path, FILE **f, - GP_Size *w, GP_Size *h, GP_PixelType *pixel_type); +int GP_OpenBMP(const char *src_path, FILE **f, + GP_Size *w, GP_Size *h, GP_PixelType *pixel_type); /* * Reads a BMP from a opened file. * - * Upon successful return context to store bitmap is allocated and image is + * Upon successful return, context to store bitmap is allocated and image is * loaded. * + * Upon failure NULL is returned and errno is filled. */ -GP_RetCode GP_ReadBMP(FILE *f, GP_Context **res, - GP_ProgressCallback *callback); +GP_Context *GP_ReadBMP(FILE *f, GP_ProgressCallback *callback); /* * Does both GP_OpenBMP and GP_ReadBMP. */ -GP_RetCode GP_LoadBMP(const char *src_path, GP_Context **res, - GP_ProgressCallback *callback); - +GP_Context *GP_LoadBMP(const char *src_path, GP_ProgressCallback *callback); #endif /* LOADERS_GP_BMP_H */ diff --git a/libs/loaders/GP_BMP.c b/libs/loaders/GP_BMP.c index 97b1b0b..d7ac6c5 100644 --- a/libs/loaders/GP_BMP.c +++ b/libs/loaders/GP_BMP.c @@ -146,14 +146,13 @@ static uint32_t get_palette_size(struct bitmap_info_header *header) return (1 << header->bpp); } -static GP_RetCode read_bitmap_info_header(FILE *f, - struct bitmap_info_header *header) +static int read_bitmap_info_header(FILE *f, struct bitmap_info_header *header) { uint8_t buf[36]; if (fread(buf, 1, sizeof(buf), f) != sizeof(buf)) { GP_DEBUG(1, "Failed to read bitmap info header"); - return GP_EBADFILE; + return EIO; } header->w = BUF_TO_4(buf, 0); @@ -175,17 +174,16 @@ static GP_RetCode read_bitmap_info_header(FILE *f, get_palette_size(header), bitmap_compress_name(header->compress_type)); - return GP_ESUCCESS; + return 0; } -static GP_RetCode read_bitmap_core_header(FILE *f, - struct bitmap_info_header *header) +static int read_bitmap_core_header(FILE *f, struct bitmap_info_header *header) { uint8_t buf[12]; if (fread(buf, 1, sizeof(buf), f) != sizeof(buf)) { GP_DEBUG(1, "Failed to read bitmap core header"); - return GP_EBADFILE; + return EIO; } header->w = BUF_TO_2(buf, 0); @@ -204,25 +202,25 @@ static GP_RetCode read_bitmap_core_header(FILE *f, GP_DEBUG(2, "Have BMP bitmap size %"PRId32"x%"PRId32" %"PRIu16" bpp", header->h, header->w, header->bpp); - return GP_ESUCCESS; + return 0; } -static GP_RetCode read_bitmap_header(FILE *f, - struct bitmap_info_header *header) +static int read_bitmap_header(FILE *f, struct bitmap_info_header *header) { uint8_t buf[8]; - GP_RetCode ret; - + int err; + if (fseek(f, BMP_HEADER_OFFSET, SEEK_SET)) { + err = errno; GP_DEBUG(1, "fseek(f, 0x%02x) failed: '%s'", BMP_HEADER_OFFSET, strerror(errno)); - return GP_EBADFILE; + return err; } /* Read info header size, header size determines header type */ if (fread(buf, 1, sizeof(buf), f) != sizeof(buf)) { GP_DEBUG(1, "Failed to read info header size"); - return GP_EBADFILE; + return EIO; } header->pixel_offset = BUF_TO_4(buf, 0); @@ -233,36 +231,37 @@ static GP_RetCode read_bitmap_header(FILE *f, switch (header->header_size) { case BITMAPCOREHEADER: - ret = read_bitmap_core_header(f, header); + err = read_bitmap_core_header(f, header); break; case BITMAPCOREHEADER2: - return GP_ENOIMPL; + return ENOSYS; /* The bitmap core header only adds filelds to the end of the header */ case BITMAPINFOHEADER: case BITMAPINFOHEADER2: case BITMAPINFOHEADER3: case BITMAPINFOHEADER4: - ret = read_bitmap_info_header(f, header); + err = read_bitmap_info_header(f, header); break; default: GP_DEBUG(1, "Unknown header type, continuing anyway"); - ret = read_bitmap_info_header(f, header); + err = read_bitmap_info_header(f, header); break; }; - return ret; + return err; } /* * Reads palette, the format is R G B X, each one byte. */ -GP_RetCode read_bitmap_palette(FILE *f, struct bitmap_info_header *header, +static int read_bitmap_palette(FILE *f, struct bitmap_info_header *header, GP_Pixel *palette) { - uint32_t i; uint32_t palette_colors = get_palette_size(header); uint32_t palette_offset = header->header_size + 14; uint8_t pixel_size; + uint32_t i; + int err; switch (header->header_size) { case BITMAPCOREHEADER: @@ -278,9 +277,10 @@ GP_RetCode read_bitmap_palette(FILE *f, struct bitmap_info_header *header, palette_offset, palette_offset, pixel_size); if (fseek(f, palette_offset, SEEK_SET)) { + err = errno; GP_DEBUG(1, "fseek(f, 0x%02x) failed: '%s'", BMP_HEADER_OFFSET, strerror(errno)); - return GP_EBADFILE; + return err; } for (i = 0; i < palette_colors; i++) { @@ -288,7 +288,7 @@ GP_RetCode read_bitmap_palette(FILE *f, struct bitmap_info_header *header, if (fread(buf, 1, pixel_size, f) != pixel_size) { GP_DEBUG(1, "Failed to read palette %"PRIu32, i); - return GP_EBADFILE; + return EIO; } palette[i] = GP_Pixel_CREATE_RGB888(buf[2], buf[1], buf[0]); @@ -299,25 +299,27 @@ GP_RetCode read_bitmap_palette(FILE *f, struct bitmap_info_header *header, GP_Pixel_GET_B_RGB888(palette[i])); } - return GP_ESUCCESS; + return 0; } -GP_RetCode seek_pixels_offset(struct bitmap_info_header *header, - FILE *f) +static int seek_pixels_offset(struct bitmap_info_header *header, FILE *f) { + int err; + GP_DEBUG(2, "Offset to BMP pixels is 0x%x (%ubytes)", header->pixel_offset, header->pixel_offset); if (fseek(f, header->pixel_offset, SEEK_SET)) { + err = errno; GP_DEBUG(1, "fseek(f, 0x%02x) failed: '%s'", header->pixel_offset, strerror(errno)); - return GP_EBADFILE; + return err; } - return GP_ESUCCESS; + return 0; } -GP_PixelType match_pixel_type(struct bitmap_info_header *header) +static GP_PixelType match_pixel_type(struct bitmap_info_header *header) { switch (header->bpp) { case 1: @@ -390,18 +392,18 @@ static uint8_t get_idx(struct bitmap_info_header *header, return 0; } -GP_RetCode read_palette(FILE *f, struct bitmap_info_header *header, +static int read_palette(FILE *f, struct bitmap_info_header *header, GP_Context *context, GP_ProgressCallback *callback) { - GP_RetCode ret; uint32_t palette_size = get_palette_size(header); GP_Pixel palette[get_palette_size(header)]; + int err; - if ((ret = read_bitmap_palette(f, header, palette))) - return ret; + if ((err = read_bitmap_palette(f, header, palette))) + return err; - if ((ret = seek_pixels_offset(header, f))) - return ret; + if ((err = seek_pixels_offset(header, f))) + return err; uint32_t row_size = bitmap_row_size(header); int32_t y; @@ -412,7 +414,7 @@ GP_RetCode read_palette(FILE *f, struct bitmap_info_header *header, if (fread(row, 1, row_size, f) != row_size) { GP_DEBUG(1, "Failed to read row %"PRId32, y); - return GP_EBADFILE; + return EIO; } for (x = 0; x < header->w; x++) { @@ -439,23 +441,23 @@ GP_RetCode read_palette(FILE *f, struct bitmap_info_header *header, if (GP_ProgressCallbackReport(callback, header->h - y -1, context->h, context->w)) { GP_DEBUG(1, "Operation aborted"); - return GP_EINTR; + return ECANCELED; } } GP_ProgressCallbackDone(callback); - return GP_ESUCCESS; + return 0; } -GP_RetCode read_rgb888(FILE *f, struct bitmap_info_header *header, +static int read_rgb888(FILE *f, struct bitmap_info_header *header, GP_Context *context, GP_ProgressCallback *callback) { - GP_RetCode ret; uint32_t row_size = 3 * header->w; int32_t y; + int err; - if ((ret = seek_pixels_offset(header, f))) - return ret; + if ((err = seek_pixels_offset(header, f))) + return err; for (y = 0; y < GP_ABS(header->h); y++) { int32_t ry; @@ -467,9 +469,11 @@ GP_RetCode read_rgb888(FILE *f, struct bitmap_info_header *header, uint8_t *row = GP_PIXEL_ADDR(context, 0, ry); - if (fread(row, 1, row_size, f) != row_size) - return GP_EBADFILE; - + if (fread(row, 1, row_size, f) != row_size) { + GP_DEBUG(1, "Failed to read row %"PRId32, y); + return EIO; + } + /* Rows are four byte aligned */ switch (row_size % 4) { case 1: @@ -485,15 +489,15 @@ GP_RetCode read_rgb888(FILE *f, struct bitmap_info_header *header, if (GP_ProgressCallbackReport(callback, header->h - y -1, context->h, context->w)) { GP_DEBUG(1, "Operation aborted"); - return GP_EINTR; + return ECANCELED; } } GP_ProgressCallbackDone(callback); - return GP_ESUCCESS; + return 0; } -GP_RetCode read_bitmap_pixels(FILE *f, struct bitmap_info_header *header, +static int read_bitmap_pixels(FILE *f, struct bitmap_info_header *header, GP_Context *context, GP_ProgressCallback *callback) { switch (header->bpp) { @@ -507,20 +511,21 @@ GP_RetCode read_bitmap_pixels(FILE *f, struct bitmap_info_header *header, return read_rgb888(f, header, context, callback); } - return GP_ENOIMPL; + return ENOSYS; } -GP_RetCode GP_OpenBMP(const char *src_path, FILE **f, - GP_Size *w, GP_Size *h, GP_PixelType *pixel_type) +int GP_OpenBMP(const char *src_path, FILE **f, + GP_Size *w, GP_Size *h, GP_PixelType *pixel_type) { - GP_RetCode ret = GP_EBADFILE; - + int err; + *f = fopen(src_path, "rb"); if (*f == NULL) { + err = errno; GP_DEBUG(1, "Failed to open '%s' : %s", src_path, strerror(errno)); - return GP_EBADFILE; + goto err2; } int ch1 = fgetc(*f); @@ -530,78 +535,81 @@ GP_RetCode GP_OpenBMP(const char *src_path, FILE **f, GP_DEBUG(1, "Unexpected bitmap header 0x%02x (%c) 0x%02x (%c)", ch1, isascii(ch1) ? ch1 : ' ', ch2, isascii(ch2) ? ch2 : ' '); - goto err; + err = EILSEQ; + goto err1; } if (w != NULL || h != NULL || pixel_type != NULL) { struct bitmap_info_header header; - if ((ret = read_bitmap_header(*f, &header))) - goto err; + if ((err = read_bitmap_header(*f, &header))) + goto err1; if (w != NULL) *w = header.w; if (h != NULL) *h = header.h; + + if (pixel_type != NULL) + *pixel_type = match_pixel_type(&header); } - return GP_ESUCCESS; -err: + return 0; +err1: fclose(*f); - return GP_EBADFILE; +err2: + errno = err; + return 1; } -GP_RetCode GP_ReadBMP(FILE *f, GP_Context **res, - GP_ProgressCallback *callback) +GP_Context *GP_ReadBMP(FILE *f, GP_ProgressCallback *callback) { struct bitmap_info_header header; - GP_RetCode ret; GP_PixelType pixel_type; + GP_Context *context; + int err; - if ((ret = read_bitmap_header(f, &header))) - goto err; + if ((err = read_bitmap_header(f, &header))) + goto err1; if (header.compress_type != COMPRESS_RGB) { - ret = GP_ENOIMPL; - goto err; + GP_DEBUG(2, "Unknown compression type"); + err = ENOSYS; + goto err1; } if ((pixel_type = match_pixel_type(&header)) == GP_PIXEL_UNKNOWN) { - ret = GP_ENOIMPL; - goto err; + GP_DEBUG(2, "Unknown pixel type"); + err = ENOSYS; + goto err1; } - - GP_Context *context; context = GP_ContextAlloc(header.w, GP_ABS(header.h), pixel_type); if (context == NULL) { - ret = GP_ENOMEM; - goto err; - } - - if ((ret = read_bitmap_pixels(f, &header, context, callback))) + err = ENOMEM; goto err1; + } - *res = context; + if ((err = read_bitmap_pixels(f, &header, context, callback))) + goto err2; - return GP_ESUCCESS; -err1: + return context; +err2: GP_ContextFree(context); -err: +err1: fclose(f); - return ret; + errno = err; + return NULL; } -GP_RetCode GP_LoadBMP(const char *src_path, GP_Context **res, - GP_ProgressCallback *callback) +GP_Context *GP_LoadBMP(const char *src_path, GP_ProgressCallback *callback) { FILE *f; - GP_RetCode ret; - if ((ret = GP_OpenBMP(src_path, &f, NULL, NULL, NULL))) - return ret; + if (GP_OpenBMP(src_path, &f, NULL, NULL, NULL)) + return NULL; - return GP_ReadBMP(f, res, callback); + return GP_ReadBMP(f, callback); } diff --git a/libs/loaders/GP_Loaders.c b/libs/loaders/GP_Loaders.c index 7544b01..290890a 100644 --- a/libs/loaders/GP_Loaders.c +++ b/libs/loaders/GP_Loaders.c @@ -115,7 +115,7 @@ GP_Context *GP_LoadImage(const char *src_path, GP_ProgressCallback *callback) case 'm': if (src_path[len - 3] == 'B' || src_path[len - 3] == 'b') - GP_LoadBMP(src_path, &res, callback); + res = GP_LoadBMP(src_path, callback); break; } break; http://repo.or.cz/w/gfxprim.git/commit/9312d0d036e98c1662b966604dd8d9ad9215… commit 9312d0d036e98c1662b966604dd8d9ad9215c1ab Author: Cyril Hrubis <metan(a)ucw.cz> Date: Tue Apr 17 14:18:19 2012 +0200 loaders: Starting to change image loaders API. diff --git a/demos/grinder/grinder.c b/demos/grinder/grinder.c index 2822bcf..be3bf09 100644 --- a/demos/grinder/grinder.c +++ b/demos/grinder/grinder.c @@ -24,6 +24,7 @@ #include <stdlib.h> #include <unistd.h> #include <string.h> +#include <errno.h> #include "GP.h" @@ -601,7 +602,7 @@ static GP_RetCode arithmetic(GP_Context **c, const char *params) GP_Context *img, *res = NULL; - if (GP_LoadImage(file, &img, progress_callback)) { + if ((img = GP_LoadImage(file, progress_callback)) == NULL) { print_error("arithmetic: Invalid image."); return GP_EINVAL; } @@ -851,7 +852,6 @@ static void save_by_fmt(struct GP_Context *bitmap, const char *name, const char int main(int argc, char *argv[]) { GP_Context *bitmap; - GP_RetCode ret; int opt, i; const char *out_fmt = "ppm"; @@ -906,9 +906,8 @@ int main(int argc, char *argv[]) progress_prefix = "Loading image"; - if ((ret = GP_LoadImage(argv[i], &bitmap, progress_callback))) { - fprintf(stderr, "Failed to load bitmap: %sn", - GP_RetCodeName(ret)); + if ((bitmap = GP_LoadImage(argv[i], progress_callback)) == NULL) { + fprintf(stderr, "Failed to load bitmap: %sn", strerror(errno)); return 1; } diff --git a/demos/py_simple/blur.py b/demos/py_simple/blur.py index 5ed5271..80c35de 100755 --- a/demos/py_simple/blur.py +++ b/demos/py_simple/blur.py @@ -13,7 +13,7 @@ def main(): radii = int(sys.argv[1]) # Load Image - img = loaders.LoadImage_Wrap(sys.argv[2]) + img = loaders.LoadImage(sys.argv[2], None) # Do in-place gaussian blur filters.FilterGaussianBlur(img, img, radii, radii, None) # Save result diff --git a/demos/spiv/spiv.c b/demos/spiv/spiv.c index 7882839..bbe7ef0 100644 --- a/demos/spiv/spiv.c +++ b/demos/spiv/spiv.c @@ -115,6 +115,7 @@ static void *image_loader(void *ptr) GP_ProgressCallback callback = {.callback = image_loader_callback}; struct cpu_timer timer; struct cpu_timer sum_timer; + GP_Context *img; cpu_timer_start(&sum_timer, "sum"); @@ -123,16 +124,15 @@ static void *image_loader(void *ptr) fprintf(stderr, "Loading '%s'n", params->img_path); - GP_Context *img = NULL; - callback.priv = "Loading image"; cpu_timer_start(&timer, "Loading"); - if (GP_LoadImage(params->img_path, &img, &callback) != 0) { + if ((img = GP_LoadImage(params->img_path, &callback)) == NULL) { GP_Fill(context, black_pixel); GP_Text(context, NULL, context->w/2, context->h/2, - GP_ALIGN_CENTER|GP_VALIGN_CENTER, black_pixel, white_pixel, + GP_ALIGN_CENTER|GP_VALIGN_CENTER, white_pixel, black_pixel, "Failed to load image :("); + GP_BackendFlip(backend); return NULL; } cpu_timer_stop(&timer); diff --git a/include/loaders/GP_Loaders.h b/include/loaders/GP_Loaders.h index 96b26c8..dd1ff12 100644 --- a/include/loaders/GP_Loaders.h +++ b/include/loaders/GP_Loaders.h @@ -44,9 +44,10 @@ #include "GP_JPG.h" /* - * Tries to load image accordingly to extension. + * Tries to load image accordingly to the file extension. + * + * If operation fails NULL is returned and errno is filled. */ -GP_RetCode GP_LoadImage(const char *src_path, GP_Context **res, - GP_ProgressCallback *callback); +GP_Context *GP_LoadImage(const char *src_path, GP_ProgressCallback *callback); #endif /* LOADERS_GP_LOADERS_H */ diff --git a/libs/loaders/GP_Loaders.c b/libs/loaders/GP_Loaders.c index 8ef8c63..7544b01 100644 --- a/libs/loaders/GP_Loaders.c +++ b/libs/loaders/GP_Loaders.c @@ -34,17 +34,24 @@ #include "GP_Loaders.h" -GP_RetCode GP_LoadImage(const char *src_path, GP_Context **res, - GP_ProgressCallback *callback) +GP_Context *GP_LoadImage(const char *src_path, GP_ProgressCallback *callback) { - int len = strlen(src_path); - GP_RetCode ret = GP_ENOIMPL; - + int len, saved_errno; + GP_Context *res = NULL; + if (access(src_path, R_OK)) { + + saved_errno = errno; + GP_DEBUG(1, "Failed to access file '%s' : %s", src_path, strerror(errno)); - return GP_EBADFILE; + + errno = saved_errno; + + return NULL; } + + len = strlen(src_path); if (len < 3) goto skip_filename_check; @@ -58,13 +65,13 @@ GP_RetCode GP_LoadImage(const char *src_path, GP_Context **res, case 'N': if (src_path[len - 3] == 'p' || src_path[len - 3] == 'P') - ret = GP_LoadPNG(src_path, res, callback); + GP_LoadPNG(src_path, &res, callback); break; case 'p': case 'P': if (src_path[len - 3] == 'j' || src_path[len - 3] == 'J') - ret = GP_LoadJPG(src_path, res, callback); + GP_LoadJPG(src_path, &res, callback); break; case 'e': case 'E': @@ -72,7 +79,7 @@ GP_RetCode GP_LoadImage(const char *src_path, GP_Context **res, src_path[len - 3] == 'P') && (src_path[len - 4] == 'j' || src_path[len - 4] == 'J')) - ret = GP_LoadJPG(src_path, res, callback); + GP_LoadJPG(src_path, &res, callback); break; } break; @@ -84,19 +91,19 @@ GP_RetCode GP_LoadImage(const char *src_path, GP_Context **res, case 'B': if (src_path[len - 3] == 'p' || src_path[len - 3] == 'P') - ret = GP_LoadPBM(src_path, res); + GP_LoadPBM(src_path, &res); break; case 'g': case 'G': if (src_path[len - 3] == 'p' || src_path[len - 3] == 'P') - ret = GP_LoadPGM(src_path, res); + GP_LoadPGM(src_path, &res); break; case 'p': case 'P': if (src_path[len - 3] == 'p' || src_path[len - 3] == 'P') - ret = GP_LoadPPM(src_path, res); + GP_LoadPPM(src_path, &res); break; } break; @@ -108,7 +115,7 @@ GP_RetCode GP_LoadImage(const char *src_path, GP_Context **res, case 'm': if (src_path[len - 3] == 'B' || src_path[len - 3] == 'b') - ret = GP_LoadBMP(src_path, res, callback); + GP_LoadBMP(src_path, &res, callback); break; } break; @@ -118,5 +125,5 @@ skip_filename_check: //TODO file signature based check - return ret; + return res; } diff --git a/pylib/gfxprim/loaders/loaders.i b/pylib/gfxprim/loaders/loaders.i index 990b07d..7939dd8 100644 --- a/pylib/gfxprim/loaders/loaders.i +++ b/pylib/gfxprim/loaders/loaders.i @@ -15,18 +15,6 @@ %include "GP_Loaders.h" -%{ -GP_Context *GP_LoadImage_Wrap(const char *src_path) -{ - GP_Context *c = NULL; - if (GP_LoadImage(src_path, &c, NULL) != 0) - return NULL; - return c; -} -%} - -GP_Context *GP_LoadImage_Wrap(const char *src_path); - %include "GP_JPG.h" %include "GP_PBM.h" %include "GP_PGM.h" diff --git a/tests/SDL/blittest.c b/tests/SDL/blittest.c index 5136200..2d09436 100644 --- a/tests/SDL/blittest.c +++ b/tests/SDL/blittest.c @@ -23,8 +23,9 @@ * * *****************************************************************************/ -#include <stdio.h> #include <stdlib.h> +#include <stdio.h> +#include <errno.h> #include <SDL/SDL.h> #include "GP.h" @@ -191,10 +192,8 @@ int main(int argc, char *argv[]) GP_SetDebugLevel(10); - GP_RetCode ret; - - if ((ret = GP_LoadImage(sprite, &bitmap_raw, NULL))) { - fprintf(stderr, "Failed to load bitmap: %sn", GP_RetCodeName(ret)); + if ((bitmap_raw = GP_LoadImage(sprite, NULL)) == NULL) { + fprintf(stderr, "Failed to load bitmap: %sn", strerror(errno)); return 1; } diff --git a/tests/SDL/runtest.sh b/tests/SDL/runtest.sh index 73c9f61..163c76c 100755 --- a/tests/SDL/runtest.sh +++ b/tests/SDL/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 "$@" diff --git a/tests/SDL/showimage.c b/tests/SDL/showimage.c index b0f0839..90bc393 100644 --- a/tests/SDL/showimage.c +++ b/tests/SDL/showimage.c @@ -20,8 +20,9 @@ * * *****************************************************************************/ -#include <stdio.h> #include <stdlib.h> +#include <stdio.h> +#include <errno.h> #include <SDL/SDL.h> #include "GP.h" @@ -91,10 +92,8 @@ int main(int argc, char *argv[]) GP_SetDebugLevel(10); - GP_RetCode ret; - - if ((ret = GP_LoadImage(argv[1], &bitmap, NULL))) { - fprintf(stderr, "Failed to load bitmap: %sn", GP_RetCodeName(ret)); + if ((bitmap = GP_LoadImage(argv[1], NULL)) == NULL) { + fprintf(stderr, "Failed to load bitmap: %sn", strerror(errno)); return 1; } ----------------------------------------------------------------------- Summary of changes: demos/grinder/grinder.c | 9 +- demos/py_simple/blur.py | 2 +- demos/spiv/spiv.c | 15 ++-- include/loaders/GP_BMP.h | 29 ++++-- include/loaders/GP_JPG.h | 13 +-- include/loaders/GP_Loaders.h | 7 +- include/loaders/GP_PNG.h | 36 ++++++--- libs/loaders/GP_BMP.c | 182 ++++++++++++++++++++------------------- libs/loaders/GP_JPG.c | 119 ++++++++++++++------------ libs/loaders/GP_Loaders.c | 35 +++++--- libs/loaders/GP_PNG.c | 142 +++++++++++++++++-------------- pylib/gfxprim/loaders/loaders.i | 12 --- tests/SDL/blittest.c | 9 +- tests/SDL/runtest.sh | 2 +- tests/SDL/showimage.c | 9 +- 15 files changed, 334 insertions(+), 287 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: 4f696f6a05e20284f976c0ed1d99c6779adda778
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 4f696f6a05e20284f976c0ed1d99c6779adda778 (commit) from 500978aa7bfc00cfab2ec26470d50fce51d07f58 (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/4f696f6a05e20284f976c0ed1d99c6779add… commit 4f696f6a05e20284f976c0ed1d99c6779adda778 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat Apr 7 21:40:29 2012 +0200 demos: Added blur simple python demo. diff --git a/demos/py_simple/blur.py b/demos/py_simple/blur.py new file mode 100755 index 0000000..5ed5271 --- /dev/null +++ b/demos/py_simple/blur.py @@ -0,0 +1,23 @@ +#!/usr/bin/env python +import sys + +import gfxprim.core as core +import gfxprim.loaders as loaders +import gfxprim.filters as filters + +def main(): + if len(sys.argv) != 3: + print("usage: blur blur-radii image") + sys.exit(1) + + radii = int(sys.argv[1]) + + # Load Image + img = loaders.LoadImage_Wrap(sys.argv[2]) + # Do in-place gaussian blur + filters.FilterGaussianBlur(img, img, radii, radii, None) + # Save result + loaders.SaveJPG("out.jpg", img, None) + +if __name__ == '__main__': + main() ----------------------------------------------------------------------- Summary of changes: demos/py_simple/blur.py | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) create mode 100755 demos/py_simple/blur.py repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch master updated: 500978aa7bfc00cfab2ec26470d50fce51d07f58
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 500978aa7bfc00cfab2ec26470d50fce51d07f58 (commit) from 91041332ac12cde0c83145987a97a71dad95b460 (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/500978aa7bfc00cfab2ec26470d50fce51d0… commit 500978aa7bfc00cfab2ec26470d50fce51d07f58 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat Apr 7 20:57:20 2012 +0200 pywrap: Another fix for python 3.2 diff --git a/pylib/gfxprim/loaders/__init__.py b/pylib/gfxprim/loaders/__init__.py index c3fe31b..5dd476e 100644 --- a/pylib/gfxprim/loaders/__init__.py +++ b/pylib/gfxprim/loaders/__init__.py @@ -3,7 +3,7 @@ from . import loaders_c def _init(module): # Extend Context with convenience methods - from _extend_context import extend_context + from ._extend_context import extend_context from ..core import Context extend_context(Context) ----------------------------------------------------------------------- Summary of changes: pylib/gfxprim/loaders/__init__.py | 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: 91041332ac12cde0c83145987a97a71dad95b460
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 91041332ac12cde0c83145987a97a71dad95b460 (commit) from 476e5a9b3a255fb9669f63565bd20f11c18b7854 (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/91041332ac12cde0c83145987a97a71dad95… commit 91041332ac12cde0c83145987a97a71dad95b460 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat Apr 7 20:45:29 2012 +0200 build: Remove hardcoded SWIG=swig from config.mk diff --git a/config.mk b/config.mk index 676922c..55f6140 100644 --- a/config.mk +++ b/config.mk @@ -14,8 +14,6 @@ PYTHON=PYTHONPATH=$$PYTHONPATH:${PYLIBSDIR} ${PYTHON_BIN} -Werror SWIGOPTS=-Wextra -w322,314 -I/usr/include/ -SWIG=swig - # # If set to yes, rebuilds libGP* after typing make # in any of the libs/*/ directories that are linked ----------------------------------------------------------------------- Summary of changes: config.mk | 2 -- 1 files changed, 0 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: 476e5a9b3a255fb9669f63565bd20f11c18b7854
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 476e5a9b3a255fb9669f63565bd20f11c18b7854 (commit) via 294e7a692f28db0543dd81d60d4f8f65b8303c99 (commit) via fb23aada76c6752285251c2931a77415544cb692 (commit) via 2e66c22cbfaf57bfff1a6a21500388b615a674ff (commit) from 96ac55e75beb4dd1f167ef34b5e9bad72f71c3aa (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/476e5a9b3a255fb9669f63565bd20f11c18b… commit 476e5a9b3a255fb9669f63565bd20f11c18b7854 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat Apr 7 20:34:34 2012 +0200 build: Fix pywrap which wrongly includes config.gen.mk That acutally breaks the build once config.mk is included in pre.mk rather then post.mk. diff --git a/pywrap.mk b/pywrap.mk index d53041e..0ec5602 100644 --- a/pywrap.mk +++ b/pywrap.mk @@ -7,8 +7,6 @@ SWIG_PY=$(LIBNAME)_c.py SWIG_C=$(LIBNAME)_wrap.c SWIG_LIB=_$(LIBNAME)_c.so -include $(TOPDIR)/config.gen.mk - ifneq ($(SWIG),) INCLUDES+=$(addprefix -I$(TOPDIR)/include/, $(INCLUDE)) http://repo.or.cz/w/gfxprim.git/commit/294e7a692f28db0543dd81d60d4f8f65b830… commit 294e7a692f28db0543dd81d60d4f8f65b8303c99 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat Apr 7 20:23:13 2012 +0200 build: Add missing pre.mk into tests Makefile diff --git a/tests/core/Makefile b/tests/core/Makefile index 8ab278b..c848cb0 100644 --- a/tests/core/Makefile +++ b/tests/core/Makefile @@ -1,5 +1,7 @@ TOPDIR=../.. +include $(TOPDIR)/pre.mk + LIBNAME=core TESTSUITE=core_suite LDLIBS+=-lGP -L$(TOPDIR)/build/ -lcheck -lm -lSDL http://repo.or.cz/w/gfxprim.git/commit/fb23aada76c6752285251c2931a77415544c… commit fb23aada76c6752285251c2931a77415544cb692 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat Apr 7 20:18:33 2012 +0200 pylib: Fix resource IO warning by closing the config file. diff --git a/pylib/gp_codegen/render_utils.py b/pylib/gp_codegen/render_utils.py index 0e781db..b4ca701 100644 --- a/pylib/gp_codegen/render_utils.py +++ b/pylib/gp_codegen/render_utils.py @@ -94,8 +94,10 @@ def load_gfxprimconfig(config_file = None): } # python 3.2 doesn't have execfile, curse you python devs # execfile(config_file, globals(), l) - exec(compile(open(config_file).read(), config_file, 'exec'), globals(), l) - + cf = open(config_file) + exec(compile(cf.read(), config_file, 'exec'), globals(), l) + cf.close() + config = l["config"] return config http://repo.or.cz/w/gfxprim.git/commit/2e66c22cbfaf57bfff1a6a21500388b615a6… commit 2e66c22cbfaf57bfff1a6a21500388b615a674ff Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat Apr 7 20:16:53 2012 +0200 build: Remove possible stray .lock in build dir on make clean diff --git a/build/Makefile b/build/Makefile index 8a7ec11..7ac79b2 100644 --- a/build/Makefile +++ b/build/Makefile @@ -7,10 +7,10 @@ rebuild: all clean: ifdef VERBOSE - rm -f libGP.a libGP.so libGP.so.0 + rm -rf libGP.a libGP.so libGP.so.0 .lock else - @echo "RM libGP.a libGP.so libGP.so.0" - @rm -f libGP.a libGP.so libGP.so.0 + @echo "RM libGP.a libGP.so libGP.so.0 .lock" + @rm -rf libGP.a libGP.so libGP.so.0 .lock endif libGP.a: ----------------------------------------------------------------------- Summary of changes: build/Makefile | 6 +++--- pylib/gp_codegen/render_utils.py | 6 ++++-- pywrap.mk | 2 -- tests/core/Makefile | 2 ++ 4 files changed, 9 insertions(+), 7 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