May 2012 - Gfxprim

[repo.or.cz] gfxprim.git branch master updated: 9dc7c882ccd99e87e0146b367037d89ceb98aef1
by metan 28 May '12

28 May '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 9dc7c882ccd99e87e0146b367037d89ceb98aef1 (commit) from 4939286022a028a66c62ee082748384a908fed37 (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/9dc7c882ccd99e87e0146b367037d89ceb98… commit 9dc7c882ccd99e87e0146b367037d89ceb98aef1 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon May 28 19:11:21 2012 +0200 filters: Clamp Floyd-Steinberg result pixels. Visible owerflows were found on RGB565 diff --git a/libs/filters/GP_FloydSteinberg.gen.c.t b/libs/filters/GP_FloydSteinberg.gen.c.t index 9886945..df22cfb 100644 --- a/libs/filters/GP_FloydSteinberg.gen.c.t +++ b/libs/filters/GP_FloydSteinberg.gen.c.t @@ -1,4 +1,4 @@ -%% extends "base.c.t" +%% extends "common.c.t" {% block descr %}Floyd Steinberg dithering RGB888 -> any pixel{% endblock %} @@ -62,7 +62,6 @@ int GP_FilterFloydSteinberg_RGB888_to_{{ pt.name }}_Raw(const GP_Context *src, G val_{{ c[0] }} += errors_{{ c[0] }}[y%2][x]; float err_{{ c[0] }} = val_{{ c[0] }}; - %% if pt.is_gray() GP_Pixel res_{{ c[0] }} = {{ 2 ** c[2] - 1}} * val_{{ c[0] }} / (3 * 255); err_{{ c[0] }} -= res_{{ c[0] }} * (3 * 255) / {{ 2 ** c[2] - 1}}; @@ -72,6 +71,8 @@ int GP_FilterFloydSteinberg_RGB888_to_{{ pt.name }}_Raw(const GP_Context *src, G %% endif {{ distribute_error("errors_%s"|format(c[0]), 'x', 'y', '(GP_Coord)src->w', 'err_%s'|format(c[0])) }} + + {{ clamp_val("res_%s"|format(c[0]), c[2]) }} %% endfor %% if pt.is_gray() diff --git a/pylib/templates/common.c.t b/pylib/templates/common.c.t index d3fcbd8..785174d 100644 --- a/pylib/templates/common.c.t +++ b/pylib/templates/common.c.t @@ -14,3 +14,10 @@ * Converts channels to params */ {% macro expand_chanslist(chlist) %} {{ chlist[0][0] }}{% for i in chlist %}, {{ i[0] }}{% endfor %}{% endmacro %} + +/* + * Clamps n-bits value + */ +%%macro clamp_val(val, bits) +if ({{ val }} > {{ 2 ** bits - 1 }}) {{ val }} = {{ 2 ** bits - 1}}; +%% endmacro ----------------------------------------------------------------------- Summary of changes: libs/filters/GP_FloydSteinberg.gen.c.t | 5 +++-- pylib/templates/common.c.t | 7 +++++++ 2 files changed, 10 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: 4939286022a028a66c62ee082748384a908fed37
by metan 28 May '12

28 May '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 4939286022a028a66c62ee082748384a908fed37 (commit) from 0d68cb863abf1ed7aef032d87f21a0e7193f2986 (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/4939286022a028a66c62ee082748384a908f… commit 4939286022a028a66c62ee082748384a908fed37 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon May 28 15:43:10 2012 +0200 loaders: Start with meta-data support for JPEG. diff --git a/include/loaders/GP_JPG.h b/include/loaders/GP_JPG.h index 7cbbd36..73113c4 100644 --- a/include/loaders/GP_JPG.h +++ b/include/loaders/GP_JPG.h @@ -32,6 +32,8 @@ #include "core/GP_Context.h" #include "core/GP_ProgressCallback.h" +#include "GP_MetaData.h" + /* * Opens up file and checks signature. */ @@ -49,6 +51,12 @@ GP_Context *GP_ReadJPG(FILE *f, GP_ProgressCallback *callback); GP_Context *GP_LoadJPG(const char *src_path, GP_ProgressCallback *callback); /* + * Loads JPEG meta-data, called markers in JPEG terminology. + */ +int GP_ReadJPGMetaData(FILE *f, GP_MetaData *data); +int GP_LoadJPGMetaData(const char *src_path, GP_MetaData *data); + +/* * Saves JPG to a file. */ int GP_SaveJPG(const GP_Context *src, const char *dst_path, diff --git a/libs/loaders/GP_JPG.c b/libs/loaders/GP_JPG.c index 6011b8f..f600b57 100644 --- a/libs/loaders/GP_JPG.c +++ b/libs/loaders/GP_JPG.c @@ -205,6 +205,103 @@ GP_Context *GP_LoadJPG(const char *src_path, GP_ProgressCallback *callback) return res; } +#define JPEG_COM_MAX 128 + +static void read_jpg_metadata(struct jpeg_decompress_struct *cinfo, + GP_MetaData *data) +{ + jpeg_saved_marker_ptr marker; + + for (marker = cinfo->marker_list; marker != NULL; marker = marker->next) { + switch (marker->marker) { + case JPEG_COM: { + char buf[JPEG_COM_MAX+1]; + + memcpy(buf, marker->data, marker->data_length); + buf[marker->data_length] = 0; + + /* Strip newline at the end of the commment */ + if (buf[marker->data_length-1] == 'n') + buf[marker->data_length-1] = 0; + + GP_MetaDataCreateString(data, "comment", buf, 1); + } + break; + case JPEG_APP0: + GP_DEBUG(0, "TODO: JFIF"); + break; + case JPEG_APP0 + 1: + GP_DEBUG(0, "TODO: EXIF"); + break; + } + } +} + +static void save_jpg_markers(struct jpeg_decompress_struct *cinfo) +{ + /* Comment marker */ + jpeg_save_markers(cinfo, JPEG_COM, JPEG_COM_MAX); + + /* APP0 marker = JFIF data */ + jpeg_save_markers(cinfo, JPEG_APP0 + 1, 0xffff); + + /* APP1 marker = Exif data */ + jpeg_save_markers(cinfo, JPEG_APP0 + 1, 0xffff); +} + +int GP_ReadJPGMetaData(FILE *f, GP_MetaData *data) +{ + struct jpeg_decompress_struct cinfo; + struct my_jpg_err my_err; + 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)) { + err = EIO; + goto err1; + } + + jpeg_create_decompress(&cinfo); + jpeg_stdio_src(&cinfo, f); + + save_jpg_markers(&cinfo); + + jpeg_read_header(&cinfo, TRUE); + + GP_DEBUG(1, "Have %s JPEG size %ux%u %i channels", + get_colorspace(cinfo.jpeg_color_space), + cinfo.image_width, cinfo.image_height, + cinfo.num_components); + + read_jpg_metadata(&cinfo, data); + +// jpeg_finish_decompress(&cinfo); + jpeg_destroy_decompress(&cinfo); + + return 0; +err1: + jpeg_destroy_decompress(&cinfo); + errno = err; + return 1; +} + +int GP_LoadJPGMetaData(const char *src_path, GP_MetaData *data) +{ + FILE *f; + int ret; + + if (GP_OpenJPG(src_path, &f)) + return 1; + + ret = GP_ReadJPGMetaData(f, data); + + fclose(f); + + return ret; +} + int GP_SaveJPG(const GP_Context *src, const char *dst_path, GP_ProgressCallback *callback) { @@ -326,6 +423,19 @@ GP_Context *GP_LoadJPG(const char GP_UNUSED(*src_path), return NULL; } +int GP_ReadJPGMetaData(FILE GP_UNUSED(*f), GP_MetaData GP_UNUSED(*data)) +{ + errno = ENOSYS; + return NULL; +} + +int GP_LoadJPGMetaData(const char GP_UNUSED(*src_path), + GP_MetaData GP_UNUSED(*data)) +{ + errno = ENOSYS; + return NULL; +} + int GP_SaveJPG(const GP_Context GP_UNUSED(*src), const char GP_UNUSED(*dst_path), GP_ProgressCallback GP_UNUSED(*callback)) ----------------------------------------------------------------------- Summary of changes: include/loaders/GP_JPG.h | 8 +++ libs/loaders/GP_JPG.c | 110 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 118 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

