May 2014 - Gfxprim

[repo.or.cz] gfxprim.git branch master updated: 1.0.0-rc1-82-g42503846
by metan 27 May '14

27 May '14

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 425038462f7fe79ed853487a0ce66ecd927d1c8f (commit) via 7b84c8bb9d3d8ac020b3460a3cec4d19450d130b (commit) via 8c85a6820eef1c67fef1d2ca545eaaa478844c85 (commit) via 9c8989f7e34a92c66193f44fe17952c68516d565 (commit) from a19009feb951a42521104ff1d2657ce9fc77df99 (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/425038462f7fe79ed853487a0ce66ecd927d… commit 425038462f7fe79ed853487a0ce66ecd927d1c8f Author: Cyril Hrubis <metan(a)ucw.cz> Date: Tue May 27 22:34:00 2014 +0200 doc: Add two more python examples. Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/doc/example_py_cam_view.txt b/doc/example_py_cam_view.txt new file mode 100644 index 00000000..209a7343 --- /dev/null +++ b/doc/example_py_cam_view.txt @@ -0,0 +1,8 @@ +Camera Viewer +------------- +A simple program that shows video from camera (V4L2 device) + +[source,python] +------------------------------------------------------------------ +include::../demos/py_simple/cam_view.py[] +------------------------------------------------------------------ diff --git a/doc/example_py_font_style.txt b/doc/example_py_font_style.txt new file mode 100644 index 00000000..49d3b760 --- /dev/null +++ b/doc/example_py_font_style.txt @@ -0,0 +1,8 @@ +Font Style +---------- +A simple example that shows drawing with compiled in bitmap fonts. + +[source,python] +------------------------------------------------------------------ +include::../demos/py_simple/font_style.py[] +------------------------------------------------------------------ http://repo.or.cz/w/gfxprim.git/commit/7b84c8bb9d3d8ac020b3460a3cec4d19450d… commit 7b84c8bb9d3d8ac020b3460a3cec4d19450d130b Author: Cyril Hrubis <metan(a)ucw.cz> Date: Tue May 27 22:25:53 2014 +0200 pywrap: Unbreak Fill after it was moved to core After GP_Fill() was moved to core from gfx the python bindings were not fixed correctly. Now Fill() is available both in core and in gfx. Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/pylib/gfxprim/core/__init__.py b/pylib/gfxprim/core/__init__.py index 96bf9be4..82b27f9e 100644 --- a/pylib/gfxprim/core/__init__.py +++ b/pylib/gfxprim/core/__init__.py @@ -156,6 +156,11 @@ def _init(module): "Convert RGBA8888 (values 0-255) to context pixel type." return c_core.GP_RGBAToPixel(int(r), int(g), int(b), int(a), self.pixel_type) + @extend(_context) + def Fill(self, pixel): + "Fills context with given pixel value." + return c_core.GP_Fill(self, pixel) + # Handle submodule methods such as context.gfx.Line(...) _available_submodules = frozenset(['gfx', 'loaders', 'text', 'filters']) @@ -201,7 +206,8 @@ def _init(module): '^GP_PixelRGB.*$', # ...Lookup and ...Match '^GP_PixelToRGB.*$', # Needs love '^GP_RGB.*$', # Needs filtering - ]) + '^GP_Fill', + ]) module['Convert'] = c_core.GP_ContextConvertAlloc diff --git a/pylib/gfxprim/gfx/__init__.py b/pylib/gfxprim/gfx/__init__.py index dc2e9a94..daf99e11 100644 --- a/pylib/gfxprim/gfx/__init__.py +++ b/pylib/gfxprim/gfx/__init__.py @@ -36,13 +36,17 @@ def _init(module): import_members(c_gfx, C, include=const_regexes, sub=strip_GP) for name in [ - 'ArcSegment', 'Circle', 'Ellipse', 'Fill', 'FillCircle', 'FillEllipse', + 'ArcSegment', 'Circle', 'Ellipse', 'FillCircle', 'FillEllipse', 'FillRect', 'FillRect_AA', 'FillRing', 'FillTetragon', 'FillTriangle', 'HLine', 'HLineAA', 'Line', 'LineAA', 'PutPixelAA', 'Rect', 'Ring', 'Tetragon', 'Triangle', 'VLine', 'VLineAA']: extend_submodule(GfxSubmodule, name, c_gfx.__getattribute__('GP_' + name)) + @extend(GfxSubmodule) + def Fill(self, color): + self.ctx.Fill(color) + def flatten_coords(points): "Helper for Polygon and FillPolygon coordinates" l = [] http://repo.or.cz/w/gfxprim.git/commit/8c85a6820eef1c67fef1d2ca545eaaa47884… commit 8c85a6820eef1c67fef1d2ca545eaaa478844c85 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Tue May 27 21:59:35 2014 +0200 demos/py_simple: New python gfxprim + Qt example Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/demos/py_simple/gfxprim_qt.py b/demos/py_simple/gfxprim_qt.py new file mode 100755 index 00000000..61eabb2d --- /dev/null +++ b/demos/py_simple/gfxprim_qt.py @@ -0,0 +1,35 @@ +#!/usr/bin/python + +import sys +from PySide import QtGui +import gfxprim.core as core +import gfxprim.loaders as loaders + +def getpixmap(path): + img = loaders.Load(path) + if img.pixel_type != core.C.PIXEL_BGR888: + img = img.Convert(core.C.PIXEL_BGR888) + qt_img = QtGui.QImage(img.ToByteArray(), img.w, img.h, + img.bytes_per_row, QtGui.QImage.Format_RGB888) + pix = QtGui.QPixmap.fromImage(qt_img) + return pix + +class ImageLabel(QtGui.QLabel): + def __init__(self, path, parent=None): + QtGui.QLabel.__init__(self, parent) + + self.setWindowTitle(path) + + self.pix = getpixmap(path) + self.setPixmap(self.pix) + size = self.pix.size() + self.setGeometry(100, 100, size.width(), size.height()) + +def main(): + app = QtGui.QApplication(sys.argv) + w = ImageLabel(sys.argv[1]) + w.show() + sys.exit(app.exec_()) + +if __name__ == '__main__': + main() diff --git a/doc/example_py_qt.txt b/doc/example_py_qt.txt new file mode 100644 index 00000000..354ab553 --- /dev/null +++ b/doc/example_py_qt.txt @@ -0,0 +1,9 @@ +Qt (PySide) +----------- +A simple program that shows how to combine Qt (link:http://pyside.org[PySide]) +with GFXprim in python. + +[source,python] +------------------------------------------------------------------ +include::../demos/py_simple/gfxprim_qt.py[] +------------------------------------------------------------------ http://repo.or.cz/w/gfxprim.git/commit/9c8989f7e34a92c66193f44fe17952c68516… commit 9c8989f7e34a92c66193f44fe17952c68516d565 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Tue May 27 21:55:40 2014 +0200 doc: Add C64 font example image Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/doc/images/fonts/font_c64.png b/doc/images/fonts/font_c64.png new file mode 100644 index 00000000..e868101f Binary files /dev/null and b/doc/images/fonts/font_c64.png differ diff --git a/doc/text.txt b/doc/text.txt index 8a4a4cb4..e0264ff6 100644 --- a/doc/text.txt +++ b/doc/text.txt @@ -202,6 +202,9 @@ image::images/fonts/font_tiny_mono.png["Font Tiny Mono"] .Font Tiny (GP_FontTiny) image::images/fonts/font_tiny.png["Font Tiny"] +.Font C64 (GP_FontC64) +image::images/fonts/font_c64.png["Font C64"] + TrueType Fonts ~~~~~~~~~~~~~~ ----------------------------------------------------------------------- Summary of changes: demos/py_simple/gfxprim_qt.py | 35 ++++++++++++++++++++ ...ample_py_resize.txt => example_py_cam_view.txt} | 8 ++-- ..._py_showimage.txt => example_py_font_style.txt} | 8 ++-- doc/example_py_qt.txt | 9 +++++ doc/images/fonts/font_c64.png | Bin 0 -> 2373 bytes doc/text.txt | 3 ++ pylib/gfxprim/core/__init__.py | 8 ++++- pylib/gfxprim/gfx/__init__.py | 6 +++- 8 files changed, 67 insertions(+), 10 deletions(-) create mode 100755 demos/py_simple/gfxprim_qt.py copy doc/{example_py_resize.txt => example_py_cam_view.txt} (53%) copy doc/{example_py_showimage.txt => example_py_font_style.txt} (53%) create mode 100644 doc/example_py_qt.txt create mode 100644 doc/images/fonts/font_c64.png repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch master updated: 1.0.0-rc1-78-ga19009fe
by metan 27 May '14

27 May '14

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 a19009feb951a42521104ff1d2657ce9fc77df99 (commit) from 0192d34fbb5325dc78143d0bb8438c6d2613aadd (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/a19009feb951a42521104ff1d2657ce9fc77… commit a19009feb951a42521104ff1d2657ce9fc77df99 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Tue May 27 20:53:55 2014 +0200 filters: ResizeLinearLF: Further optimalization Optimize the inner loop further. This reshuffles the multiplication and divisions saving a few operations, which brings back the effectivity back as it was before the precision fixes. Signed-off-by: Cyril Hrubis <setan(a)ucw.cz> diff --git a/libs/filters/GP_ResizeLinear.gen.c.t b/libs/filters/GP_ResizeLinear.gen.c.t index d7b57a06..6a2b947d 100644 --- a/libs/filters/GP_ResizeLinear.gen.c.t +++ b/libs/filters/GP_ResizeLinear.gen.c.t @@ -50,20 +50,20 @@ for (x = 0; x < dst->w; x++) { /* Get first left pixel */ %% for c in pt.chanslist - uint32_t {{ c.name }}_tmp = {{ c.name }}[xmap[x]] * (MULT - xoff[x]) / DIV; + uint32_t {{ c.name }}_middle = 0; + uint32_t {{ c.name }}_first = {{ c.name }}[xmap[x]] * (MULT - xoff[x]); %% endfor /* Sum middle pixels */ for (j = xmap[x]+1; j < xmap[x+1]; j++) { %% for c in pt.chanslist - {{ c.name }}_tmp += {{ c.name }}[j] * MULT / DIV; + {{ c.name }}_middle += {{ c.name }}[j]; %% endfor } - /* Add last right pixel */ + /* Add it all together with last pixel on the right */ %% for c in pt.chanslist - {{ c.name }}_tmp += {{ c.name }}[xmap[x+1]] * xoff[x+1] / DIV; -%% endfor -%% for c in pt.chanslist - {{ c.name }}_res[x] += {{ c.name }}_tmp * {{ mult }} / DIV; + {{ c.name }}_res[x] += ({{ c.name }}_middle * (MULT / DIV) + + ({{ c.name }}[xmap[x+1]] * xoff[x+1] + + {{ c.name }}_first) / DIV) * {{ mult }} / DIV; %% endfor } %% endmacro ----------------------------------------------------------------------- Summary of changes: libs/filters/GP_ResizeLinear.gen.c.t | 14 +++++++------- 1 files changed, 7 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: 1.0.0-rc1-77-g0192d34f
by metan 25 May '14

25 May '14

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 0192d34fbb5325dc78143d0bb8438c6d2613aadd (commit) via aba01e605969e8c5c6bfaee0759d1035522d47ef (commit) from f0637e601e591b56c6b074a6ca7e51af29eb182d (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/0192d34fbb5325dc78143d0bb8438c6d2613… commit 0192d34fbb5325dc78143d0bb8438c6d2613aadd Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun May 25 22:06:06 2014 +0200 filters: ResizeLinearLF: Improve precision Improves precision which fixes artefacts when downscaling from big image to small image or with close to 1:1 ratio. Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/libs/filters/GP_ResizeLinear.gen.c.t b/libs/filters/GP_ResizeLinear.gen.c.t index d0169df5..d7b57a06 100644 --- a/libs/filters/GP_ResizeLinear.gen.c.t +++ b/libs/filters/GP_ResizeLinear.gen.c.t @@ -50,17 +50,20 @@ for (x = 0; x < dst->w; x++) { /* Get first left pixel */ %% for c in pt.chanslist - {{ c.name }}_res[x] += {{ c.name }}[xmap[x]] * (MULT - xoff[x]) * {{ mult }} / MULT; + uint32_t {{ c.name }}_tmp = {{ c.name }}[xmap[x]] * (MULT - xoff[x]) / DIV; %% endfor /* Sum middle pixels */ for (j = xmap[x]+1; j < xmap[x+1]; j++) { %% for c in pt.chanslist - {{ c.name }}_res[x] += {{ c.name }}[j] * {{ mult }}; + {{ c.name }}_tmp += {{ c.name }}[j] * MULT / DIV; %% endfor } /* Add last right pixel */ %% for c in pt.chanslist - {{ c.name }}_res[x] += {{ c.name }}[xmap[x+1]] * xoff[x+1] * {{ mult }} / MULT; + {{ c.name }}_tmp += {{ c.name }}[xmap[x+1]] * xoff[x+1] / DIV; +%% endfor +%% for c in pt.chanslist + {{ c.name }}_res[x] += {{ c.name }}_tmp * {{ mult }} / DIV; %% endfor } %% endmacro @@ -73,8 +76,8 @@ static int resize_lin_lf_{{ pt.name }}(const GP_Context *src, GP_Context *dst, { uint32_t xmap[dst->w + 1]; uint32_t ymap[dst->h + 1]; - uint16_t xoff[dst->w + 1]; - uint16_t yoff[dst->h + 1]; + uint32_t xoff[dst->w + 1]; + uint32_t yoff[dst->h + 1]; %% for c in pt.chanslist uint32_t {{ c.name }}[src->w]; %% endfor @@ -82,23 +85,26 @@ static int resize_lin_lf_{{ pt.name }}(const GP_Context *src, GP_Context *dst, uint32_t i, j; {# Reduce fixed point bits for > 8 bits per channel (fixed 16 bit Grayscale) #} %% if pt.chanslist[0].size > 8 - const int MULT=256; + const int MULT=1<<10; + const int DIV=1<<6; %% else - const int MULT=1024; + const int MULT=1<<14; + const int DIV=1<<9; %% endif + /* Pre-compute mapping for interpolation */ for (i = 0; i <= dst->w; i++) { - xmap[i] = (i * src->w) / dst->w; - xoff[i] = (MULT * (i * src->w))/dst->w - MULT * xmap[i]; + xmap[i] = ((uint64_t)i * src->w) / dst->w; + xoff[i] = ((uint64_t)MULT * (i * src->w))/dst->w - MULT * xmap[i]; } for (i = 0; i <= dst->h; i++) { - ymap[i] = (i * src->h) / dst->h; - yoff[i] = (MULT * (i * src->h))/dst->h - MULT * ymap[i]; + ymap[i] = ((uint64_t)i * src->h) / dst->h; + yoff[i] = ((uint64_t)MULT * (i * src->h))/dst->h - MULT * ymap[i]; } /* Compute pixel area for the final normalization */ - uint32_t div = (xmap[1] * MULT + xoff[1]) * (ymap[1] * MULT + yoff[1]) / MULT; + uint32_t div = (((uint64_t)(xmap[1] * MULT + xoff[1]) * ((uint64_t)ymap[1] * MULT + yoff[1]) + DIV/2) / DIV + DIV/2)/DIV; /* Prefetch first row */ {{ fetch_rows(pt, 0) }} http://repo.or.cz/w/gfxprim.git/commit/aba01e605969e8c5c6bfaee0759d1035522d… commit aba01e605969e8c5c6bfaee0759d1035522d47ef Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun May 25 16:21:51 2014 +0200 filters: ResizeLinearLF: More work Removes useless if in inner cycle which brings another 10% speedup. Do not fetch border rows twice about 20% speedup. Get rid of the C macro, use jinja macro. Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/libs/filters/GP_ResizeLinear.gen.c.t b/libs/filters/GP_ResizeLinear.gen.c.t index a7887907..d0169df5 100644 --- a/libs/filters/GP_ResizeLinear.gen.c.t +++ b/libs/filters/GP_ResizeLinear.gen.c.t @@ -37,28 +37,33 @@ #include "GP_Resize.h" -%%- macro fetch_row(pt, src, y, suff) - { - unsigned int x; - +%%- macro fetch_rows(pt, y) for (x = 0; x < src->w; x++) { - GP_Pixel pix = GP_GetPixel_Raw_{{ pt.pixelsize.suffix }}({{ src }}, x, {{ y }}); + GP_Pixel pix = GP_GetPixel_Raw_{{ pt.pixelsize.suffix }}(src, x, {{ y }}); %% for c in pt.chanslist - {{ c.name }}{{ suff }}[x] = GP_Pixel_GET_{{ c.name }}_{{ pt.name }}(pix); + {{ c.name }}[x] = GP_Pixel_GET_{{ c.name }}_{{ pt.name }}(pix); %% endfor } - } %% endmacro -#define SUM(COL, COLD, MUL) - COLD[x] += (COL[xmap[x]] * (MULT - xoff[x]) * (MUL)) / MULT;-- for (j = xmap[x]+1; j < xmap[x+1]; j++) { - COLD[x] += (COL[j] * (MUL)); - } -- if (xoff[x+1]) - COLD[x] += (COL[xmap[x+1]] * xoff[x+1] * (MUL)) / MULT; +%%- macro sum_rows(pt, mult) + for (x = 0; x < dst->w; x++) { + /* Get first left pixel */ +%% for c in pt.chanslist + {{ c.name }}_res[x] += {{ c.name }}[xmap[x]] * (MULT - xoff[x]) * {{ mult }} / MULT; +%% endfor + /* Sum middle pixels */ + for (j = xmap[x]+1; j < xmap[x+1]; j++) { +%% for c in pt.chanslist + {{ c.name }}_res[x] += {{ c.name }}[j] * {{ mult }}; +%% endfor + } + /* Add last right pixel */ +%% for c in pt.chanslist + {{ c.name }}_res[x] += {{ c.name }}[xmap[x+1]] * xoff[x+1] * {{ mult }} / MULT; +%% endfor + } +%% endmacro %% for pt in pixeltypes %% if not pt.is_unknown() and not pt.is_palette() @@ -70,6 +75,9 @@ static int resize_lin_lf_{{ pt.name }}(const GP_Context *src, GP_Context *dst, uint32_t ymap[dst->h + 1]; uint16_t xoff[dst->w + 1]; uint16_t yoff[dst->h + 1]; +%% for c in pt.chanslist + uint32_t {{ c.name }}[src->w]; +%% endfor uint32_t x, y; uint32_t i, j; {# Reduce fixed point bits for > 8 bits per channel (fixed 16 bit Grayscale) #} @@ -92,10 +100,12 @@ static int resize_lin_lf_{{ pt.name }}(const GP_Context *src, GP_Context *dst, /* Compute pixel area for the final normalization */ uint32_t div = (xmap[1] * MULT + xoff[1]) * (ymap[1] * MULT + yoff[1]) / MULT; + /* Prefetch first row */ + {{ fetch_rows(pt, 0) }} + for (y = 0; y < dst->h; y++) { %% for c in pt.chanslist - uint32_t {{ c.name }}[src->w]; - uint32_t {{ c.name }}_res[src->w]; + uint32_t {{ c.name }}_res[dst->w]; %% endfor %% for c in pt.chanslist @@ -103,31 +113,18 @@ static int resize_lin_lf_{{ pt.name }}(const GP_Context *src, GP_Context *dst, %% endfor /* Sum first row */ - {{ fetch_row(pt, 'src', 'ymap[y]', '') }} - for (x = 0; x < dst->w; x++) { -%% for c in pt.chanslist - SUM({{ c.name }}, {{ c.name }}_res, MULT-yoff[y]); -%% endfor - } + {{ sum_rows(pt, '(MULT-yoff[y])') }} /* Sum middle */ for (i = ymap[y]+1; i < ymap[y+1]; i++) { - {{ fetch_row(pt, 'src', 'i', '') }} - for (x = 0; x < dst->w; x++) { -%% for c in pt.chanslist - SUM({{ c.name }}, {{ c.name }}_res, MULT); -%% endfor - } + {{ fetch_rows(pt, 'i') }} + {{ sum_rows(pt, 'MULT') }} } /* Sum last row */ if (yoff[y+1]) { - {{ fetch_row(pt, 'src', 'ymap[y+1]', '') }} - for (x = 0; x < dst->w; x++) { -%% for c in pt.chanslist - SUM({{ c.name }}, {{ c.name }}_res, yoff[y+1]); -%% endfor - } + {{ fetch_rows(pt, 'ymap[y+1]') }} + {{ sum_rows(pt, 'yoff[y+1]') }} } for (x = 0; x < dst->w; x++) { ----------------------------------------------------------------------- Summary of changes: libs/filters/GP_ResizeLinear.gen.c.t | 93 +++++++++++++++++---------------- 1 files changed, 48 insertions(+), 45 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: 1.0.0-rc1-75-gf0637e60
by metan 25 May '14

25 May '14

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 f0637e601e591b56c6b074a6ca7e51af29eb182d (commit) from 0ccf9c3c0c8bc079bab8cefcbfeae1a3f5858f52 (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/f0637e601e591b56c6b074a6ca7e51af29eb… commit f0637e601e591b56c6b074a6ca7e51af29eb182d Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun May 25 15:29:35 2014 +0200 doc: Update gen.txt PixelChannel description The PixelChannel is an object now (not a list). Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/doc/gen.txt b/doc/gen.txt index 23edf2b8..ddb3082d 100644 --- a/doc/gen.txt +++ b/doc/gen.txt @@ -196,9 +196,25 @@ This object represents pixel type which describes the sizes and arrangements of channels in a pixel. Note that it carries an instance of pixel size described above. -The chanslist is a list of triplets describing individual channels as -[('chan_name', 'bit_offset', 'bit_size') ] where 'chan_name' is usually one of -R, G, B, V (value, used for grayscale), A (opacity). +[source,python] +------------------------------------------------------------------------------- +class PixelChannel(): + # Index (position in pixel from left) + self.idx = idx + # Pixel channel name such as R, G, B, A, ... + self.name = name + # Bit offset in pixel + self.off = offset + # Channel bit size + self.size = size + # Maximal channel value + self.max = 2 ** size - 1 + ... +------------------------------------------------------------------------------- + +The chanslist describes pixel channel. There are some convenient members to be +used directly from C code whose value is a hexadecimal string, i.e. 'C_mask', +'C_max', 'C_shift'. Templating language ~~~~~~~~~~~~~~~~~~~ ----------------------------------------------------------------------- Summary of changes: doc/gen.txt | 22 +++++++++++++++++++--- 1 files changed, 19 insertions(+), 3 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: 1.0.0-rc1-74-g0ccf9c3c
by metan 24 May '14

24 May '14

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 0ccf9c3c0c8bc079bab8cefcbfeae1a3f5858f52 (commit) via d253cc6c27e58532a905323605011047c885b185 (commit) from 72089793bd18d1bcb485401d7f97fabb82b08634 (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/0ccf9c3c0c8bc079bab8cefcbfeae1a3f585… commit 0ccf9c3c0c8bc079bab8cefcbfeae1a3f5858f52 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat May 24 22:04:44 2014 +0200 filters: ResizeLinearLF: Rewrite. Now faster, simpler and working for 16 bit Grayscale. The code needs to be a cleaned a bit later though. Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/libs/filters/GP_ResizeLinear.gen.c.t b/libs/filters/GP_ResizeLinear.gen.c.t index 958c01c6..a7887907 100644 --- a/libs/filters/GP_ResizeLinear.gen.c.t +++ b/libs/filters/GP_ResizeLinear.gen.c.t @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, * * Boston, MA 02110-1301 USA * * * - * Copyright (C) 2009-2013 Cyril Hrubis <metan(a)ucw.cz> * + * Copyright (C) 2009-2014 Cyril Hrubis <metan(a)ucw.cz> * * * *****************************************************************************/ @@ -26,6 +26,7 @@ %% block body +#include <string.h> #include <errno.h> #include "core/GP_Context.h" @@ -36,75 +37,32 @@ #include "GP_Resize.h" -/* - * Sample row. - * - * The x and y are starting coordinates in source image. - * - * The xpix_dist is distance of two sampled pixels in source image coordinates. - * - * The xoff is offset of the first pixel. - */ -%%- macro sample_x(pt, suff) -{ - uint32_t mx = x0; - uint32_t i; - - pix = GP_GetPixel_Raw_{{ pt.pixelsize.suffix }}(src, mx, y0); - - %% for c in pt.chanslist - {{ c[0] }}{{ suff }} = (GP_Pixel_GET_{{ c[0] }}_{{ pt.name }}(pix) * xoff[x]) >> 9; - %% endfor - - for (i = (1<<14) - xoff[x]; i > xpix_dist; i -= xpix_dist) { - if (mx < src->w - 1) - mx++; - - pix = GP_GetPixel_Raw_{{ pt.pixelsize.suffix }}(src, mx, y0); - - %% for c in pt.chanslist - {{ c[0] }}{{ suff }} += (GP_Pixel_GET_{{ c[0] }}_{{ pt.name }}(pix) * xpix_dist) >> 9; - %% endfor - } +%%- macro fetch_row(pt, src, y, suff) + { + unsigned int x; - if (i > 0) { - if (mx < src->w - 1) - mx++; - - pix = GP_GetPixel_Raw_{{ pt.pixelsize.suffix }}(src, mx, y0); - - %% for c in pt.chanslist - {{ c[0] }}{{ suff }} += (GP_Pixel_GET_{{ c[0] }}_{{ pt.name }}(pix) * i) >> 9; - %% endfor - } + for (x = 0; x < src->w; x++) { + GP_Pixel pix = GP_GetPixel_Raw_{{ pt.pixelsize.suffix }}({{ src }}, x, {{ y }}); +%% for c in pt.chanslist + {{ c.name }}{{ suff }}[x] = GP_Pixel_GET_{{ c.name }}_{{ pt.name }}(pix); +%% endfor + } } %% endmacro +#define SUM(COL, COLD, MUL) + COLD[x] += (COL[xmap[x]] * (MULT - xoff[x]) * (MUL)) / MULT;++ for (j = xmap[x]+1; j < xmap[x+1]; j++) { + COLD[x] += (COL[j] * (MUL)); + } ++ if (xoff[x+1]) + COLD[x] += (COL[xmap[x+1]] * xoff[x+1] * (MUL)) / MULT; + %% for pt in pixeltypes %% if not pt.is_unknown() and not pt.is_palette() -/* - * Linear interpolation with low-pass filtering, used for fast downscaling - * on both x and y. - * - * Basically we do weighted arithmetic mean of the pixels: - * - * [x, y], [x + 1, y], [x + 2, y] ... [x + k, y] - * [x, y + 1] - * [x, y + 2] . - * . . . - * . . . - * . . - * [x, y + l] .... [x + k, y + l] - * - * - * The parameter k respectively l is determined by the distance between - * sampled coordinates on x respectively y. - * - * The pixels are weighted by how much they are 'hit' by the rectangle defined - * by the sampled pixel. - * - * The implementation is inspired by imlib2 downscaling algorithm. - */ + static int resize_lin_lf_{{ pt.name }}(const GP_Context *src, GP_Context *dst, GP_ProgressCallback *callback) { @@ -114,78 +72,70 @@ static int resize_lin_lf_{{ pt.name }}(const GP_Context *src, GP_Context *dst, uint16_t yoff[dst->h + 1]; uint32_t x, y; uint32_t i, j; - GP_Pixel pix; - +{# Reduce fixed point bits for > 8 bits per channel (fixed 16 bit Grayscale) #} +%% if pt.chanslist[0].size > 8 + const int MULT=256; +%% else + const int MULT=1024; +%% endif /* Pre-compute mapping for interpolation */ - uint32_t xstep = ((src->w - 1) << 16) / (dst->w - 1); - uint32_t xpix_dist = ((dst->w - 1) << 14) / (src->w - 1); - - for (i = 0; i < dst->w + 1; i++) { - uint32_t val = i * xstep; - xmap[i] = val >> 16; - xoff[i] = ((255 - ((val >> 8) & 0xff)) * xpix_dist)>>8; + for (i = 0; i <= dst->w; i++) { + xmap[i] = (i * src->w) / dst->w; + xoff[i] = (MULT * (i * src->w))/dst->w - MULT * xmap[i]; } - uint32_t ystep = ((src->h - 1) << 16) / (dst->h - 1); - uint32_t ypix_dist = ((dst->h - 1) << 14) / (src->h - 1); - - for (i = 0; i < dst->h + 1; i++) { - uint32_t val = i * ystep; - ymap[i] = val >> 16; - yoff[i] = ((255 - ((val >> 8) & 0xff)) * ypix_dist)>>8; + for (i = 0; i <= dst->h; i++) { + ymap[i] = (i * src->h) / dst->h; + yoff[i] = (MULT * (i * src->h))/dst->h - MULT * ymap[i]; } - /* Interpolate */ - for (y = 0; y < dst->h; y++) { - for (x = 0; x < dst->w; x++) { - %% for c in pt.chanslist - uint32_t {{ c[0] }}, {{ c[0] }}1; - %% endfor + /* Compute pixel area for the final normalization */ + uint32_t div = (xmap[1] * MULT + xoff[1]) * (ymap[1] * MULT + yoff[1]) / MULT; - uint32_t x0, y0; - - x0 = xmap[x]; - y0 = ymap[y]; - - {{ sample_x(pt, '') }} - - %% for c in pt.chanslist - {{ c[0] }} = ({{ c[0] }} * yoff[y]) >> 14; - %% endfor - - for (j = (1<<14) - yoff[y]; j > ypix_dist; j -= ypix_dist) { - - x0 = xmap[x]; + for (y = 0; y < dst->h; y++) { +%% for c in pt.chanslist + uint32_t {{ c.name }}[src->w]; + uint32_t {{ c.name }}_res[src->w]; +%% endfor - if (y0 < src->h - 1) - y0++; +%% for c in pt.chanslist + memset({{ c.name }}_res, 0, sizeof({{ c.name }}_res)); +%% endfor - {{ sample_x(pt, '1') }} + /* Sum first row */ + {{ fetch_row(pt, 'src', 'ymap[y]', '') }} + for (x = 0; x < dst->w; x++) { +%% for c in pt.chanslist + SUM({{ c.name }}, {{ c.name }}_res, MULT-yoff[y]); +%% endfor + } - %% for c in pt.chanslist - {{ c[0] }} += ({{ c[0] }}1 * ypix_dist) >> 14; - %% endfor + /* Sum middle */ + for (i = ymap[y]+1; i < ymap[y+1]; i++) { + {{ fetch_row(pt, 'src', 'i', '') }} + for (x = 0; x < dst->w; x++) { +%% for c in pt.chanslist + SUM({{ c.name }}, {{ c.name }}_res, MULT); +%% endfor } + } - if (j > 0) { - x0 = xmap[x]; - - if (y0 < src->h - 1) - y0++; - - {{ sample_x(pt, '1') }} - - %% for c in pt.chanslist - {{ c[0] }} += ({{ c[0] }}1 * j) >> 14; - %% endfor + /* Sum last row */ + if (yoff[y+1]) { + {{ fetch_row(pt, 'src', 'ymap[y+1]', '') }} + for (x = 0; x < dst->w; x++) { +%% for c in pt.chanslist + SUM({{ c.name }}, {{ c.name }}_res, yoff[y+1]); +%% endfor } + } - %% for c in pt.chanslist - {{ c[0] }} = ({{ c[0] }} + (1<<4))>>5; - %% endfor - - GP_PutPixel_Raw_{{ pt.pixelsize.suffix }}(dst, x, y, - GP_Pixel_CREATE_{{ pt.name }}({{ expand_chanslist(pt, "") }})); + for (x = 0; x < dst->w; x++) { +%% for c in pt.chanslist + uint32_t {{ c.name }}_p = ({{ c.name }}_res[x] + div/2) / div; +%% endfor + GP_PutPixel_Raw_{{ pt.pixelsize.suffix }}(dst, x, y, + GP_Pixel_CREATE_{{ pt.name }}({{ expand_chanslist(pt, '', '_p') }})); } if (GP_ProgressCallbackReport(callback, y, dst->h, dst->w)) @@ -195,6 +145,7 @@ static int resize_lin_lf_{{ pt.name }}(const GP_Context *src, GP_Context *dst, GP_ProgressCallbackDone(callback); return 0; } + %% endif %% endfor @@ -228,7 +179,7 @@ static int resize_lin{{ pt.name }}(const GP_Context *src, GP_Context *dst, for (i = 0; i < dst->h + 1; i++) { uint32_t val = i * ystep; ymap[i] = val >> 16; - yoff[i] = (val >> 8) & 0xff; + yoff[i] = (val >> 8) & 0xff; } /* Interpolate */ @@ -296,13 +247,13 @@ static int resize_lin(const GP_Context *src, GP_Context *dst, GP_ProgressCallback *callback) { switch (src->pixel_type) { - %% for pt in pixeltypes - %% if not pt.is_unknown() and not pt.is_palette() +%% for pt in pixeltypes +%% if not pt.is_unknown() and not pt.is_palette() case GP_PIXEL_{{ pt.name }}: return resize_lin{{ pt.name }}(src, dst, callback); break; - %% endif - %% endfor +%% endif +%% endfor default: GP_WARN("Invalid pixel type %s", GP_PixelTypeName(src->pixel_type)); @@ -323,7 +274,7 @@ int GP_FilterResizeLinearInt(const GP_Context *src, GP_Context *dst, return resize_lin(src, dst, callback); } -static int resize_lin_lf2(const GP_Context *src, GP_Context *dst, +static int resize_lin_lf(const GP_Context *src, GP_Context *dst, GP_ProgressCallback *callback) { float x_rat = 1.00 * dst->w / src->w; @@ -335,14 +286,17 @@ static int resize_lin_lf2(const GP_Context *src, GP_Context *dst, src->w, src->h, dst->w, dst->h, x_rat, y_rat); switch (src->pixel_type) { - %% for pt in pixeltypes - %% if not pt.is_unknown() and not pt.is_palette() +%% for pt in pixeltypes +%% if not pt.is_unknown() and not pt.is_palette() case GP_PIXEL_{{ pt.name }}: return resize_lin_lf_{{ pt.name }}(src, dst, callback); break; - %% endif - %% endfor +%% endif +%% endfor default: + GP_WARN("Invalid pixel type %s", + GP_PixelTypeName(src->pixel_type)); + errno = EINVAL; return -1; } } @@ -362,7 +316,7 @@ int GP_FilterResizeLinearLFInt(const GP_Context *src, GP_Context *dst, return 1; } - return resize_lin_lf2(src, dst, callback); + return resize_lin_lf(src, dst, callback); } %% endblock body http://repo.or.cz/w/gfxprim.git/commit/d253cc6c27e58532a905323605011047c885… commit d253cc6c27e58532a905323605011047c885b185 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat May 17 22:25:26 2014 +0200 loaders: JPG: Remove stub for removed function. Remove GP_OpenJPG() stub for removed function. Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/libs/loaders/GP_JPG.c b/libs/loaders/GP_JPG.c index e45b23c4..6fd5dd28 100644 --- a/libs/loaders/GP_JPG.c +++ b/libs/loaders/GP_JPG.c @@ -557,12 +557,6 @@ int GP_MatchJPG(const void GP_UNUSED(*buf)) return -1; } -int GP_OpenJPG(const char GP_UNUSED(*src_path), FILE GP_UNUSED(**f)) -{ - errno = ENOSYS; - return 1; -} - GP_Context *GP_ReadJPG(GP_IO GP_UNUSED(*io), GP_ProgressCallback GP_UNUSED(*callback)) { ----------------------------------------------------------------------- Summary of changes: libs/filters/GP_ResizeLinear.gen.c.t | 222 +++++++++++++-------------------- libs/loaders/GP_JPG.c | 6 - 2 files changed, 88 insertions(+), 140 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: 1.0.0-rc1-72-g72089793
by metan 17 May '14

17 May '14

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 72089793bd18d1bcb485401d7f97fabb82b08634 (commit) from dbd7368023249233216d3c6ce873213833f64940 (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/72089793bd18d1bcb485401d7f97fabb82b0… commit 72089793bd18d1bcb485401d7f97fabb82b08634 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat May 17 22:15:45 2014 +0200 loaders: Convert MetaData loaders to GP_IO Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/include/loaders/GP_JPG.h b/include/loaders/GP_JPG.h index 95123ecd..93cd2df2 100644 --- a/include/loaders/GP_JPG.h +++ b/include/loaders/GP_JPG.h @@ -50,7 +50,7 @@ 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_ReadJPGMetaData(GP_IO *io, GP_MetaData *data); int GP_LoadJPGMetaData(const char *src_path, GP_MetaData *data); /* diff --git a/include/loaders/GP_PNG.h b/include/loaders/GP_PNG.h index 0b440d06..b99e7280 100644 --- a/include/loaders/GP_PNG.h +++ b/include/loaders/GP_PNG.h @@ -48,9 +48,9 @@ GP_Context *GP_ReadPNG(GP_IO *io, GP_ProgressCallback *callback); GP_Context *GP_LoadPNG(const char *src_path, GP_ProgressCallback *callback); /* - * Loads png meta-data. + * Loads PNG meta-data. */ -int GP_ReadPNGMetaData(FILE *f, GP_MetaData *data); +int GP_ReadPNGMetaData(GP_IO *io, GP_MetaData *data); int GP_LoadPNGMetaData(const char *src_path, GP_MetaData *data); /* diff --git a/libs/loaders/GP_JPG.c b/libs/loaders/GP_JPG.c index da4cf48f..e45b23c4 100644 --- a/libs/loaders/GP_JPG.c +++ b/libs/loaders/GP_JPG.c @@ -184,13 +184,28 @@ static void skip_input_data(struct jpeg_decompress_struct *cinfo, long num_bytes } } +static inline void init_source_mgr(struct my_source_mgr *src, GP_IO *io, + void *buf, size_t buf_size) +{ + src->mgr.init_source = dummy; + src->mgr.resync_to_restart = jpeg_resync_to_restart; + src->mgr.term_source = dummy; + src->mgr.fill_input_buffer = fill_input_buffer; + src->mgr.skip_input_data = skip_input_data; + src->mgr.bytes_in_buffer = 0; + src->mgr.next_input_byte = NULL; + src->io = io; + src->buffer = buf; + src->size = buf_size; +} + GP_Context *GP_ReadJPG(GP_IO *io, GP_ProgressCallback *callback) { struct jpeg_decompress_struct cinfo; struct my_source_mgr src; struct my_jpg_err my_err; GP_Context *ret = NULL; - uint8_t buffer[1024]; + uint8_t buf[1024]; int err; cinfo.err = jpeg_std_error(&my_err.error_mgr); @@ -202,18 +217,7 @@ GP_Context *GP_ReadJPG(GP_IO *io, GP_ProgressCallback *callback) } jpeg_create_decompress(&cinfo); - - /* Initialize custom source manager */ - src.mgr.init_source = dummy; - src.mgr.resync_to_restart = jpeg_resync_to_restart; - src.mgr.term_source = dummy; - src.mgr.fill_input_buffer = fill_input_buffer; - src.mgr.skip_input_data = skip_input_data; - src.mgr.bytes_in_buffer = 0; - src.mgr.next_input_byte = NULL; - src.io = io; - src.buffer = buffer; - src.size = sizeof(buffer); + init_source_mgr(&src, io, buf, sizeof(buf)); cinfo.src = (void*)&src; jpeg_read_header(&cinfo, TRUE); @@ -340,10 +344,12 @@ static void save_jpg_markers(struct jpeg_decompress_struct *cinfo) jpeg_save_markers(cinfo, JPEG_APP0 + 1, 0xffff); } -int GP_ReadJPGMetaData(FILE *f, GP_MetaData *data) +int GP_ReadJPGMetaData(GP_IO *io, GP_MetaData *data) { struct jpeg_decompress_struct cinfo; + struct my_source_mgr src; struct my_jpg_err my_err; + uint8_t buf[1024]; int err; cinfo.err = jpeg_std_error(&my_err.error_mgr); @@ -355,7 +361,8 @@ int GP_ReadJPGMetaData(FILE *f, GP_MetaData *data) } jpeg_create_decompress(&cinfo); - jpeg_stdio_src(&cinfo, f); + init_source_mgr(&src, io, buf, sizeof(buf)); + cinfo.src = (void*)&src; save_jpg_markers(&cinfo); @@ -380,15 +387,18 @@ err1: int GP_LoadJPGMetaData(const char *src_path, GP_MetaData *data) { - //FILE *f; - int ret = -1; + GP_IO *io; + int err, ret; - //if (GP_OpenJPG(src_path, &f)) - // return 1; + io = GP_IOFile(src_path, GP_IO_RDONLY); + if (!io) + return 1; - //ret = GP_ReadJPGMetaData(f, data); + ret = GP_ReadJPGMetaData(io, data); - //fclose(f); + err = errno; + GP_IOClose(io); + errno = err; return ret; } @@ -567,7 +577,7 @@ GP_Context *GP_LoadJPG(const char GP_UNUSED(*src_path), return NULL; } -int GP_ReadJPGMetaData(FILE GP_UNUSED(*f), GP_MetaData GP_UNUSED(*data)) +int GP_ReadJPGMetaData(GP_IO GP_UNUSED(*io), GP_MetaData GP_UNUSED(*data)) { errno = ENOSYS; return 1; diff --git a/libs/loaders/GP_PNG.c b/libs/loaders/GP_PNG.c index 0ea37379..50f5fcdf 100644 --- a/libs/loaders/GP_PNG.c +++ b/libs/loaders/GP_PNG.c @@ -103,7 +103,6 @@ GP_Context *GP_ReadPNG(GP_IO *io, GP_ProgressCallback *callback) goto err2; } - //png_init_io(png, f); png_set_read_fn(png, io, read_data); png_set_sig_bytes(png, 0); png_read_info(png, png_info); @@ -345,7 +344,7 @@ static void load_meta_data(png_structp png, png_infop png_info, GP_MetaData *dat } } -int GP_ReadPNGMetaData(FILE *f, GP_MetaData *data) +int GP_ReadPNGMetaData(GP_IO *io, GP_MetaData *data) { png_structp png; png_infop png_info = NULL; @@ -374,8 +373,8 @@ int GP_ReadPNGMetaData(FILE *f, GP_MetaData *data) goto err2; } - png_init_io(png, f); - png_set_sig_bytes(png, 8); + png_set_read_fn(png, io, read_data); + png_set_sig_bytes(png, 0); png_read_info(png, png_info); load_meta_data(png, png_info, data); @@ -390,15 +389,18 @@ err1: int GP_LoadPNGMetaData(const char *src_path, GP_MetaData *data) { - FILE *f; - int ret; + GP_IO *io; + int ret, err; -// if (GP_OpenPNG(src_path, &f)) -// return 1; + io = GP_IOFile(src_path, GP_IO_RDONLY); + if (!io) + return 1; - ret = GP_ReadPNGMetaData(f, data); + ret = GP_ReadPNGMetaData(io, data); - fclose(f); + err = errno; + GP_IOClose(io); + errno = err; return ret; } @@ -630,7 +632,7 @@ GP_Context *GP_LoadPNG(const char GP_UNUSED(*src_path), return NULL; } -int GP_ReadPNGMetaData(FILE GP_UNUSED(*f), GP_MetaData GP_UNUSED(*data)) +int GP_ReadPNGMetaData(GP_IO GP_UNUSED(*io), GP_MetaData GP_UNUSED(*data)) { errno = ENOSYS; return 1; ----------------------------------------------------------------------- Summary of changes: include/loaders/GP_JPG.h | 2 +- include/loaders/GP_PNG.h | 4 +- libs/loaders/GP_JPG.c | 54 +++++++++++++++++++++++++++------------------ libs/loaders/GP_PNG.c | 24 +++++++++++--------- 4 files changed, 48 insertions(+), 36 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: 1.0.0-rc1-71-gdbd73680
by metan 17 May '14

17 May '14

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 dbd7368023249233216d3c6ce873213833f64940 (commit) via d64d59ffe85c39cc5f1f285226dd75493d236a00 (commit) via 839f3e4ae66a2068ff6059fd14502e6120418c3e (commit) via 77ef6dd38134300845793ff4da8d4ff6aeaa85bd (commit) from b751bfc9b78d8dc25a503efce8582a8f6df10af7 (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/dbd7368023249233216d3c6ce873213833f6… commit dbd7368023249233216d3c6ce873213833f64940 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat May 17 21:11:00 2014 +0200 core: MixPixels: Change RGB mix to linear. Do not use Gamma mixing, this fixes font rendering. Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/include/core/GP_MixPixels.gen.h.t b/include/core/GP_MixPixels.gen.h.t index 8067f4be..7333fe9f 100644 --- a/include/core/GP_MixPixels.gen.h.t +++ b/include/core/GP_MixPixels.gen.h.t @@ -75,7 +75,7 @@ Macros to mix two pixels accordingly to percentage. #define GP_MIX_PIXELS_{{ pt.name }}(pix1, pix2, perc) %% if pt.is_rgb() - GP_MIX_PIXELS_GAMMA_{{ pt.name }}(pix1, pix2, perc) + GP_MIX_PIXELS_LINEAR_{{ pt.name }}(pix1, pix2, perc) %% else GP_MIX_PIXELS_LINEAR_{{ pt.name }}(pix1, pix2, perc) %% endif http://repo.or.cz/w/gfxprim.git/commit/d64d59ffe85c39cc5f1f285226dd75493d23… commit d64d59ffe85c39cc5f1f285226dd75493d236a00 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat May 17 21:09:03 2014 +0200 text: GP_Font.c: Remove useless includes. Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/libs/text/GP_Font.c b/libs/text/GP_Font.c index 62a1efd9..ff5f5c20 100644 --- a/libs/text/GP_Font.c +++ b/libs/text/GP_Font.c @@ -16,12 +16,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, * * Boston, MA 02110-1301 USA * * * - * Copyright (C) 2009-2012 Cyril Hrubis <metan(a)ucw.cz> * + * Copyright (C) 2009-2014 Cyril Hrubis <metan(a)ucw.cz> * * * *****************************************************************************/ -#include "core/GP_GetPutPixel.h" -#include "core/GP_MixPixels.gen.h" +#include <stdlib.h> #include "GP_Font.h" #include "GP_DefaultFont.h" http://repo.or.cz/w/gfxprim.git/commit/839f3e4ae66a2068ff6059fd14502e612041… commit 839f3e4ae66a2068ff6059fd14502e6120418c3e Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat May 17 19:56:39 2014 +0200 spiv: Add support for TTF font Adds two config options for TTF font path and font height. Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/demos/spiv/spiv.1 b/demos/spiv/spiv.1 index 30bd5d9f..69297e20 100644 --- a/demos/spiv/spiv.1 +++ b/demos/spiv/spiv.1 @@ -105,6 +105,12 @@ Shows this help .B -i, --show-info Show image info such as filename, size, etc... .TP +.B --font-path=value +Path to TTF font to be used in GUI +.TP +.B --font-height=value +TTF font height in pixels +.TP .B -p, --show-progress Show progress bar when loading/resampling/... images .TP @@ -178,6 +184,12 @@ by [NameSpace] and continues until next namespace. .B ShowInfo Show image info such as filename, size, etc... .TP +.B FontPath=value +Path to TTF font to be used in GUI +.TP +.B FontHeight=value +TTF font height in pixels +.TP .B ShowProgress Show progress bar when loading/resampling/... images .TP diff --git a/demos/spiv/spiv.c b/demos/spiv/spiv.c index d4785e0a..3cf212c3 100644 --- a/demos/spiv/spiv.c +++ b/demos/spiv/spiv.c @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, * * Boston, MA 02110-1301 USA * * * - * Copyright (C) 2009-2013 Cyril Hrubis <metan(a)ucw.cz> * + * Copyright (C) 2009-2014 Cyril Hrubis <metan(a)ucw.cz> * * * *****************************************************************************/ @@ -96,17 +96,17 @@ static int image_loader_callback(GP_ProgressCallback *self) int align = GP_ALIGN_CENTER|GP_VALIGN_ABOVE; - size = GP_TextWidth(NULL, buf); + size = GP_TextWidth(config.style, buf); int start = c->w/2 - size/2 - 10; int end = c->w/2 + size/2 + 10; int middle = start + (end - start) * self->percentage / 100; - int top = c->h - GP_TextHeight(NULL) - 11; + int top = c->h - GP_TextHeight(config.style) - 11; GP_FillRectXYXY(c, start, c->h - 1, middle, top, gray_pixel); GP_FillRectXYXY(c, middle, c->h - 1, end, top, black_pixel); - GP_Text(c, NULL, c->w/2, c->h - 5, align, + GP_Text(c, config.style, c->w/2, c->h - 5, align, white_pixel, black_pixel, buf); GP_BackendUpdateRect(backend, start, c->h - 1, end, top); @@ -154,10 +154,10 @@ static GP_Context *load_image(int elevate) GP_Context *ctx = backend->context; GP_Fill(ctx, black_pixel); - GP_Print(ctx, NULL, ctx->w/2, ctx->h/2 - 10, + GP_Print(ctx, config.style, ctx->w/2, ctx->h/2 - 10, GP_ALIGN_CENTER|GP_VALIGN_CENTER, white_pixel, black_pixel, "'%s'", image_loader_img_path()); - GP_Print(ctx, NULL, ctx->w/2, ctx->h/2 + 10, + GP_Print(ctx, config.style, ctx->w/2, ctx->h/2 + 10, GP_ALIGN_CENTER|GP_VALIGN_CENTER, white_pixel, black_pixel, "Failed to load image :( (%s)", strerror(errno)); GP_BackendFlip(backend); @@ -203,11 +203,11 @@ static void info_printf(GP_Context *ctx, GP_Coord x, GP_Coord y, va_start(va, fmt); va_copy(vac, va); - GP_VPrint(ctx, NULL, x-1, y-1, GP_ALIGN_RIGHT|GP_VALIGN_BOTTOM, + GP_VPrint(ctx, config.style, x-1, y-1, GP_ALIGN_RIGHT|GP_VALIGN_BOTTOM|GP_TEXT_NOBG, black_pixel, white_pixel, fmt, vac); va_end(vac); - GP_VPrint(ctx, NULL, x, y, GP_ALIGN_RIGHT|GP_VALIGN_BOTTOM, + GP_VPrint(ctx, config.style, x, y, GP_ALIGN_RIGHT|GP_VALIGN_BOTTOM|GP_TEXT_NOBG, white_pixel, black_pixel, fmt, va); va_end(va); @@ -224,7 +224,7 @@ static void show_info(struct loader_params *params, GP_Context *img, if (!config.show_info) return; - GP_Size th = GP_TextHeight(NULL), y = 10; + GP_Size th = GP_TextHeight(config.style), y = 10; info_printf(context, 10, y, "%ux%u (%ux%u) 1:%3.3f %3.1f%% %s", img->w, img->h, orig_img->w, orig_img->h, params->zoom_rat, diff --git a/demos/spiv/spiv_config.c b/demos/spiv/spiv_config.c index 166a28c5..6fa95f4b 100644 --- a/demos/spiv/spiv_config.c +++ b/demos/spiv/spiv_config.c @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, * * Boston, MA 02110-1301 USA * * * - * Copyright (C) 2009-2013 Cyril Hrubis <metan(a)ucw.cz> * + * Copyright (C) 2009-2014 Cyril Hrubis <metan(a)ucw.cz> * * * *****************************************************************************/ @@ -41,6 +41,9 @@ struct spiv_config config = { .full_screen = 0, .max_win_w = 1024, .max_win_h = 768, + + .font_path = NULL, + .font_height = 12, }; static int set_zoom_strategy(struct cfg_opt *self, unsigned int lineno) @@ -200,6 +203,60 @@ static int set_emulation(struct cfg_opt *self, unsigned int lineno) return 0; } +int load_font_face(GP_TextStyle *style, const char *path, unsigned int height, + unsigned int lineno) +{ + GP_FontFace *font; + static GP_FontFace *old_font = NULL; + + font = GP_FontFaceLoad(path, 0, height); + + if (!font) { + fprintf(stderr, "ERROR: %u: Failed to load font '%s'n", + lineno, path); + return 1; + } + + GP_FontFaceFree(old_font); + style->font = old_font = font; + + return 0; +} + +static int set_font(struct cfg_opt *self, unsigned int lineno) +{ + static GP_TextStyle style = {NULL, 0, 0, 1, 1, 0}; + + if (load_font_face(&style, self->val, config.font_height, lineno)) + return 1; + + free(config.font_path); + config.font_path = strdup(self->val); + config.style = &style; + + return 0; +} + +static int set_font_height(struct cfg_opt *self, unsigned int lineno) +{ + int height = atoi(self->val); + + if (height <= 0) { + fprintf(stderr, "ERROR: %u: Wrong font height '%s'n", + lineno, self->val); + return 1; + } + + config.font_height = height; + + if (config.style) { + return load_font_face(config.style, config.font_path, + config.font_height, lineno); + } + + return 0; +} + static int help(struct cfg_opt *self, unsigned int lineno) { (void) self; @@ -237,6 +294,20 @@ struct cfg_opt spiv_opts[] = { .help = "Show image info such as filename, size, etc...", }, {.name_space = "Gui", + .key = "FontPath", + .opt_long = "font-path", + .opt_has_value = 1, + .set = set_font, + .help = "Path to TTF font to be used in GUI", + }, + {.name_space = "Gui", + .key = "FontHeight", + .opt_long = "font-height", + .opt_has_value = 1, + .set = set_font_height, + .help = "TTF font height in pixels", + }, + {.name_space = "Gui", .key = "ShowProgress", .opt = 'p', .opt_long = "show-progress", diff --git a/demos/spiv/spiv_config.h b/demos/spiv/spiv_config.h index e4a5c124..144ec6ea 100644 --- a/demos/spiv/spiv_config.h +++ b/demos/spiv/spiv_config.h @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, * * Boston, MA 02110-1301 USA * * * - * Copyright (C) 2009-2013 Cyril Hrubis <metan(a)ucw.cz> * + * Copyright (C) 2009-2014 Cyril Hrubis <metan(a)ucw.cz> * * * *****************************************************************************/ @@ -60,6 +60,11 @@ struct spiv_config { int full_screen:1; char backend_init[128]; GP_PixelType emul_type; + + /* Font information */ + GP_TextStyle *style; + char *font_path; + unsigned int font_height; }; extern struct spiv_config config; diff --git a/demos/spiv/spiv_help.c b/demos/spiv/spiv_help.c index 9d018872..ef1f0c58 100644 --- a/demos/spiv/spiv_help.c +++ b/demos/spiv/spiv_help.c @@ -230,6 +230,8 @@ void print_man(void) puts(man_tail); } +static int last_line; + static int redraw_help(GP_Backend *backend, unsigned int loff, GP_Coord xoff) { GP_Context *c = backend->context; @@ -237,19 +239,32 @@ static int redraw_help(GP_Backend *backend, unsigned int loff, GP_Coord xoff) GP_Pixel white = GP_ColorToContextPixel(GP_COL_WHITE, c); int i; + int spacing = GP_TextHeight(config.style)/10 + 2; + int height = GP_TextHeight(config.style); + GP_Fill(c, black); - GP_Print(c, NULL, 20 + 10 * xoff, 2, GP_ALIGN_RIGHT|GP_VALIGN_BOTTOM, + GP_Print(c, config.style, 20 + 10 * xoff, 2, GP_ALIGN_RIGHT|GP_VALIGN_BOTTOM, white, black, "%s", "Keyboard Controls:"); + unsigned int max = 0; + + for (i = 0; i < help_keys_len; i++) + max = GP_MAX(max, GP_TextWidth(config.style, help_keys[i].keys)); + for (i = loff; i < help_keys_len; i++) { - GP_Coord h = 2 + (i - loff + 1) * 15; + GP_Coord h = spacing + (i - loff + 1) * (height + spacing); - if (h + 2 >= (GP_Coord)c->h) + if (h + height + spacing > (GP_Coord)c->h) { + last_line = 0; goto out; + } - GP_Print(c, NULL, 20 + 10 * xoff, h, GP_ALIGN_RIGHT|GP_VALIGN_BOTTOM, - white, black, "%-"KEYS_MAX"s - %s", help_keys[i].keys, help_keys[i].desc); + GP_Print(c, config.style, 20 + 10 * xoff, h, GP_ALIGN_RIGHT|GP_VALIGN_BOTTOM, + white, black, "%s", help_keys[i].keys); + GP_Print(c, config.style, 20 + 10 * xoff + max, h, GP_ALIGN_RIGHT|GP_VALIGN_BOTTOM, + white, black, " - %s", help_keys[i].desc); + last_line = 1; } out: @@ -257,11 +272,6 @@ out: return i; } -static int max_lines(GP_Backend *backend) -{ - return (backend->context->h - 4) / 15; -} - void draw_help(GP_Backend *backend) { int loff = 0, last, xoff = 0; @@ -294,17 +304,16 @@ void draw_help(GP_Backend *backend) break; case GP_KEY_PAGE_DOWN: if (last < help_keys_len) { - if (loff + max_lines(backend) >= help_keys_len) + if (last_line) break; - loff += max_lines(backend); - + loff += last - loff; last = redraw_help(backend, loff, xoff); } break; case GP_KEY_PAGE_UP: if (loff > 0) { - loff -= max_lines(backend); + loff -= last - loff; if (loff < 0) loff = 0; last = redraw_help(backend, loff, xoff); http://repo.or.cz/w/gfxprim.git/commit/77ef6dd38134300845793ff4da8d4ff6aeaa… commit 77ef6dd38134300845793ff4da8d4ff6aeaa85bd Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat May 17 19:52:33 2014 +0200 text: GP_FontFaceFree(): Do not SegFault on NULL Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/doc/text.txt b/doc/text.txt index 3f3a5e70..8a4a4cb4 100644 --- a/doc/text.txt +++ b/doc/text.txt @@ -218,8 +218,9 @@ GP_FontFace *GP_FontFaceLoad(const char *path, uint32_t width, uint32_t height); void GP_FontFaceFree(GP_FontFace *self); -------------------------------------------------------------------------------- -Renders TrueType font using link:http://www.freetype.org[FreeType] (currently -printable ASCII only) into GFXprim font structures. +The 'GP_FontFaceLoad()' renders TrueType font using +link:http://www.freetype.org[FreeType] (currently printable ASCII only) into +GFXprim font structures. One of the 'width' or 'height' may be zero, which means that the second value should be computed accordingly. @@ -227,5 +228,7 @@ should be computed accordingly. NOTE: If you pass both 'width' and 'height' non-zero the resulting font may look strange as this action forced unnatural aspect ratio. +The 'GP_FontFaceFree()' frees memory taken up by the rendered font. If self is +NULL no operation is done. TIP: For Font and TextStyle handling see link:example_fonts.html[examples]. diff --git a/libs/text/GP_Font.c b/libs/text/GP_Font.c index d7232393..62a1efd9 100644 --- a/libs/text/GP_Font.c +++ b/libs/text/GP_Font.c @@ -63,6 +63,9 @@ GP_GlyphBitmap *GP_GetGlyphBitmap(const GP_FontFace *font, int c) void GP_FontFaceFree(GP_FontFace *self) { + if (!self) + return; + free(self->glyphs); free(self); } ----------------------------------------------------------------------- Summary of changes: demos/spiv/spiv.1 | 12 ++++++ demos/spiv/spiv.c | 18 +++++----- demos/spiv/spiv_config.c | 73 ++++++++++++++++++++++++++++++++++++- demos/spiv/spiv_config.h | 7 +++- demos/spiv/spiv_help.c | 37 ++++++++++++------- doc/text.txt | 7 +++- include/core/GP_MixPixels.gen.h.t | 2 +- libs/text/GP_Font.c | 8 +++-- 8 files changed, 133 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: 1.0.0-rc1-67-gb751bfc9
by metan 11 May '14

11 May '14

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 b751bfc9b78d8dc25a503efce8582a8f6df10af7 (commit) via 1479708a43cb28eada03dbf962fe98a623cd68d6 (commit) from 76f73128753ed19cefe7e80e55520edccbb01b9a (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/b751bfc9b78d8dc25a503efce8582a8f6df1… commit b751bfc9b78d8dc25a503efce8582a8f6df10af7 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun May 11 14:06:56 2014 +0200 doc: Add resize filters to python docs. Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/demos/py_simple/resize.py b/demos/py_simple/resize.py index 38a5b783..7d11e229 100755 --- a/demos/py_simple/resize.py +++ b/demos/py_simple/resize.py @@ -10,13 +10,10 @@ def main(): print("USAGE: %s imput_image output_image" % sys.argv[0]); sys.exit(1) - # Turns on debug messages - core.SetDebugLevel(10); - # Load Image src = loaders.Load(sys.argv[1]) # Resize image to the half of the original - res = src.filters.ResizeAlloc(src.w//2, src.h//2, 2) + res = src.filters.ResizeLFIntAlloc(src.w//2, src.h//2) # Save Image res.loaders.Save(sys.argv[2]) diff --git a/doc/example_py_resize.txt b/doc/example_py_resize.txt new file mode 100644 index 00000000..06504964 --- /dev/null +++ b/doc/example_py_resize.txt @@ -0,0 +1,8 @@ +Resize +------ +A simple program that loads image, resizes it to half and saves result. + +[source,python] +------------------------------------------------------------------ +include::../demos/py_simple/resize.py[] +------------------------------------------------------------------ diff --git a/doc/filters_python.txt b/doc/filters_python.txt index c1dadb84..fc202fbb 100644 --- a/doc/filters_python.txt +++ b/doc/filters_python.txt @@ -8,9 +8,10 @@ The filter functions could be called directly as +filters.Foo(img, ..)+ or from submodule as +img.filters.Foo(..)+. Note that in the second case the image is passed automatically as a first parameter. -If filter has been aborted from callback 'OSError' with errno set to -'ECANCELED' is raised, see progress callback -link:core_python.html#Progress_Callback[documentation] for more information. +If filter is aborted from a callback 'OSError' with errno set to +'ECANCELED' is raised, see +link:core_python.html#Progress_Callback[progress callback] for more +information. Point Filters ~~~~~~~~~~~~~ @@ -402,3 +403,29 @@ respectively y pixel neighbors from each side so the result is median of rectangle of +2 * x + 1+ x +2 * y + 1+ pixels. include::images/median/images.txt[] + +Resize +~~~~~~ + +[source,python] +------------------------------------------------------------------------------- +import gfxprim.core as core +import gfxprim.filters as filters + + # Nearest neighbour resize, fastest but lowest quality + res = img.ResizeNNAlloc(100, 100, callback=None) + + # Fast and good quality with low pass on downscaling + res = img.ResizeLinearLFIntAlloc(100, 100, callback=None) + + # Cubic interpolation, needs low pass (blur) applied before downscaling + res = img.ResizeCubicIntAlloc(100, 100, callback=None) + + # All of the above, TYPE is numeric enum + res = img.ResizeAlloc(100, 100, TYPE, callback=None) + +------------------------------------------------------------------------------- + +Functions to resize (resample) image. + +TIP: See link:example_py_resize.html[resize example]. http://repo.or.cz/w/gfxprim.git/commit/1479708a43cb28eada03dbf962fe98a623cd… commit 1479708a43cb28eada03dbf962fe98a623cd68d6 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun May 11 14:00:20 2014 +0200 pywrap: filters: Add ResizeCubicInt Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/pylib/gfxprim/filters/filters.i b/pylib/gfxprim/filters/filters.i index a504f76a..3aeba03b 100644 --- a/pylib/gfxprim/filters/filters.i +++ b/pylib/gfxprim/filters/filters.i @@ -92,6 +92,10 @@ FILTER_FUNC(ResizeLinearInt); FILTER_FUNC(ResizeLinearLFInt); %include "GP_ResizeLinear.h" +FILTER_FUNC(ResizeCubic); +FILTER_FUNC(ResizeCubicInt); +%include "GP_ResizeCubic.h" + /* Ditherings */ FILTER_FUNC(FloydSteinberg); FILTER_FUNC(GP_FilterHilbertPeano); ----------------------------------------------------------------------- Summary of changes: demos/py_simple/resize.py | 5 +-- ...mple_py_showimage.txt => example_py_resize.txt} | 8 ++-- doc/filters_python.txt | 33 ++++++++++++++++++-- pylib/gfxprim/filters/filters.i | 4 ++ 4 files changed, 39 insertions(+), 11 deletions(-) copy doc/{example_py_showimage.txt => example_py_resize.txt} (53%) 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: 1.0.0-rc1-65-g76f73128
by metan 10 May '14

10 May '14

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 76f73128753ed19cefe7e80e55520edccbb01b9a (commit) via ade7565f6c0e487071582b09196ac36c7fa1e4cf (commit) from 93832f616ef3ea2dde888cf8e0b7e1a2da077d06 (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/76f73128753ed19cefe7e80e55520edccbb0… commit 76f73128753ed19cefe7e80e55520edccbb01b9a Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat May 10 14:50:37 2014 +0200 loaders: JPG: Fix segfault in load_cmyk() Fixes typo in number of scanlines to load from a CMYK jpeg. Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/libs/loaders/GP_JPG.c b/libs/loaders/GP_JPG.c index a0eabd97..da4cf48f 100644 --- a/libs/loaders/GP_JPG.c +++ b/libs/loaders/GP_JPG.c @@ -113,7 +113,7 @@ static int load_cmyk(struct jpeg_decompress_struct *cinfo, GP_Context *ret, uint32_t y = cinfo->output_scanline; JSAMPROW addr = (void*)GP_PIXEL_ADDR(ret, 0, y); - jpeg_read_scanlines(cinfo, &addr, 4); + jpeg_read_scanlines(cinfo, &addr, 1); unsigned int i; uint8_t *buf = GP_PIXEL_ADDR(ret, 0, y); http://repo.or.cz/w/gfxprim.git/commit/ade7565f6c0e487071582b09196ac36c7fa1… commit ade7565f6c0e487071582b09196ac36c7fa1e4cf Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat May 10 14:49:53 2014 +0200 tests: loaders: Add jpeg CMYK loader test. Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/tests/loaders/.gitignore b/tests/loaders/.gitignore index f6863aaf..3ef73f19 100644 --- a/tests/loaders/.gitignore +++ b/tests/loaders/.gitignore @@ -6,6 +6,7 @@ PNG PNM PPM PCX +JPG SaveAbort.gen SaveLoad.gen ZIP diff --git a/tests/loaders/JPG.c b/tests/loaders/JPG.c new file mode 100644 index 00000000..67c34dd4 --- /dev/null +++ b/tests/loaders/JPG.c @@ -0,0 +1,141 @@ +/***************************************************************************** + * 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-2014 Cyril Hrubis <metan(a)ucw.cz> * + * * + *****************************************************************************/ + +#include <string.h> +#include <errno.h> +#include <sys/stat.h> + +#include <core/GP_Context.h> +#include <core/GP_GetPutPixel.h> +#include <loaders/GP_Loaders.h> + +#include "tst_test.h" + +static int test_load_JPG(const char *path) +{ + GP_Context *img; + + errno = 0; + + img = GP_LoadJPG(path, NULL); + + if (img == NULL) { + switch (errno) { + case ENOSYS: + tst_msg("Not Implemented"); + return TST_SKIPPED; + default: + tst_msg("Got %s", strerror(errno)); + return TST_FAILED; + } + } + + /* + * TODO: check correct data. + */ + + GP_ContextFree(img); + + return TST_SUCCESS; +} + +static int test_save_JPG(GP_PixelType pixel_type) +{ + GP_Context *ctx; + int ret; + + ctx = GP_ContextAlloc(100, 100, pixel_type); + + if (ctx == NULL) { + tst_msg("Failed to allocate context"); + return TST_UNTESTED; + } + + errno = 0; + + ret = GP_SaveJPG(ctx, "/dev/null", NULL); + + if (ret == 0) { + tst_msg("Saved successfully"); + GP_ContextFree(ctx); + return TST_SUCCESS; + } + + switch (errno) { + case ENOSYS: + tst_msg("Not Implemented"); + GP_ContextFree(ctx); + return TST_SKIPPED; + default: + tst_msg("Failed and errno is not ENOSYS (%i)", errno); + GP_ContextFree(ctx); + return TST_FAILED; + } +} + +const struct tst_suite tst_suite = { + .suite_name = "JPEG", + .tests = { + /* JPEG loader tests */ + {.name = "JPEG Load 100x100 CMYK", + .tst_fn = test_load_JPG, + .res_path = "data/jpeg/valid/100x100-cmyk-red.jpeg", + .data = "100x100-cmyk-red.jpeg", + .flags = TST_TMPDIR | TST_CHECK_MALLOC}, + + {.name = "JPEG Load 100x100 RGB", + .tst_fn = test_load_JPG, + .res_path = "data/jpeg/valid/100x100-red.jpeg", + .data = "100x100-red.jpeg", + .flags = TST_TMPDIR | TST_CHECK_MALLOC}, + + {.name = "JPEG Load 100x100 G8", + .tst_fn = test_load_JPG, + .res_path = "data/jpeg/valid/100x100-grayscale-white.jpeg", + .data = "100x100-grayscale-white.jpeg", + .flags = TST_TMPDIR | TST_CHECK_MALLOC}, + + {.name = "JPEG Load 100x100 G8", + .tst_fn = test_load_JPG, + .res_path = "data/jpeg/valid/100x100-grayscale-black.jpeg", + .data = "100x100-grayscale-black.jpeg", + .flags = TST_TMPDIR | TST_CHECK_MALLOC}, + + /* JPEG save tests */ + {.name = "JPEG Save 100x100 G8", + .tst_fn = test_save_JPG, + .data = (void*)GP_PIXEL_G8, + .flags = TST_CHECK_MALLOC}, + + {.name = "JPEG Save 100x100 RGB888", + .tst_fn = test_save_JPG, + .data = (void*)GP_PIXEL_RGB888, + .flags = TST_CHECK_MALLOC}, + + {.name = "JPEG Save 100x100 BGR888", + .tst_fn = test_save_JPG, + .data = (void*)GP_PIXEL_BGR888, + .flags = TST_CHECK_MALLOC}, + + {.name = NULL}, + } +}; diff --git a/tests/loaders/Makefile b/tests/loaders/Makefile index 890e5761..fb56086d 100644 --- a/tests/loaders/Makefile +++ b/tests/loaders/Makefile @@ -1,11 +1,12 @@ TOPDIR=../.. include $(TOPDIR)/pre.mk -CSOURCES=loaders_suite.c PNG.c PBM.c PGM.c PPM.c ZIP.c GIF.c IO.c PNM.c PCX.c +CSOURCES=loaders_suite.c PNG.c PBM.c PGM.c PPM.c ZIP.c GIF.c IO.c PNM.c PCX.c+ JPG.c GENSOURCES=SaveLoad.gen.c SaveAbort.gen.c APPS=loaders_suite PNG PBM PGM PPM PNM SaveLoad.gen SaveAbort.gen ZIP GIF PCX- IO + IO JPG include ../tests.mk diff --git a/tests/loaders/data/jpeg/valid/100x100-cmyk-red.jpeg b/tests/loaders/data/jpeg/valid/100x100-cmyk-red.jpeg new file mode 100644 index 00000000..cecf0700 Binary files /dev/null and b/tests/loaders/data/jpeg/valid/100x100-cmyk-red.jpeg differ diff --git a/tests/loaders/data/jpeg/valid/100x100-grayscale-black.jpeg b/tests/loaders/data/jpeg/valid/100x100-grayscale-black.jpeg new file mode 100644 index 00000000..f0fd04bf Binary files /dev/null and b/tests/loaders/data/jpeg/valid/100x100-grayscale-black.jpeg differ diff --git a/tests/loaders/data/jpeg/valid/100x100-grayscale-white.jpeg b/tests/loaders/data/jpeg/valid/100x100-grayscale-white.jpeg new file mode 100644 index 00000000..37ac78ff Binary files /dev/null and b/tests/loaders/data/jpeg/valid/100x100-grayscale-white.jpeg differ diff --git a/tests/loaders/test_list.txt b/tests/loaders/test_list.txt index d36b2a3e..adf857ea 100644 --- a/tests/loaders/test_list.txt +++ b/tests/loaders/test_list.txt @@ -1,6 +1,7 @@ # Loaders testsuite loaders_suite PNG +JPG GIF PBM PGM ----------------------------------------------------------------------- Summary of changes: libs/loaders/GP_JPG.c | 2 +- tests/loaders/.gitignore | 1 + tests/loaders/{GIF.c => JPG.c} | 87 ++++++++++++++++++-- tests/loaders/Makefile | 5 +- .../loaders/data/jpeg/valid/100x100-cmyk-red.jpeg | Bin 0 -> 454 bytes .../data/jpeg/valid/100x100-grayscale-black.jpeg | Bin 0 -> 367 bytes .../data/jpeg/valid/100x100-grayscale-white.jpeg | Bin 0 -> 367 bytes tests/loaders/test_list.txt | 1 + 8 files changed, 86 insertions(+), 10 deletions(-) copy tests/loaders/{GIF.c => JPG.c} (53%) create mode 100644 tests/loaders/data/jpeg/valid/100x100-cmyk-red.jpeg create mode 100644 tests/loaders/data/jpeg/valid/100x100-grayscale-black.jpeg create mode 100644 tests/loaders/data/jpeg/valid/100x100-grayscale-white.jpeg 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: 1.0.0-rc1-63-g93832f61
by metan 03 May '14

03 May '14

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 93832f616ef3ea2dde888cf8e0b7e1a2da077d06 (commit) from ac5ab1fc384840bd63b923cd8d02043176676d01 (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/93832f616ef3ea2dde888cf8e0b7e1a2da07… commit 93832f616ef3ea2dde888cf8e0b7e1a2da077d06 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Fri May 2 23:29:31 2014 +0200 loaders: BMP: Use IO for saving. Adds GP_IOWriteF() and converts BMP saver to it. There is also new GP_WriteBMP() function that takes opened IO instead of a path as a parameter. Signed-off-by: Cyril Hrubis <metan(a)ucw.cz> diff --git a/build/syms/Loaders_symbols.txt b/build/syms/Loaders_symbols.txt index f8c1d68c..b73506dd 100644 --- a/build/syms/Loaders_symbols.txt +++ b/build/syms/Loaders_symbols.txt @@ -15,6 +15,7 @@ GP_LoadPNGMetaData GP_SavePNG GP_MatchBMP +GP_WriteBMP GP_LoadBMP GP_ReadBMP GP_SaveBMP @@ -109,6 +110,7 @@ GP_IOFill GP_IOReadF GP_IOReadB2 GP_IOReadB4 +GP_IOWriteF GP_IOZlib GP_IOZlibReset diff --git a/include/loaders/GP_BMP.h b/include/loaders/GP_BMP.h index 48eff73a..047d7733 100644 --- a/include/loaders/GP_BMP.h +++ b/include/loaders/GP_BMP.h @@ -41,6 +41,14 @@ GP_Context *GP_ReadBMP(GP_IO *io, GP_ProgressCallback *callback); GP_Context *GP_LoadBMP(const char *src_path, GP_ProgressCallback *callback); /* + * Writes a BMP to an IO Stream. + * + * Returns zero on success, non-zero on failure and errno is set. + */ +int GP_WriteBMP(const GP_Context *src, GP_IO *io, + GP_ProgressCallback *callback); + +/* * Saves BMP to a file. Zero is returned on succes. Upon failure non-zero is * returned and errno is filled accordingly. */ diff --git a/include/loaders/GP_IO.h b/include/loaders/GP_IO.h index 6947e3b3..19a1c78e 100644 --- a/include/loaders/GP_IO.h +++ b/include/loaders/GP_IO.h @@ -173,6 +173,8 @@ enum GP_IOReadFTypes { int GP_IOReadF(GP_IO *self, uint16_t *types, ...); +int GP_IOWriteF(GP_IO *self, uint16_t *types, ...); + /* * GP_IOReadF wrappers for convinient reading of single value */ diff --git a/libs/loaders/GP_BMP.c b/libs/loaders/GP_BMP.c index cc03a5e3..1d9e9c20 100644 --- a/libs/loaders/GP_BMP.c +++ b/libs/loaders/GP_BMP.c @@ -226,8 +226,7 @@ static int read_bitmap_info_header(GP_IO *io, struct bitmap_info_header *header) /* This must be 1 according to specs */ if (nr_planes != 1) - GP_DEBUG(1, "Number of planes is %"PRId16" should be 1", - nr_planes); + GP_WARN("Number of planes %"PRId16" should be 1", nr_planes); GP_DEBUG(2, "Have BMP bitmap size %"PRId32"x%"PRId32" %"PRIu16" " "bpp, %"PRIu32" pallete colors, '%s' compression", @@ -742,22 +741,43 @@ static uint32_t bmp_count_bitmap_size(struct bitmap_info_header *header) return header->h * bmp_align_row_size(header->bpp * header->w); } -static int bmp_write_header(struct bitmap_info_header *header, FILE *f) +static int bmp_write_header(GP_IO *io, struct bitmap_info_header *header) { uint32_t bitmap_size = bmp_count_bitmap_size(header); uint32_t file_size = bitmap_size + header->header_size + 14; - /* Bitmap Header */ - if (GP_FWrite(f, "A2 L4 0x00 0x00 0x00 0x00 L4", "BM", - file_size, header->pixel_offset) != 7) + uint16_t bitmap_header[] = { + 'B', 'M', /* signature */ + GP_IO_L4, /* pixels offset */ + 0x00, 0x00, 0x00, 0x00, /* reserved */ + GP_IO_L4, /* file size */ + GP_IO_END, + }; + + if (GP_IOWriteF(io, bitmap_header, file_size, header->pixel_offset)) return EIO; - /* Bitmap Info Header */ - if (GP_FWrite(f, "L4 L4 L4 L2 L2 L4 L4 L4 L4 L4 L4", - header->header_size, header->w, header->h, 1, - header->bpp, header->compress_type, bitmap_size, 0, 0, - header->palette_colors, 0) != 11) + uint16_t bitmap_info_header[] = { + GP_IO_L4, /* header size */ + GP_IO_L4, /* width */ + GP_IO_L4, /* height */ + 0x01, 0x00, /* nr planes, always 1 */ + GP_IO_L2, /* bpp */ + GP_IO_L4, /* compression type */ + GP_IO_L4, /* bitmap size */ + 0, 0, 0, 0, /* X PPM */ + 0, 0, 0, 0, /* Y PPM */ + GP_IO_L4, /* palette colors */ + 0, 0, 0, 0, /* important palette colors */ + GP_IO_END, + }; + + if (GP_IOWriteF(io, bitmap_info_header, header->header_size, + header->w, header->h, header->bpp, + header->compress_type, bitmap_size, + header->palette_colors)) { return EIO; + } return 0; } @@ -796,7 +816,8 @@ static int bmp_fill_header(const GP_Context *src, struct bitmap_info_header *hea return 0; } -static int bmp_write_data(FILE *f, const GP_Context *src, GP_ProgressCallback *callback) +static int bmp_write_data(GP_IO *io, const GP_Context *src, + GP_ProgressCallback *callback) { int y; uint32_t padd_len = 0; @@ -817,13 +838,14 @@ static int bmp_write_data(FILE *f, const GP_Context *src, GP_ProgressCallback *c row = tmp; } - if (fwrite(row, src->bytes_per_row, 1, f) != 1) + if (GP_IOWrite(io, row, src->bytes_per_row) != src->bytes_per_row) return EIO; /* write padding */ - if (padd_len) - if (fwrite(padd, padd_len, 1, f) != 1) + if (padd_len) { + if (GP_IOWrite(io, padd, padd_len) != padd_len) return EIO; + } if (GP_ProgressCallbackReport(callback, y, src->h, src->w)) { GP_DEBUG(1, "Operation aborted"); @@ -831,50 +853,55 @@ static int bmp_write_data(FILE *f, const GP_Context *src, GP_ProgressCallback *c } } + GP_ProgressCallbackDone(callback); + return 0; } -int GP_SaveBMP(const GP_Context *src, const char *dst_path, - GP_ProgressCallback *callback) +int GP_WriteBMP(const GP_Context *src, GP_IO *io, + GP_ProgressCallback *callback) { struct bitmap_info_header header; - FILE *f; int err; - GP_DEBUG(1, "Saving BMP Image '%s'", dst_path); - if ((err = bmp_fill_header(src, &header))) - goto err0; + goto err; - f = fopen(dst_path, "wb"); + if ((err = bmp_write_header(io, &header))) + goto err; - if (f == NULL) { - err = errno; - GP_DEBUG(1, "Failed to open '%s' for writing: %s", - dst_path, strerror(errno)); - goto err0; - } + if ((err = bmp_write_data(io, src, callback))) + goto err; - if ((err = bmp_write_header(&header, f))) - goto err1; + return 0; +err: + errno = err; + return 1; +} - if ((err = bmp_write_data(f, src, callback))) - goto err1; - if (fclose(f)) { - err = errno; - GP_DEBUG(1, "Failed to close file '%s': %s", - dst_path, strerror(errno)); - goto err1; +int GP_SaveBMP(const GP_Context *src, const char *dst_path, + GP_ProgressCallback *callback) +{ + GP_IO *io; + + GP_DEBUG(1, "Saving BMP Image '%s'", dst_path); + + io = GP_IOFile(dst_path, GP_IO_WRONLY); + + if (!io) + return 1; + + if (GP_WriteBMP(src, io, callback)) { + GP_IOClose(io); + unlink(dst_path); + return 1; } - GP_ProgressCallbackDone(callback); + if (GP_IOClose(io)) { + unlink(dst_path); + return 1; + } return 0; -err1: - fclose(f); -err0: - unlink(dst_path); - errno = err; - return 1; } diff --git a/libs/loaders/GP_IO.c b/libs/loaders/GP_IO.c index 0b77bd5c..145058b8 100644 --- a/libs/loaders/GP_IO.c +++ b/libs/loaders/GP_IO.c @@ -27,6 +27,7 @@ #include <sys/stat.h> #include <fcntl.h> #include <stdarg.h> +#include <inttypes.h> #include <core/GP_ByteOrder.h> #include <core/GP_Debug.h> @@ -612,6 +613,60 @@ end: return ret; } +int GP_IOWriteF(GP_IO *io, uint16_t *types, ...) +{ + va_list va; + uint8_t *ptr, t; + int32_t i4; + int16_t i2; + + va_start(va, types); + + while (*types != GP_IO_END) { + switch (TYPE(*types)) { + case GP_IO_CONST: + t = VAL(*types); + if (GP_IOWrite(io, &t, 1) != 1) + goto err; + break; + case GP_IO_L2: + case GP_IO_B2: + i2 = va_arg(va, int); + ptr = (void*)&i2; + + if (needs_swap(*types)) + GP_SWAP(ptr[0], ptr[1]); + + if (GP_IOWrite(io, ptr, 2) != 2) + goto err; + break; + case GP_IO_L4: + case GP_IO_B4: + i4 = va_arg(va, int); + ptr = (void*)&i4; + + if (needs_swap(*types)) { + GP_SWAP(ptr[0], ptr[3]); + GP_SWAP(ptr[1], ptr[2]); + } + + if (GP_IOWrite(io, ptr, 4) != 4) + goto err; + break; + default: + GP_WARN("Invalid type %"PRIu16"n", *types); + goto err; + } + types++; + } + + va_end(va); + return 0; +err: + va_end(va); + return -1; +} + int GP_IOReadB4(GP_IO *io, uint32_t *val) { uint16_t desc[] = { ----------------------------------------------------------------------- Summary of changes: build/syms/Loaders_symbols.txt | 2 + include/loaders/GP_BMP.h | 8 +++ include/loaders/GP_IO.h | 2 + libs/loaders/GP_BMP.c | 115 ++++++++++++++++++++++++--------------- libs/loaders/GP_IO.c | 55 +++++++++++++++++++ 5 files changed, 138 insertions(+), 44 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