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 bc90b8ca4857bb02db99601f3022907a08d7719d (commit) via 32c6c88ff682abfd417823b937b31dcca2c61ec0 (commit) from e0c2b6aa02d3f2341c971399623c5b69cb409c88 (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/bc90b8ca4857bb02db99601f3022907a08d77... commit bc90b8ca4857bb02db99601f3022907a08d7719d Author: Cyril Hrubis <metan@ucw.cz> Date: Fri Aug 16 16:48:56 2013 +0200 doc: Add LoadJP2() docs. Signed-off-by: Cyril Hrubis <metan@ucw.cz> diff --git a/doc/general.txt b/doc/general.txt index 4179408..00dd795 100644 --- a/doc/general.txt +++ b/doc/general.txt @@ -103,6 +103,11 @@ images into various standard formats (PNG, JPEG, GIF, TIFF, BMP, PNM, etc...). [green]#All but < 8bit binary grayscale# | [green]#All ASCII formats# +| JP2 | + JPEG 2000 | + [green]#Experimental support for RGB images# | + [black]*No* + | CBZ | Comic book archive | [green]#Experimental support via ZIP Container# | diff --git a/doc/loaders.txt b/doc/loaders.txt index fd10817..1702470 100644 --- a/doc/loaders.txt +++ b/doc/loaders.txt @@ -338,6 +338,23 @@ int GP_MatchJPG(const void *buf); Matches a JPG signature. +JPEG 2000 Loader +~~~~~~~~~~~~~~~~ +The 'JPEG 2000' image support is implemented using the openjpeg library. + +[source,c] +------------------------------------------------------------------------------- +#include <loaders/GP_JP2.h> +/* or */ +#include <GP.h> + +GP_Context *GP_LoadJP2(const char *src_path, GP_ProgressCallback *callback); +------------------------------------------------------------------------------- + +Loads 'JPEG 2000' image. + +Due to limitations of the openjpeg library progress callback does not work. + GIF Loader ~~~~~~~~~~ diff --git a/doc/loaders_python.txt b/doc/loaders_python.txt index 42dff04..00c5cef 100644 --- a/doc/loaders_python.txt +++ b/doc/loaders_python.txt @@ -15,6 +15,7 @@ import gfxprim.loaders as loaders img = loaders.LoadBMP(path, callback=None) img = loaders.LoadGIF(path, callback=None) img = loaders.LoadJPG(path, callback=None) + img = loaders.LoadJP2(path, callback=None) img = loaders.LoadPBM(path, callback=None) img = loaders.LoadPGM(path, callback=None) img = loaders.LoadPNG(path, callback=None) http://repo.or.cz/w/gfxprim.git/commit/32c6c88ff682abfd417823b937b31dcca2c61... commit 32c6c88ff682abfd417823b937b31dcca2c61ec0 Author: Cyril Hrubis <metan@ucw.cz> Date: Fri Aug 16 16:47:41 2013 +0200 pywrap: loaders: Add LoadJP2() Signed-off-by: Cyril Hrubis <metan@ucw.cz> diff --git a/pylib/gfxprim/loaders/__init__.py b/pylib/gfxprim/loaders/__init__.py index d1a63a6..7a1bd83 100644 --- a/pylib/gfxprim/loaders/__init__.py +++ b/pylib/gfxprim/loaders/__init__.py @@ -98,8 +98,8 @@ def _init(module): from ..utils import import_members import_members(c_loaders, module, sub=strip_GP, include=[ - '^GP_Load[A-Z]{3}.*', - '^GP_Save[A-Z]{3}.*', + '^GP_Load[A-Z,0-9]{3}.*', + '^GP_Save[A-Z,0-9]{3}.*', '^GP_ListLoaders$', '^GP_LoadMetaData$', ]) diff --git a/pylib/gfxprim/loaders/loaders.i b/pylib/gfxprim/loaders/loaders.i index 66bd1e8..f310e74 100644 --- a/pylib/gfxprim/loaders/loaders.i +++ b/pylib/gfxprim/loaders/loaders.i @@ -80,7 +80,11 @@ ERROR_ON_NONZERO(GP_SaveTIFF); %include "GP_TIFF.h" ERROR_ON_NULL(GP_LoadPSP); - %newobject GP_LoadPSP; %include "GP_PSP.h" + +ERROR_ON_NULL(GP_LoadJP2); +%newobject GP_LoadJP2; + +%include "GP_JP2.h" ----------------------------------------------------------------------- Summary of changes: doc/general.txt | 5 +++++ doc/loaders.txt | 17 +++++++++++++++++ doc/loaders_python.txt | 1 + pylib/gfxprim/loaders/__init__.py | 4 ++-- pylib/gfxprim/loaders/loaders.i | 6 +++++- 5 files changed, 30 insertions(+), 3 deletions(-) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos@gmail.com if you want to unsubscribe, or site admin admin@repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")