[repo.or.cz] gfxprim.git branch master updated: 0d68cb863abf1ed7aef032d87f21a0e7193f2986
by metan 28 May '12

28 May '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 0d68cb863abf1ed7aef032d87f21a0e7193f2986 (commit) via ce2eb53e48956d4f98fe814c10459c4340c077a9 (commit) via 056c9ac7bfef008374277b3aba84568742109d51 (commit) via 6874eb6694b57df3bc5c7d1a06688be72524e448 (commit) from cca1a95d0c61b096110045f796c86ab02703362f (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/0d68cb863abf1ed7aef032d87f21a0e7193f… commit 0d68cb863abf1ed7aef032d87f21a0e7193f2986 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon May 28 14:14:32 2012 +0200 loaders: Make use of double metadata type. diff --git a/libs/loaders/GP_PNG.c b/libs/loaders/GP_PNG.c index 7602fe7..5f324aa 100644 --- a/libs/loaders/GP_PNG.c +++ b/libs/loaders/GP_PNG.c @@ -284,8 +284,8 @@ static void load_meta_data(png_structp png, png_infop png_info, GP_MetaData *dat double width, height; if (png_get_sCAL(png, png_info, &unit, &width, &height)) { - GP_MetaDataCreateInt(data, "width", width * 1000); - GP_MetaDataCreateInt(data, "height", height * 1000); + GP_MetaDataCreateDouble(data, "width", width); + GP_MetaDataCreateDouble(data, "height", height); GP_MetaDataCreateInt(data, "unit", unit); } http://repo.or.cz/w/gfxprim.git/commit/ce2eb53e48956d4f98fe814c10459c4340c0… commit ce2eb53e48956d4f98fe814c10459c4340c077a9 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon May 28 14:09:07 2012 +0200 demos: Edhance png meta-data dumper example. diff --git a/demos/c_simple/meta_data_png.c b/demos/c_simple/meta_data_png.c index 3303bed..9f6543b 100644 --- a/demos/c_simple/meta_data_png.c +++ b/demos/c_simple/meta_data_png.c @@ -32,24 +32,36 @@ #include <GP.h> +#define SEP +"-----------------------------------------------------------------------------" + int main(int argc, char *argv[]) { - GP_MetaData *data = GP_MetaDataCreate(10); + GP_MetaData *data = GP_MetaDataCreate(20); + int i; - if (argc != 2) { - fprintf(stderr, "Takes an image as an parametern"); + if (argc < 2) { + fprintf(stderr, "Takes an image(s) as parameter(s)n"); return 1; } //GP_SetDebugLevel(10); - if (GP_LoadPNGMetaData(argv[1], data)) { - fprintf(stderr, "Failed to read '%s' meta-data: %sn", - argv[1], strerror(errno)); - return 1; + for (i = 1; i < argc; i++) { + puts(SEP); + printf("Opening '%s'n", argv[i]); + + GP_MetaDataClear(data); + + if (GP_LoadPNGMetaData(argv[i], data)) { + fprintf(stderr, "Failed to read '%s' meta-data: %sn", + argv[1], strerror(errno)); + } else { + GP_MetaDataPrint(data); + } } - - GP_MetaDataPrint(data); + + puts(SEP); return 0; } http://repo.or.cz/w/gfxprim.git/commit/056c9ac7bfef008374277b3aba8456874210… commit 056c9ac7bfef008374277b3aba84568742109d51 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon May 28 14:08:47 2012 +0200 demos: Add forgotten meta_data example. diff --git a/demos/c_simple/meta_data.c b/demos/c_simple/meta_data.c new file mode 100644 index 0000000..b5f2905 --- /dev/null +++ b/demos/c_simple/meta_data.c @@ -0,0 +1,84 @@ +/***************************************************************************** + * 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> * + * * + *****************************************************************************/ + + /* + + Meta-data storage operations example. + + Meta-data storage is used to store image meta-data (if present) such as + physical size, creation date, etc... + + Meta-data storage is basically an typed dictionary. + + This example shows low-level interface to GP_MetaData structure. + + */ + +#include <stdio.h> + +#include <GP.h> + +int main(void) +{ + GP_MetaData *data = GP_MetaDataCreate(10); + + //GP_SetDebugLevel(10); + + if (data == NULL) + return 1; + + /* + * Create integer + * + * May fail, if there is allready record with id 'dpi' or + * if there is no space left. + */ + GP_MetaDataCreateInt(data, "dpi", 300); + + /* + * Create an string. + * + * The last parameter says, if the string should be duplicated + * in the metadata storage. + */ + GP_MetaDataCreateString(data, "author", "Foo Bar <foo(a)bar.net>", 1); + GP_MetaDataCreateString(data, "comment", "Created in hurry.", 1); + GP_MetaDataCreateDouble(data, "pi", 3.141592); + + const char *ret; + + ret = GP_MetaDataGetString(data, "comment"); + + if (ret != NULL) + printf("Found string 'comment' = '%s'n", ret); + else + printf("ERROR: cannot cound string 'comment'n"); + + printf("n"); + + /* + * Print all meta-data + */ + GP_MetaDataPrint(data); + + return 0; +} http://repo.or.cz/w/gfxprim.git/commit/6874eb6694b57df3bc5c7d1a06688be72524… commit 6874eb6694b57df3bc5c7d1a06688be72524e448 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon May 28 14:08:04 2012 +0200 loaders: Add meta-data clear method and double type. diff --git a/include/loaders/GP_MetaData.h b/include/loaders/GP_MetaData.h index 2820ee0..4da30f1 100644 --- a/include/loaders/GP_MetaData.h +++ b/include/loaders/GP_MetaData.h @@ -28,10 +28,12 @@ enum GP_MetaType { GP_META_INT, GP_META_STRING, + GP_META_DOUBLE, }; union GP_MetaValue { int i; + double d; const char *str; }; @@ -53,6 +55,11 @@ typedef struct GP_MetaData GP_MetaData; GP_MetaData *GP_MetaDataCreate(unsigned int expected_records); /* + * Clears meta-data storage. + */ +void GP_MetaDataClear(GP_MetaData *self); + +/* * Destroys metadata (frees all alocated memory). */ void GP_MetaDataDestroy(GP_MetaData *self); @@ -92,6 +99,12 @@ GP_MetaRecord *GP_MetaDataCreateRecord(GP_MetaData *self, const char *id); GP_MetaRecord *GP_MetaDataCreateInt(GP_MetaData *self, const char *id, int val); /* + * Creates an double record and returns pointer to it. + */ +GP_MetaRecord *GP_MetaDataCreateDouble(GP_MetaData *self, const char *id, + double val); + +/* * Creates an string record and returns pointer to it. * * If dup is set to 1, the string is duplicated inside of the MetaData diff --git a/libs/loaders/GP_MetaData.c b/libs/loaders/GP_MetaData.c index b0fcdf8..e62af18 100644 --- a/libs/loaders/GP_MetaData.c +++ b/libs/loaders/GP_MetaData.c @@ -70,6 +70,16 @@ GP_MetaData *GP_MetaDataCreate(unsigned int expected_records) return data; } +void GP_MetaDataClear(GP_MetaData *self) +{ + GP_DEBUG(1, "Clearing MetaData %p with %u records", + self, self->rec_count); + + self->root = NULL; + self->rec_count = 0; + self->free = self->size; +} + void GP_MetaDataDestroy(GP_MetaData *self) { GP_DEBUG(1, "Destroying MetaData %p", self); @@ -92,6 +102,9 @@ void GP_MetaDataPrint(GP_MetaData *self) case GP_META_STRING: printf("'%s'n", rec->val.str); break; + case GP_META_DOUBLE: + printf("%lfn", rec->val.d); + break; } } } @@ -185,6 +198,31 @@ int GP_MetaDataGetInt(GP_MetaData *self, const char *id, int *res) return 0; } +int GP_MetaDataGetDouble(GP_MetaData *self, const char *id, double *res) +{ + GP_MetaRecord *rec; + + GP_DEBUG(2, "Looking for GP_META_DOUBLE id '%s'", id); + + rec = record_lookup(self, id, do_hash(id)); + + if (rec == NULL) { + GP_DEBUG(3, "Record id '%s' not found", id); + return 1; + } + + if (rec->type != GP_META_DOUBLE) { + GP_DEBUG(3, "Record id '%s' has wrong type", id); + return 1; + } + + *res = rec->val.d; + + GP_DEBUG(3, "Found GP_META_DOUBLE id '%s' = %lf", id, *res); + + return 0; +} + const char *GP_MetaDataGetString(GP_MetaData *self, const char *id) { GP_MetaRecord *rec; @@ -225,6 +263,24 @@ GP_MetaRecord *GP_MetaDataCreateInt(GP_MetaData *self, const char *id, int val) return rec; } +GP_MetaRecord *GP_MetaDataCreateDouble(GP_MetaData *self, const char *id, + double val) +{ + GP_MetaRecord *rec; + + GP_DEBUG(2, "Creating GP_META_DOUBLE id '%s' = %lf", id, val); + + rec = GP_MetaDataCreateRecord(self, id); + + if (rec == NULL) + return NULL; + + rec->type = GP_META_DOUBLE; + rec->val.d = val; + + return rec; +} + GP_MetaRecord *GP_MetaDataCreateString(GP_MetaData *self, const char *id, const char *str, int dup) { ----------------------------------------------------------------------- Summary of changes: demos/c_simple/{meta_data_png.c => meta_data.c} | 55 +++++++++++++++++----- demos/c_simple/meta_data_png.c | 30 +++++++++---- include/loaders/GP_MetaData.h | 13 +++++ libs/loaders/GP_MetaData.c | 56 +++++++++++++++++++++++ libs/loaders/GP_PNG.c | 4 +- 5 files changed, 134 insertions(+), 24 deletions(-) copy demos/c_simple/{meta_data_png.c => meta_data.c} (63%) 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: cca1a95d0c61b096110045f796c86ab02703362f
by metan 28 May '12

