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 834cc1ebc413ddcae710eda665917661f2c7e71e (commit) via 3fa8a0fd9f6a858cd5094a1e7bdca634a01a5664 (commit) via 63bd14db7c7715aba8d71d56078a5cbac1507972 (commit) from 6ce5bcc70a435c39f01488e7dbe225374f56527f (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/834cc1ebc413ddcae710eda665917661f2c7e... commit 834cc1ebc413ddcae710eda665917661f2c7e71e Author: Cyril Hrubis <metan@ucw.cz> Date: Wed May 8 17:14:10 2013 +0200 GFXprim 1.0.0-rc0 Signed-off-by: Cyril Hrubis <metan@ucw.cz> diff --git a/include/core/GP_Version.h b/include/core/GP_Version.h index d1dde65..cb7c944 100644 --- a/include/core/GP_Version.h +++ b/include/core/GP_Version.h @@ -29,7 +29,7 @@ #ifndef CORE_GP_VERSION_H #define CORE_GP_VERSION_H -#define GP_VER_MAJOR 0 +#define GP_VER_MAJOR 1 #define GP_VER_MINOR 0 #define GP_VER_MICRO 0 @@ -38,6 +38,6 @@ #define GP_VER_STR GP_STRX(GP_VER_MAJOR) "." GP_STRX(GP_VER_MINOR) "." - GP_STRX(GP_VER_MICRO) + GP_STRX(GP_VER_MICRO) "-rc0" #endif /* CORE_GP_VERSION_H */ diff --git a/libver.mk b/libver.mk index 747c7b4..16f57d4 100644 --- a/libver.mk +++ b/libver.mk @@ -3,7 +3,7 @@ # for library names, soname etc # -LIB_MAJOR=0 +LIB_MAJOR=1 LIB_MINOR=0 LIB_RELEASE=0 http://repo.or.cz/w/gfxprim.git/commit/3fa8a0fd9f6a858cd5094a1e7bdca634a01a5... commit 3fa8a0fd9f6a858cd5094a1e7bdca634a01a5664 Author: Cyril Hrubis <metan@ucw.cz> Date: Wed May 8 17:06:06 2013 +0200 core: Add header GP_Version.h Add header with GFXprim version Signed-off-by: Cyril Hrubis <metan@ucw.cz> diff --git a/demos/c_simple/Makefile b/demos/c_simple/Makefile index 3ef9ff7..3202c84 100644 --- a/demos/c_simple/Makefile +++ b/demos/c_simple/Makefile @@ -18,7 +18,7 @@ APPS=backend_example loaders_example loaders filters_symmetry gfx_koch v4l2_show v4l2_grab convolution weighted_median shapetest koch input_example fileview linetest randomshapetest fonttest loaders_register blittest textaligntest abort sin_AA x11_windows- debug_handler gaussian_noise byte_utils + debug_handler gaussian_noise byte_utils version ifeq ($(HAVE_LIBSDL),yes) APPS+=SDL_glue diff --git a/include/core/GP_Core.h b/demos/c_simple/version.c similarity index 58% copy from include/core/GP_Core.h copy to demos/c_simple/version.c index d10152f..3f83d7e 100644 --- a/include/core/GP_Core.h +++ b/demos/c_simple/version.c @@ -16,62 +16,22 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, * * Boston, MA 02110-1301 USA * * * - * Copyright (C) 2009-2010 Jiri "BlueBear" Dluhos * - * <jiri.bluebear.dluhos@gmail.com> * - * * - * Copyright (C) 2009-2010 Cyril Hrubis <metan@ucw.cz> * + * Copyright (C) 2009-2013 Cyril Hrubis <metan@ucw.cz> * * * *****************************************************************************/ /* - - This is header file for public core API. + + Prints GFXprim version. */ -#ifndef GP_CORE_H -#define GP_CORE_H - -/* Common building blocks */ -#include "core/GP_Common.h" - -/* Context ... */ -#include "core/GP_Context.h" - -/* ... and it's trasformations */ -#include "core/GP_Transform.h" - -/* Gamma */ -#include "core/GP_Gamma.h" - -/* Pixeltypes */ -#include "core/GP_Pixel.h" - -/* Pixel conversions */ -#include "core/GP_Convert.h" - -/* Individual pixel access */ -#include "core/GP_GetPutPixel.h" - -/* Writing pixel blocks */ -#include "GP_WritePixel.h" - -/* Blitting */ -#include "core/GP_Blit.h" - -/* Debug and debug level */ -#include "core/GP_Debug.h" - -/* Color */ -#include "core/GP_Color.h" - -/* Progress callback */ -#include "core/GP_ProgressCallback.h" - -/* Threads utils */ -#include "core/GP_Threads.h" +#include <GP.h> -/* Mix Pixel */ -#include "core/GP_MixPixels.h" +int main(void) +{ + printf("GFXprim verson %i.%i.%i (%s)n", + GP_VER_MAJOR, GP_VER_MINOR, GP_VER_MICRO, GP_VER_STR); -#endif /* GP_CORE_H */ + return 0; +} diff --git a/include/core/GP_Core.h b/include/core/GP_Core.h index d10152f..38ee3c3 100644 --- a/include/core/GP_Core.h +++ b/include/core/GP_Core.h @@ -32,6 +32,9 @@ #ifndef GP_CORE_H #define GP_CORE_H +/* Library verson */ +#include "core/GP_Version.h" + /* Common building blocks */ #include "core/GP_Common.h" diff --git a/include/core/GP_Core.h b/include/core/GP_Version.h similarity index 58% copy from include/core/GP_Core.h copy to include/core/GP_Version.h index d10152f..d1dde65 100644 --- a/include/core/GP_Core.h +++ b/include/core/GP_Version.h @@ -16,62 +16,28 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, * * Boston, MA 02110-1301 USA * * * - * Copyright (C) 2009-2010 Jiri "BlueBear" Dluhos * - * <jiri.bluebear.dluhos@gmail.com> * - * * - * Copyright (C) 2009-2010 Cyril Hrubis <metan@ucw.cz> * + * Copyright (C) 2009-2013 Cyril Hrubis <metan@ucw.cz> * * * *****************************************************************************/ -/* - - This is header file for public core API. - - */ - -#ifndef GP_CORE_H -#define GP_CORE_H - -/* Common building blocks */ -#include "core/GP_Common.h" - -/* Context ... */ -#include "core/GP_Context.h" - -/* ... and it's trasformations */ -#include "core/GP_Transform.h" - -/* Gamma */ -#include "core/GP_Gamma.h" - -/* Pixeltypes */ -#include "core/GP_Pixel.h" - -/* Pixel conversions */ -#include "core/GP_Convert.h" - -/* Individual pixel access */ -#include "core/GP_GetPutPixel.h" - -/* Writing pixel blocks */ -#include "GP_WritePixel.h" + /* -/* Blitting */ -#include "core/GP_Blit.h" + Library version. -/* Debug and debug level */ -#include "core/GP_Debug.h" + */ -/* Color */ -#include "core/GP_Color.h" +#ifndef CORE_GP_VERSION_H +#define CORE_GP_VERSION_H -/* Progress callback */ -#include "core/GP_ProgressCallback.h" +#define GP_VER_MAJOR 0 +#define GP_VER_MINOR 0 +#define GP_VER_MICRO 0 -/* Threads utils */ -#include "core/GP_Threads.h" +#define GP_STRX(x) GP_STR(x) +#define GP_STR(x) #x -/* Mix Pixel */ -#include "core/GP_MixPixels.h" +#define GP_VER_STR GP_STRX(GP_VER_MAJOR) "." + GP_STRX(GP_VER_MINOR) "." + GP_STRX(GP_VER_MICRO) -#endif /* GP_CORE_H */ +#endif /* CORE_GP_VERSION_H */ diff --git a/libs/core/GP_Debug.c b/libs/core/GP_Debug.c index db1ed26..89d6047 100644 --- a/libs/core/GP_Debug.c +++ b/libs/core/GP_Debug.c @@ -22,6 +22,7 @@ #include <stdarg.h> +#include "core/GP_Version.h" #include "core/GP_Debug.h" static unsigned int debug_level = GP_DEFAULT_DEBUG_LEVEL; @@ -66,6 +67,8 @@ void GP_DebugPrint(int level, const char *file, const char *function, int line, debug_level); } } + + GP_DEBUG(1, "GFXprim library version " GP_VER_STR); } if (level > (int)debug_level) http://repo.or.cz/w/gfxprim.git/commit/63bd14db7c7715aba8d71d56078a5cbac1507... commit 63bd14db7c7715aba8d71d56078a5cbac1507972 Author: Cyril Hrubis <metan@ucw.cz> Date: Wed May 8 16:56:14 2013 +0200 core: Add default HLine implementation. Fall back to loop with PutPixel if there is no WritePixel for the particular pixel type. Signed-off-by: Cyril Hrubis <metan@ucw.cz> diff --git a/libs/gfx/GP_HLine.gen.c.t b/libs/gfx/GP_HLine.gen.c.t index ce93f98..72f1555 100644 --- a/libs/gfx/GP_HLine.gen.c.t +++ b/libs/gfx/GP_HLine.gen.c.t @@ -34,6 +34,13 @@ #include "gfx/GP_HLine.h" +{# Explicit list of BPP that have optimized write pixel #} +%% set have_writepixels = ['1BPP_LE', '1BPP_BE', + '2BPP_LE', '2BPP_BE', + '4BPP_LE', '4BPP_BE', + '8BPP', '16BPP', + '24BPP', '32BPP'] + %% for ps in pixelsizes void GP_HLine_Raw_{{ ps.suffix }}(GP_Context *context, int x0, int x1, int y, @@ -51,17 +58,22 @@ void GP_HLine_Raw_{{ ps.suffix }}(GP_Context *context, int x0, int x1, int y, x0 = GP_MAX(x0, 0); x1 = GP_MIN(x1, (int) context->w - 1); +%% if ps.suffix in have_writepixels size_t length = 1 + x1 - x0; void *start = GP_PIXEL_ADDR(context, x0, y); -%% if ps.needs_bit_endian() +%% if ps.needs_bit_endian() unsigned int offset = GP_PIXEL_ADDR_OFFSET_{{ ps.suffix }}(x0); GP_WritePixels_{{ ps.suffix }}(start, offset, length, pixel); -%% else +%% else GP_WritePixels_{{ ps.suffix }}(start, length, pixel); -%% endif +%% endif +%% else + for (;x0 <= x1; x0++) + GP_PutPixel_Raw_{{ ps.suffix }}(context, x0, y, pixel); +%% endif } %% endfor ----------------------------------------------------------------------- Summary of changes: demos/c_simple/Makefile | 2 +- .../bogoman_loader.h => c_simple/version.c} | 17 +++++++++--- include/core/GP_Core.h | 3 ++ .../GP_InputDriverKBD.h => core/GP_Version.h} | 27 +++++++++++--------- libs/core/GP_Debug.c | 3 ++ libs/gfx/GP_HLine.gen.c.t | 18 +++++++++++-- libver.mk | 2 +- 7 files changed, 50 insertions(+), 22 deletions(-) copy demos/{bogoman/bogoman_loader.h => c_simple/version.c} (89%) copy include/{input/GP_InputDriverKBD.h => core/GP_Version.h} (81%) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos@gmail.com if you want to unsubscribe, or site admin admin@repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")