28 May '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 cca1a95d0c61b096110045f796c86ab02703362f (commit) from ed03e7bc0d0825a97e73887be30e768cc0f8aeec (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/cca1a95d0c61b096110045f796c86ab02703… commit cca1a95d0c61b096110045f796c86ab02703362f Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon May 28 00:35:19 2012 +0200 loaders: PNG More work on metadata. diff --git a/libs/loaders/GP_PNG.c b/libs/loaders/GP_PNG.c index 2cef50d..7602fe7 100644 --- a/libs/loaders/GP_PNG.c +++ b/libs/loaders/GP_PNG.c @@ -270,6 +270,17 @@ static void load_meta_data(png_structp png, png_infop png_info, GP_MetaData *dat GP_MetaDataCreateString(data, "res_unit", unit_name, 0); } + png_timep mod_time; + + if (png_get_tIME(png, png_info, &mod_time)) { + GP_MetaDataCreateInt(data, "mod_sec", mod_time->second); + GP_MetaDataCreateInt(data, "mod_min", mod_time->minute); + GP_MetaDataCreateInt(data, "mod_hour", mod_time->hour); + GP_MetaDataCreateInt(data, "mod_day", mod_time->day); + GP_MetaDataCreateInt(data, "mod_mon", mod_time->month); + GP_MetaDataCreateInt(data, "mod_year", mod_time->year); + } + double width, height; if (png_get_sCAL(png, png_info, &unit, &width, &height)) { @@ -277,6 +288,23 @@ static void load_meta_data(png_structp png, png_infop png_info, GP_MetaData *dat GP_MetaDataCreateInt(data, "height", height * 1000); GP_MetaDataCreateInt(data, "unit", unit); } + + png_textp text_ptr; + int text_cnt; + + if (png_get_text(png, png_info, &text_ptr, &text_cnt)) { + int i; + + for (i = 0; i < text_cnt; i++) { + + if (text_ptr[i].compression != PNG_TEXT_COMPRESSION_NONE) + continue; + + char buf[GP_META_RECORD_ID_MAX]; + snprintf(buf, GP_META_RECORD_ID_MAX, "text:%s", text_ptr[i].key); + GP_MetaDataCreateString(data, buf, text_ptr[i].text, 1); + } + } } int GP_ReadPNGMetaData(FILE *f, GP_MetaData *data) ----------------------------------------------------------------------- Summary of changes: libs/loaders/GP_PNG.c | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 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

[repo.or.cz] gfxprim.git branch master updated: ed03e7bc0d0825a97e73887be30e768cc0f8aeec
by metan 28 May '12

28 May '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 ed03e7bc0d0825a97e73887be30e768cc0f8aeec (commit) via a2efbefa0d3cf0e3174dee1d95739d9872978ed9 (commit) via 3e5a833f10aa54ddd8b7218e06ee6ec370e05ae1 (commit) via 2f882b02d5ff65219b1702a4e880582afeb185c4 (commit) via 5d07526c70845eae42935de4a03ec9d90bf8a019 (commit) from 8aab7a816e45ba2fcfd256ab48bb36aa350c98f9 (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/ed03e7bc0d0825a97e73887be30e768cc0f8… commit ed03e7bc0d0825a97e73887be30e768cc0f8aeec Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon May 28 00:01:18 2012 +0200 examples: Add meta data example. diff --git a/demos/c_simple/Makefile b/demos/c_simple/Makefile index 7204831..c03f374 100644 --- a/demos/c_simple/Makefile +++ b/demos/c_simple/Makefile @@ -6,7 +6,7 @@ INCLUDE= LDLIBS+=-lGP -lGP_backends -lSDL -L$(TOPDIR)/build/ APPS=backend_example loaders_example loaders filters_symmetry gfx_koch- virtual_backend_example meta_data + virtual_backend_example meta_data meta_data_png include $(TOPDIR)/pre.mk include $(TOPDIR)/app.mk diff --git a/demos/c_simple/meta_data_png.c b/demos/c_simple/meta_data_png.c new file mode 100644 index 0000000..3303bed --- /dev/null +++ b/demos/c_simple/meta_data_png.c @@ -0,0 +1,55 @@ +/***************************************************************************** + * 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> * + * * + *****************************************************************************/ + + /* + + Read png meta-data and print them into stdout. + + */ + +#include <stdio.h> +#include <string.h> +#include <errno.h> + +#include <GP.h> + +int main(int argc, char *argv[]) +{ + GP_MetaData *data = GP_MetaDataCreate(10); + + if (argc != 2) { + fprintf(stderr, "Takes an image as an parametern"); + return 1; + } + + //GP_SetDebugLevel(10); + + if (GP_LoadPNGMetaData(argv[1], data)) { + fprintf(stderr, "Failed to read '%s' meta-data: %sn", + argv[1], strerror(errno)); + return 1; + } + + GP_MetaDataPrint(data); + + return 0; +} http://repo.or.cz/w/gfxprim.git/commit/a2efbefa0d3cf0e3174dee1d95739d987297… commit a2efbefa0d3cf0e3174dee1d95739d9872978ed9 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun May 27 23:29:04 2012 +0200 loaders: PNG: add experimental support for metadata. diff --git a/include/loaders/GP_PNG.h b/include/loaders/GP_PNG.h index b866b7d..3a8f2f8 100644 --- a/include/loaders/GP_PNG.h +++ b/include/loaders/GP_PNG.h @@ -32,6 +32,8 @@ #include "core/GP_ProgressCallback.h" #include "core/GP_Context.h" +#include "GP_MetaData.h" + /* * The possible errno values: * @@ -65,6 +67,12 @@ GP_Context *GP_ReadPNG(FILE *f, GP_ProgressCallback *callback); GP_Context *GP_LoadPNG(const char *src_path, GP_ProgressCallback *callback); /* + * Loads png meta-data. + */ +int GP_ReadPNGMetaData(FILE *f, GP_MetaData *data); +int GP_LoadPNGMetaData(const char *src_path, GP_MetaData *data); + +/* * Saves PNG to a file. Zero is returned on succes. Upon failure non-zero is * returned and errno is filled accordingly. */ diff --git a/libs/loaders/GP_PNG.c b/libs/loaders/GP_PNG.c index 51ea49c..2cef50d 100644 --- a/libs/loaders/GP_PNG.c +++ b/libs/loaders/GP_PNG.c @@ -246,6 +246,97 @@ GP_Context *GP_LoadPNG(const char *src_path, GP_ProgressCallback *callback) return res; } +static void load_meta_data(png_structp png, png_infop png_info, GP_MetaData *data) +{ + double gamma; + + if (png_get_gAMA(png, png_info, &gamma)) + GP_MetaDataCreateInt(data, "gamma", gamma * 100000); + + png_uint_32 res_x, res_y; + int unit; + + if (png_get_pHYs(png, png_info, &res_x, &res_y, &unit)) { + GP_MetaDataCreateInt(data, "res_x", res_x); + GP_MetaDataCreateInt(data, "res_y", res_y); + + const char *unit_name; + + if (unit == PNG_RESOLUTION_METER) + unit_name = "meter"; + else + unit_name = "unknown"; + + GP_MetaDataCreateString(data, "res_unit", unit_name, 0); + } + + double width, height; + + if (png_get_sCAL(png, png_info, &unit, &width, &height)) { + GP_MetaDataCreateInt(data, "width", width * 1000); + GP_MetaDataCreateInt(data, "height", height * 1000); + GP_MetaDataCreateInt(data, "unit", unit); + } +} + +int GP_ReadPNGMetaData(FILE *f, GP_MetaData *data) +{ + png_structp png; + png_infop png_info = NULL; + 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"); + err = ENOMEM; + goto err1; + } + + png_info = png_create_info_struct(png); + + if (png_info == NULL) { + GP_DEBUG(1, "Failed to allocate PNG info buffer"); + err = ENOMEM; + goto err2; + } + + if (setjmp(png_jmpbuf(png))) { + GP_DEBUG(1, "Failed to read PNG file :("); + //TODO: should we get better error description from libpng? + err = EIO; + goto err2; + } + + png_init_io(png, f); + png_set_sig_bytes(png, 8); + png_read_info(png, png_info); + + load_meta_data(png, png_info, data); + + return 0; +err2: + png_destroy_read_struct(&png, png_info ? &png_info : NULL, NULL); +err1: + errno = err; + return 1; +} + +int GP_LoadPNGMetaData(const char *src_path, GP_MetaData *data) +{ + FILE *f; + int ret; + + if (GP_OpenPNG(src_path, &f)) + return 1; + + ret = GP_ReadPNGMetaData(f, data); + + fclose(f); + + return ret; +} + /* * Maps gfxprim Pixel Type to the PNG format */ @@ -448,6 +539,18 @@ GP_Context *GP_LoadPNG(const char GP_UNUSED(*src_path), return NULL; } +int GP_ReadPNGMetaData(FILE GP_UNUSED(*f), GP_MetaData GP_UNUSED(*data)) +{ + errno = ENOSYS; + return NULL; +} + +int GP_LoadPNGMetaData(const char GP_UNUSED(*src_path), GP_MetaData GP_UNUSED(*data)) +{ + errno = ENOSYS; + return NULL; +} + int GP_SavePNG(const GP_Context GP_UNUSED(*src), const char GP_UNUSED(*dst_path), GP_ProgressCallback GP_UNUSED(*callback)) http://repo.or.cz/w/gfxprim.git/commit/3e5a833f10aa54ddd8b7218e06ee6ec370e0… commit 3e5a833f10aa54ddd8b7218e06ee6ec370e05ae1 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun May 27 22:49:38 2012 +0200 loaders: JPG: move the fclose(f) where it belongs. diff --git a/libs/loaders/GP_JPG.c b/libs/loaders/GP_JPG.c index 54507b1..6011b8f 100644 --- a/libs/loaders/GP_JPG.c +++ b/libs/loaders/GP_JPG.c @@ -177,7 +177,6 @@ GP_Context *GP_ReadJPG(FILE *f, GP_ProgressCallback *callback) jpeg_finish_decompress(&cinfo); jpeg_destroy_decompress(&cinfo); - fclose(f); GP_ProgressCallbackDone(callback); @@ -186,7 +185,6 @@ err2: GP_ContextFree(ret); err1: jpeg_destroy_decompress(&cinfo); - fclose(f); errno = err; return NULL; } @@ -194,11 +192,17 @@ err1: GP_Context *GP_LoadJPG(const char *src_path, GP_ProgressCallback *callback) { FILE *f; + GP_Context *res; if (GP_OpenJPG(src_path, &f)) return NULL; + + + res = GP_ReadJPG(f, callback); + + fclose(f); - return GP_ReadJPG(f, callback); + return res; } int GP_SaveJPG(const GP_Context *src, const char *dst_path, http://repo.or.cz/w/gfxprim.git/commit/2f882b02d5ff65219b1702a4e880582afeb1… commit 2f882b02d5ff65219b1702a4e880582afeb185c4 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun May 27 22:43:51 2012 +0200 loaders: Add forgotten libpng cleanup for image loader. diff --git a/libs/loaders/GP_PNG.c b/libs/loaders/GP_PNG.c index 742cf46..51ea49c 100644 --- a/libs/loaders/GP_PNG.c +++ b/libs/loaders/GP_PNG.c @@ -96,7 +96,7 @@ static const char *interlace_type_name(int interlace) GP_Context *GP_ReadPNG(FILE *f, GP_ProgressCallback *callback) { png_structp png; - png_infop png_info = NULL; + png_infop png_info = NULL; png_uint_32 w, h; int depth, color_type, interlace_type; GP_PixelType pixel_type = GP_PIXEL_UNKNOWN; @@ -211,21 +211,22 @@ GP_Context *GP_ReadPNG(FILE *f, GP_ProgressCallback *callback) if (GP_ProgressCallbackReport(callback, y, h, w)) { GP_DEBUG(1, "Operation aborted"); - err= ECANCELED; + err = ECANCELED; goto err3; } } + + png_destroy_read_struct(&png, &png_info, NULL); GP_ProgressCallbackDone(callback); - + return res; err3: GP_ContextFree(res); err2: png_destroy_read_struct(&png, png_info ? &png_info : NULL, NULL); err1: - fclose(f); errno = err; return NULL; } @@ -233,11 +234,16 @@ err1: GP_Context *GP_LoadPNG(const char *src_path, GP_ProgressCallback *callback) { FILE *f; + GP_Context *res; if (GP_OpenPNG(src_path, &f)) return NULL; - return GP_ReadPNG(f, callback); + res = GP_ReadPNG(f, callback); + + fclose(f); + + return res; } /* http://repo.or.cz/w/gfxprim.git/commit/5d07526c70845eae42935de4a03ec9d90bf8… commit 5d07526c70845eae42935de4a03ec9d90bf8a019 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun May 27 22:11:45 2012 +0200 loaders: Create generic metadata storage. diff --git a/demos/c_simple/Makefile b/demos/c_simple/Makefile index eeadcf8..7204831 100644 --- a/demos/c_simple/Makefile +++ b/demos/c_simple/Makefile @@ -6,7 +6,7 @@ INCLUDE= LDLIBS+=-lGP -lGP_backends -lSDL -L$(TOPDIR)/build/ APPS=backend_example loaders_example loaders filters_symmetry gfx_koch- virtual_backend_example + virtual_backend_example meta_data include $(TOPDIR)/pre.mk include $(TOPDIR)/app.mk diff --git a/include/loaders/GP_Loaders.h b/include/loaders/GP_Loaders.h index 38633c7..d374f99 100644 --- a/include/loaders/GP_Loaders.h +++ b/include/loaders/GP_Loaders.h @@ -44,6 +44,8 @@ #include "GP_JPG.h" #include "GP_GIF.h" +#include "GP_MetaData.h" + /* * Tries to load image accordingly to the file extension. * diff --git a/include/loaders/GP_MetaData.h b/include/loaders/GP_MetaData.h new file mode 100644 index 0000000..2820ee0 --- /dev/null +++ b/include/loaders/GP_MetaData.h @@ -0,0 +1,103 @@ +/***************************************************************************** + * 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> * + * * + *****************************************************************************/ + +#ifndef LOADERS_METADATA_H +#define LOADERS_METADATA_H + +#define GP_META_RECORD_ID_MAX 16 + +enum GP_MetaType { + GP_META_INT, + GP_META_STRING, +}; + +union GP_MetaValue { + int i; + const char *str; +}; + +typedef struct GP_MetaRecord { + char id[GP_META_RECORD_ID_MAX]; + unsigned int hash; + enum GP_MetaType type; + struct GP_MetaRecord *next; + union GP_MetaValue val; +} GP_MetaRecord; + +typedef struct GP_MetaData GP_MetaData; + +/* + * Creates a metadata storage for at least expected_records values. + * + * Returns NULL if allocation has failed. + */ +GP_MetaData *GP_MetaDataCreate(unsigned int expected_records); + +/* + * Destroys metadata (frees all alocated memory). + */ +void GP_MetaDataDestroy(GP_MetaData *self); + +/* + * Prints metadata into the stdout. + */ +void GP_MetaDataPrint(GP_MetaData *self); + +/* + * Looks for metadata record with id. + */ +GP_MetaRecord *GP_MetaDataGetRecord(GP_MetaData *self, const char *id); + +/* + * Looks for integer metadata with id. Returns 0 on success and res is set to + * found metadata value. + */ +int GP_MetaDataGetInt(GP_MetaData *self, const char *id, int *res); + +/* + * Looks for string metadata by id. Returns pointe to found string, or NULL if + * there was no such value. + */ +const char *GP_MetaDataGetString(GP_MetaData *self, const char *id); + +/* + * Creates an record and returns pointer to it. + * + * May return NULL if allocation has failed. + */ +GP_MetaRecord *GP_MetaDataCreateRecord(GP_MetaData *self, const char *id); + +/* + * Creates an integer record and returns pointer to it. + */ +GP_MetaRecord *GP_MetaDataCreateInt(GP_MetaData *self, const char *id, int val); + +/* + * Creates an string record and returns pointer to it. + * + * If dup is set to 1, the string is duplicated inside of the MetaData + * structure, otherwise only the pointer is saved. + */ +GP_MetaRecord *GP_MetaDataCreateString(GP_MetaData *self, const char *id, + const char *str, int dup); + +#endif /* LOADERS_GP_METADATA_H */ diff --git a/libs/loaders/GP_MetaData.c b/libs/loaders/GP_MetaData.c new file mode 100644 index 0000000..b0fcdf8 --- /dev/null +++ b/libs/loaders/GP_MetaData.c @@ -0,0 +1,258 @@ +/***************************************************************************** + * 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> * + * * + *****************************************************************************/ + +#include <stdlib.h> +#include <string.h> + +#include "core/GP_Debug.h" + +#include "GP_MetaData.h" + +struct GP_MetaData { + struct GP_MetaRecord *root; + unsigned int rec_count; + size_t size; + size_t free; + char buf[]; +}; + +static unsigned int do_hash(const char *id) +{ + unsigned int hash = 0; + + while (*id != '0') { + hash += *id * 1217; + hash %= 46309; + id += 1; + } + + return hash; +} + +GP_MetaData *GP_MetaDataCreate(unsigned int expected_records) +{ + GP_MetaData *data; + size_t size = expected_records * sizeof(struct GP_MetaRecord); + + GP_DEBUG(1, "Creating MetaData for %u records", expected_records); + + data = malloc(sizeof(struct GP_MetaData) + size); + + if (data == NULL) { + GP_DEBUG(1, "Malloc failed :("); + return NULL; + } + + data->root = NULL; + data->rec_count = 0; + data->size = size; + data->free = size; + + return data; +} + +void GP_MetaDataDestroy(GP_MetaData *self) +{ + GP_DEBUG(1, "Destroying MetaData %p", self); + free(self); +} + +void GP_MetaDataPrint(GP_MetaData *self) +{ + GP_MetaRecord *rec; + + printf("MetaData %u record(s)n", self->rec_count); + + for (rec = self->root; rec != NULL; rec = rec->next) { + printf("%-16s: ", rec->id); + + switch (rec->type) { + case GP_META_INT: + printf("%in", rec->val.i); + break; + case GP_META_STRING: + printf("'%s'n", rec->val.str); + break; + } + } +} + +static GP_MetaRecord *record_lookup(GP_MetaData *self, const char *id, + unsigned int hash) +{ + GP_MetaRecord *rec; + + for (rec = self->root; rec != NULL; rec = rec->next) + if (rec->hash == hash && !strcmp(rec->id, id)) + return rec; + + return NULL; +} + +static void *do_alloc(struct GP_MetaData *self, size_t size) +{ + if (self->free < size) { + GP_DEBUG(0, "TODO: storage full"); + return NULL; + } + + void *ret = ((char*)self) + sizeof(struct GP_MetaData) + (self->size - self->free); + + self->free -= size; + + return ret; +} + +static GP_MetaRecord *record_create(GP_MetaData *self, const char *id, + unsigned int hash) +{ + GP_MetaRecord *rec; + + if (strlen(id) + 1 > GP_META_RECORD_ID_MAX) { + GP_DEBUG(0, "Can't create id '%s' longer than %i chars", + id, GP_META_RECORD_ID_MAX - 1); + return NULL; + } + + rec = do_alloc(self, sizeof(struct GP_MetaRecord)); + + if (rec == NULL) + return NULL; + + strcpy(rec->id, id); + rec->hash = hash; + rec->next = self->root; + self->root = rec; + + self->rec_count++; + + return rec; +} + +GP_MetaRecord *GP_MetaDataCreateRecord(GP_MetaData *self, const char *id) +{ + unsigned int hash = do_hash(id); + + if (record_lookup(self, id, hash)) { + GP_DEBUG(1, "Trying to create duplicate record id '%s'", id); + return NULL; + } + + return record_create(self, id, hash); +} + +int GP_MetaDataGetInt(GP_MetaData *self, const char *id, int *res) +{ + GP_MetaRecord *rec; + + GP_DEBUG(2, "Looking for GP_META_INT id '%s'", id); + + rec = record_lookup(self, id, do_hash(id)); + + if (rec == NULL) { + GP_DEBUG(3, "Record id '%s' not found", id); + return 1; + } + + if (rec->type != GP_META_INT) { + GP_DEBUG(3, "Record id '%s' has wrong type", id); + return 1; + } + + *res = rec->val.i; + + GP_DEBUG(3, "Found GP_META_INT id '%s' = %i", id, *res); + + return 0; +} + +const char *GP_MetaDataGetString(GP_MetaData *self, const char *id) +{ + GP_MetaRecord *rec; + + GP_DEBUG(2, "Looking for GP_META_STRING id '%s'", id); + + rec = record_lookup(self, id, do_hash(id)); + + if (rec == NULL) { + GP_DEBUG(3, "Record id '%s' not found", id); + return NULL; + } + + if (rec->type != GP_META_STRING) { + GP_DEBUG(3, "Record id '%s' has wrong type", id); + return NULL; + } + + GP_DEBUG(3, "Found GP_META_STRING id '%s' = '%s'", id, rec->val.str); + + return rec->val.str; +} + +GP_MetaRecord *GP_MetaDataCreateInt(GP_MetaData *self, const char *id, int val) +{ + GP_MetaRecord *rec; + + GP_DEBUG(2, "Creating GP_META_INT id '%s' = %i", id, val); + + rec = GP_MetaDataCreateRecord(self, id); + + if (rec == NULL) + return NULL; + + rec->type = GP_META_INT; + rec->val.i = val; + + return rec; +} + +GP_MetaRecord *GP_MetaDataCreateString(GP_MetaData *self, const char *id, + const char *str, int dup) +{ + GP_MetaRecord *rec; + + GP_DEBUG(2, "Creating GP_META_STRING id '%s' = '%s'", id, str); + + rec = GP_MetaDataCreateRecord(self, id); + + if (rec == NULL) + return NULL; + + if (dup) { + size_t size = strlen(str) + 1; + char *s; + + /* Play safe with aligment */ + if (size % 8) + size += 8 - size % 8; + + //TODO: allocation error + s = do_alloc(self, size); + strcpy(s, str); + str = s; + } + + rec->type = GP_META_STRING; + rec->val.str = str; + + return rec; +} ----------------------------------------------------------------------- Summary of changes: demos/c_simple/Makefile | 2 +- .../{loaders_example.c => meta_data_png.c} | 20 +- include/loaders/GP_Loaders.h | 2 + include/loaders/GP_MetaData.h | 103 ++++++++ include/loaders/GP_PNG.h | 8 + libs/loaders/GP_JPG.c | 10 +- libs/loaders/GP_MetaData.c | 258 ++++++++++++++++++++ libs/loaders/GP_PNG.c | 119 +++++++++- 8 files changed, 500 insertions(+), 22 deletions(-) copy demos/c_simple/{loaders_example.c => meta_data_png.c} (84%) create mode 100644 include/loaders/GP_MetaData.h create mode 100644 libs/loaders/GP_MetaData.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: 8aab7a816e45ba2fcfd256ab48bb36aa350c98f9
by metan 27 May '12

27 May '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 8aab7a816e45ba2fcfd256ab48bb36aa350c98f9 (commit) from 965a9237db419f83183eb4a59fc9bc741782093e (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/8aab7a816e45ba2fcfd256ab48bb36aa350c… commit 8aab7a816e45ba2fcfd256ab48bb36aa350c98f9 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun May 27 15:34:52 2012 +0200 spiv: Resize backend to fit image on pressing 1. diff --git a/demos/spiv/spiv.c b/demos/spiv/spiv.c index 91b9f35..9862049 100644 --- a/demos/spiv/spiv.c +++ b/demos/spiv/spiv.c @@ -171,9 +171,10 @@ int load_image(struct loader_params *params) * This function tries to resize spiv window * and if succedes blits the image directly to the screen. */ -static int resize_backend_and_blit(GP_Context *img, - struct loader_params *params) +static int resize_backend_and_blit(struct loader_params *params) { + GP_Context *img = params->img; + if (GP_BackendResize(backend, img->w, img->h)) return 1; @@ -236,6 +237,7 @@ static void *image_loader(void *ptr) if (rat < 1) { cpu_timer_start(&timer, "Blur"); callback.priv = "Blurring Image"; + //TODO: We can't blur saved image! if (GP_FilterGaussianBlur(img, img, 0.4/rat, 0.4/rat, &callback) == NULL) return NULL; @@ -587,6 +589,9 @@ int main(int argc, char *argv[]) params.show_progress_once = 1; show_image(&params, argv[argn]); break; + case GP_KEY_1: + resize_backend_and_blit(&params); + break; } break; case GP_EV_SYS: ----------------------------------------------------------------------- Summary of changes: demos/spiv/spiv.c | 9 +++++++-- 1 files changed, 7 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: 965a9237db419f83183eb4a59fc9bc741782093e
by metan 27 May '12

27 May '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 965a9237db419f83183eb4a59fc9bc741782093e (commit) from e403e7ee1b9adba8f821a623d862a03ac7afc941 (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/965a9237db419f83183eb4a59fc9bc741782… commit 965a9237db419f83183eb4a59fc9bc741782093e Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun May 27 15:26:29 2012 +0200 loaders: Use png_set_packswap() (to reduce size of code). diff --git a/libs/loaders/GP_PNG.c b/libs/loaders/GP_PNG.c index 2afb072..742cf46 100644 --- a/libs/loaders/GP_PNG.c +++ b/libs/loaders/GP_PNG.c @@ -200,7 +200,7 @@ GP_Context *GP_ReadPNG(FILE *f, GP_ProgressCallback *callback) } if (color_type == PNG_COLOR_TYPE_GRAY) - res->bit_endian = 1; + png_set_packswap(png); uint32_t y; @@ -305,48 +305,23 @@ static int prepare_png_header(const GP_Context *src, png_structp png, return 0; } -static int write_png_data_g_swap(const GP_Context *src, png_structp png, - GP_ProgressCallback *callback) +static int write_png_data(const GP_Context *src, png_structp png, + GP_ProgressCallback *callback, int bit_endian_flag) { - unsigned int y; - uint8_t row[src->bytes_per_row]; - - for (y = 0; y < src->h; y++) { - memcpy(row, GP_PIXEL_ADDR(src, 0, y), src->bytes_per_row); - + /* Look if we need to swap data when writing */ + if (bit_endian_flag) { switch (src->pixel_type) { case GP_PIXEL_G1: - GP_BitSwapRow_B1(row, src->bytes_per_row); - break; case GP_PIXEL_G2: - GP_BitSwapRow_B4(row, src->bytes_per_row); - break; case GP_PIXEL_G4: - GP_BitSwapRow_B4(row, src->bytes_per_row); + png_set_packswap(png); break; default: return ENOSYS; break; } - - png_write_row(png, row); - - if (GP_ProgressCallbackReport(callback, y, src->h, src->w)) { - GP_DEBUG(1, "Operation aborted"); - return ECANCELED; - } } - return 0; -} - -static int write_png_data(const GP_Context *src, png_structp png, - GP_ProgressCallback *callback, int bit_endian_flag) -{ - /* Look if we need to swap data when writing */ - if (bit_endian_flag) - return write_png_data_g_swap(src, png, callback); - unsigned int y; for (y = 0; y < src->h; y++) { ----------------------------------------------------------------------- Summary of changes: libs/loaders/GP_PNG.c | 37 ++++++------------------------------- 1 files changed, 6 insertions(+), 31 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: e403e7ee1b9adba8f821a623d862a03ac7afc941
by metan 27 May '12

27 May '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 e403e7ee1b9adba8f821a623d862a03ac7afc941 (commit) from adef520463dc58869ba1570a8d5cd05b7691091a (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/e403e7ee1b9adba8f821a623d862a03ac7af… commit e403e7ee1b9adba8f821a623d862a03ac7afc941 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun May 27 14:51:17 2012 +0200 loaders: Set bit endian flag on grayscale PNG load. * The 1BPP_BE 2BPP_BE and 4BPP_BE blits doesn't work yet, ugh :( diff --git a/libs/loaders/GP_PNG.c b/libs/loaders/GP_PNG.c index 3e8d6de..2afb072 100644 --- a/libs/loaders/GP_PNG.c +++ b/libs/loaders/GP_PNG.c @@ -199,6 +199,9 @@ GP_Context *GP_ReadPNG(FILE *f, GP_ProgressCallback *callback) goto err2; } + if (color_type == PNG_COLOR_TYPE_GRAY) + res->bit_endian = 1; + uint32_t y; /* start the actuall reading */ ----------------------------------------------------------------------- Summary of changes: libs/loaders/GP_PNG.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

[repo.or.cz] gfxprim.git branch master updated: adef520463dc58869ba1570a8d5cd05b7691091a
by metan 27 May '12

27 May '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 adef520463dc58869ba1570a8d5cd05b7691091a (commit) from f278f7d7683d97876757877353550e431700d180 (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/adef520463dc58869ba1570a8d5cd05b7691… commit adef520463dc58869ba1570a8d5cd05b7691091a Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun May 27 14:40:52 2012 +0200 spiv: Move the resampling workaround to a correct place. diff --git a/demos/spiv/spiv.c b/demos/spiv/spiv.c index 77c3bc4..91b9f35 100644 --- a/demos/spiv/spiv.c +++ b/demos/spiv/spiv.c @@ -152,6 +152,14 @@ int load_image(struct loader_params *params) GP_BackendFlip(backend); return 1; } + + /* Workaround */ + if (img->pixel_type != GP_PIXEL_RGB888) { + GP_Context *tmp = GP_ContextConvert(img, GP_PIXEL_RGB888); + GP_ContextFree(img); + img = tmp; + } + cpu_timer_stop(&timer); params->img = img; @@ -221,13 +229,6 @@ static void *image_loader(void *ptr) w = img->w; h = img->h; - /* Workaround */ - if (img->pixel_type != GP_PIXEL_RGB888) { - GP_Context *tmp = GP_ContextConvert(img, GP_PIXEL_RGB888); - GP_ContextFree(img); - img = tmp; - } - GP_Context *ret; /* Do low pass filter */ ----------------------------------------------------------------------- Summary of changes: demos/spiv/spiv.c | 15 ++++++++------- 1 files changed, 8 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

[repo.or.cz] gfxprim.git branch master updated: f278f7d7683d97876757877353550e431700d180
by metan 27 May '12

27 May '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 f278f7d7683d97876757877353550e431700d180 (commit) via fae0a3810bc628f5e72e5e3147ccbb5b24f010e6 (commit) via 0fca9291826bed0f81d3583c7785260ef051eb25 (commit) from c404e7e68b3d6567519cb2fcb45ea5fc652add35 (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/f278f7d7683d97876757877353550e431700… commit f278f7d7683d97876757877353550e431700d180 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun May 27 14:32:55 2012 +0200 examples: Add simple python dithering example diff --git a/demos/py_simple/dither.py b/demos/py_simple/dither.py new file mode 100755 index 0000000..dae8838 --- /dev/null +++ b/demos/py_simple/dither.py @@ -0,0 +1,21 @@ +#!/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) != 2: + print("usage: dither.py image") + sys.exit(1) + + # Load Image + img = loaders.LoadImage(sys.argv[1], None) + # Use Floyd-Steinberg dithering + res = filters.FilterFloydSteinberg_RGB888_Alloc(img, core.C.PIXEL_G1, None) + # Save result into grayscale png + loaders.SavePNG(res, "out.png", None) + +if __name__ == '__main__': + main() http://repo.or.cz/w/gfxprim.git/commit/fae0a3810bc628f5e72e5e3147ccbb5b24f0… commit fae0a3810bc628f5e72e5e3147ccbb5b24f010e6 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun May 27 14:31:25 2012 +0200 loaders: Add support for sawing Grayscale PNGs. diff --git a/libs/loaders/GP_PNG.c b/libs/loaders/GP_PNG.c index 381039c..3e8d6de 100644 --- a/libs/loaders/GP_PNG.c +++ b/libs/loaders/GP_PNG.c @@ -41,6 +41,8 @@ #include <png.h> +#include "core/GP_BitSwap.h" + int GP_OpenPNG(const char *src_path, FILE **f) { uint8_t sig[8]; @@ -235,6 +237,128 @@ GP_Context *GP_LoadPNG(const char *src_path, GP_ProgressCallback *callback) return GP_ReadPNG(f, callback); } +/* + * Maps gfxprim Pixel Type to the PNG format + */ +static int prepare_png_header(const GP_Context *src, png_structp png, + png_infop png_info, int *bit_endian_flag) +{ + int bit_depth, color_type; + + switch (src->pixel_type) { + case GP_PIXEL_BGR888: + case GP_PIXEL_RGB888: + bit_depth = 8; + color_type = PNG_COLOR_TYPE_RGB; + break; + case GP_PIXEL_G1: + bit_depth = 1; + color_type = PNG_COLOR_TYPE_GRAY; + break; + case GP_PIXEL_G2: + bit_depth = 2; + color_type = PNG_COLOR_TYPE_GRAY; + break; + case GP_PIXEL_G4: + bit_depth = 4; + color_type = PNG_COLOR_TYPE_GRAY; + break; + case GP_PIXEL_G8: + bit_depth = 8; + color_type = PNG_COLOR_TYPE_GRAY; + break; + default: + return 1; + break; + } + + /* If pointers weren't passed, just return it is okay */ + if (png == NULL || png_info == NULL) + return 0; + + png_set_IHDR(png, png_info, src->w, src->h, bit_depth, color_type, + PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT, + PNG_FILTER_TYPE_DEFAULT); + + /* start the actuall writing */ + png_write_info(png, png_info); + + //png_set_packing(png); + + /* prepare for format conversion */ + switch (src->pixel_type) { + case GP_PIXEL_RGB888: + png_set_bgr(png); + break; + case GP_PIXEL_G1: + case GP_PIXEL_G2: + case GP_PIXEL_G4: + *bit_endian_flag = !src->bit_endian; + break; + default: + break; + } + + return 0; +} + +static int write_png_data_g_swap(const GP_Context *src, png_structp png, + GP_ProgressCallback *callback) +{ + unsigned int y; + uint8_t row[src->bytes_per_row]; + + for (y = 0; y < src->h; y++) { + memcpy(row, GP_PIXEL_ADDR(src, 0, y), src->bytes_per_row); + + switch (src->pixel_type) { + case GP_PIXEL_G1: + GP_BitSwapRow_B1(row, src->bytes_per_row); + break; + case GP_PIXEL_G2: + GP_BitSwapRow_B4(row, src->bytes_per_row); + break; + case GP_PIXEL_G4: + GP_BitSwapRow_B4(row, src->bytes_per_row); + break; + default: + return ENOSYS; + break; + } + + png_write_row(png, row); + + if (GP_ProgressCallbackReport(callback, y, src->h, src->w)) { + GP_DEBUG(1, "Operation aborted"); + return ECANCELED; + } + } + + return 0; +} + +static int write_png_data(const GP_Context *src, png_structp png, + GP_ProgressCallback *callback, int bit_endian_flag) +{ + /* Look if we need to swap data when writing */ + if (bit_endian_flag) + return write_png_data_g_swap(src, png, callback); + + unsigned int y; + + for (y = 0; y < src->h; y++) { + png_bytep row = GP_PIXEL_ADDR(src, 0, y); + png_write_row(png, row); + + if (GP_ProgressCallbackReport(callback, y, src->h, src->w)) { + GP_DEBUG(1, "Operation aborted"); + return ECANCELED; + } + } + + return 0; +} + int GP_SavePNG(const GP_Context *src, const char *dst_path, GP_ProgressCallback *callback) { @@ -245,8 +369,8 @@ int GP_SavePNG(const GP_Context *src, const char *dst_path, GP_DEBUG(1, "Saving PNG Image '%s'", dst_path); - if (src->pixel_type != GP_PIXEL_RGB888) { - GP_DEBUG(1, "Can't save png with pixel type %s", + if (prepare_png_header(src, NULL, NULL, NULL)) { + GP_DEBUG(1, "Can't save png with %s pixel type", GP_PixelTypeName(src->pixel_type)); return ENOSYS; } @@ -284,27 +408,14 @@ int GP_SavePNG(const GP_Context *src, const char *dst_path, } png_init_io(png, f); - png_set_IHDR(png, png_info, src->w, src->h, 8, PNG_COLOR_TYPE_RGB, - PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT, - PNG_FILTER_TYPE_DEFAULT); - - /* start the actuall writing */ - png_write_info(png, png_info); - png_set_bgr(png); - - uint32_t y; - - for (y = 0; y < src->h; y++) { - png_bytep row = GP_PIXEL_ADDR(src, 0, y); - png_write_row(png, row); + + int bit_endian_flag = 0; + /* Fill png header and prepare for data */ + prepare_png_header(src, png, png_info, &bit_endian_flag); - if (GP_ProgressCallbackReport(callback, y, src->h, src->w)) { - GP_DEBUG(1, "Operation aborted"); - err = ECANCELED; - goto err3; - } - - } + /* Write bitmap buffer */ + if ((err = write_png_data(src, png, callback, bit_endian_flag))) + goto err3; png_write_end(png, png_info); png_destroy_write_struct(&png, &png_info); http://repo.or.cz/w/gfxprim.git/commit/0fca9291826bed0f81d3583c7785260ef051… commit 0fca9291826bed0f81d3583c7785260ef051eb25 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun May 27 14:29:35 2012 +0200 core: Add bit swap helpers. diff --git a/include/core/GP_BitSwap.h b/include/core/GP_BitSwap.h new file mode 100644 index 0000000..5ad76ad --- /dev/null +++ b/include/core/GP_BitSwap.h @@ -0,0 +1,97 @@ +/***************************************************************************** + * 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) 2012 Cyril Hrubis <metan(a)ucw.cz> * + * * + *****************************************************************************/ + + /* + + Inline functions for swapping bits inside of the byte + + */ + +#ifndef CORE_GP_BIT_SWAP_H +#define CORE_GP_BIT_SWAP_H + +/* + * Reverse 1 bit blocks in the byte. + * + * Example: + * + * IN 10101110 + * OUT 01110101 + */ +static inline uint8_t GP_BIT_SWAP_B1(uint8_t byte) +{ + return ((byte * 0x0802LU & 0x22110LU) | + (byte * 0x8020LU & 0x88440LU)) * 0x10101LU >> 16; +} + +static inline void GP_BitSwapRow_B1(uint8_t *row, unsigned int len) +{ + unsigned int i; + + for (i = 0; i < len; i++) + row[i] = GP_BIT_SWAP_B1(row[i]); +} + +/* + * Reverse 2 bit blocks in the byte. + * + * Example: + * + * IN 10 11 01 00 + * OUT 00 01 11 10 + */ +static inline uint8_t GP_BIT_SWAP_B2(uint8_t byte) +{ + return ((byte & 0xC0) >> 6) | ((byte & 0x30) >> 2) | + ((byte & 0x0C) << 2) | ((byte & 0x03) << 6); +} + +static inline void GP_BitSwapRow_B2(uint8_t *row, unsigned int len) +{ + unsigned int i; + + for (i = 0; i < len; i++) + row[i] = GP_BIT_SWAP_B2(row[i]); +} + +/* + * Reverse 4 bit blocks in the byte. + * + * Example: + * + * IN 1011 0100 + * OUT 0100 1011 + */ +static inline uint8_t GP_BIT_SWAP_B4(uint8_t byte) +{ + return ((byte & 0xf0) >> 4) | ((byte & 0x0f) << 4); +} + +static inline void GP_BitSwapRow_B4(uint8_t *row, unsigned int len) +{ + unsigned int i; + + for (i = 0; i < len; i++) + row[i] = GP_BIT_SWAP_B4(row[i]); +} + +#endif /* CORE_GP_BIT_SWAP_H */ ----------------------------------------------------------------------- Summary of changes: demos/py_simple/dither.py | 21 +++ .../GP_GetPutPixel.c => include/core/GP_BitSwap.h | 80 ++++++++-- libs/loaders/GP_PNG.c | 155 +++++++++++++++++--- 3 files changed, 219 insertions(+), 37 deletions(-) create mode 100755 demos/py_simple/dither.py copy libs/core/GP_GetPutPixel.c => include/core/GP_BitSwap.h (55%) 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