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, generate has been updated via 688e786f9814c87a37a3dbb6d2d7e94b8d392674 (commit) from 18183ede44829436ce42ce740974c63fe5f92ac6 (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/688e786f9814c87a37a3dbb6d2d7e94b8d392... commit 688e786f9814c87a37a3dbb6d2d7e94b8d392674 Author: Cyril Hrubis <metan@ucw.cz> Date: Wed Sep 28 17:52:55 2011 +0200 Fix some headers. diff --git a/include/GP.h b/include/GP.h index 2d72546..7310ddc 100644 --- a/include/GP.h +++ b/include/GP.h @@ -44,4 +44,7 @@ /* bitmap loaders */ #include "loaders/GP_Loaders.h" +/* bitmap filters */ +#include "filters/GP_Filters.h" + #endif /* GP_H */ diff --git a/include/core/GP_Blit.h b/include/core/GP_Blit.h index fc2c6a7..3c9ec54 100644 --- a/include/core/GP_Blit.h +++ b/include/core/GP_Blit.h @@ -17,6 +17,7 @@ * Boston, MA 02110-1301 USA * * * * Copyright (C) 2011 Tomas Gavenciak <gavento@ucw.cz> * + * Copyright (C) 2011 Cyril Hrubis <metan@ucw.cz> * * * *****************************************************************************/ @@ -26,8 +27,9 @@ /* Generated header */ #include "GP_Blit.gen.h" -void GP_Blit(const GP_Context *c1, int x1, int y1, int w, int h, - GP_Context *c2, int x2, int y2); +void GP_Blit(const GP_Context *c1, GP_Coord x1, GP_Coord y1, + GP_Size w, GP_Size h, GP_Context *c2, GP_Coord x2, GP_Coord y2); + /* * Very naive blit, no optimalizations whatsoever - keep it that way. diff --git a/include/core/GP_Core.h b/include/core/GP_Core.h index 705ceb3..b080db7 100644 --- a/include/core/GP_Core.h +++ b/include/core/GP_Core.h @@ -50,6 +50,9 @@ /* Individual pixel access */ #include "core/GP_GetPutPixel.h" +/* blitting */ +#include "core/GP_Blit.h" + /* Debug and debug level */ #include "core/GP_Debug.h" diff --git a/include/filters/GP_Filters.h b/include/filters/GP_Filters.h index b09b5d2..4575497 100644 --- a/include/filters/GP_Filters.h +++ b/include/filters/GP_Filters.h @@ -32,8 +32,8 @@ #ifndef GP_FILTERS_H #define GP_FILTERS_H - #include "GP_Rotate.h" +#include "GP_Linear.h" #include "GP_Resize.h" #endif /* GP_FILTERS_H */ diff --git a/include/filters/GP_Resize.h b/include/filters/GP_Resize.h index 4a0f9b6..c475645 100644 --- a/include/filters/GP_Resize.h +++ b/include/filters/GP_Resize.h @@ -33,4 +33,6 @@ GP_Context *GP_ScaleDown(GP_Context *src); +GP_Context *GP_Scale(GP_Context *src, GP_Size w, GP_Size h); + #endif /* GP_RESIZE_H */ diff --git a/libs/SDL/GP_SDL_Context.c b/libs/SDL/GP_SDL_Context.c index 3378d3b..f0a0747 100644 --- a/libs/SDL/GP_SDL_Context.c +++ b/libs/SDL/GP_SDL_Context.c @@ -23,7 +23,7 @@ * * *****************************************************************************/ -#include "GP.h" +#include "GP_Core.h" #include "GP_SDL.h" GP_RetCode GP_SDL_ContextFromSurface(GP_Context *context, SDL_Surface *surf) diff --git a/libs/SDL/Makefile b/libs/SDL/Makefile index 6d06e7c..5ce0549 100644 --- a/libs/SDL/Makefile +++ b/libs/SDL/Makefile @@ -1,5 +1,6 @@ TOPDIR=../.. CSOURCES=$(shell ls *.c) +INCLUDE=core LIBNAME=SDL BUILDLIB=yes include $(TOPDIR)/include.mk diff --git a/libs/core/GP_Blit.c b/libs/core/GP_Blit.c index 11ed746..ced7d54 100644 --- a/libs/core/GP_Blit.c +++ b/libs/core/GP_Blit.c @@ -17,6 +17,7 @@ * Boston, MA 02110-1301 USA * * * * Copyright (C) 2011 Tomas Gavenciak <gavento@ucw.cz> * + * Copyright (C) 2011 Cyril Hrubis <metan@ucw.cz> * * * *****************************************************************************/ @@ -26,14 +27,12 @@ #include "GP_Convert.h" #include "GP_Blit.h" -/* -void GP_Blit(const GP_Context *c1, int x1, int y1, int w, int h, - GP_Context *c2, int x2, int y2) +void GP_Blit(const GP_Context *c1, GP_Coord x1, GP_Coord y1, + GP_Size w, GP_Size h, GP_Context *c2, GP_Coord x2, GP_Coord y2) { // Ultimate TODO: effective processing GP_Blit_Naive(c1, x1, y1, w, h, c2, x2, y2); } -*/ // TODO(gavento, czech) Plan: // GP_Blit_Naive - Zadne rotovani a tak, jen Get/PutPixel a konverze A->RGBA8888->B diff --git a/tests/SDL/blittest.c b/tests/SDL/blittest.c index 1f77533..a62d381 100644 --- a/tests/SDL/blittest.c +++ b/tests/SDL/blittest.c @@ -86,7 +86,7 @@ void redraw_screen(void) SDL_LockSurface(display); GP_Text(&context, NULL, 20, 20, GP_ALIGN_RIGHT|GP_VALIGN_BOTTOM, text_buf, white); - GP_Blit_Naive(bitmap, 0, 0, bitmap->w, bitmap->h, &context, bitmap_x, bitmap_y); + GP_Blit(bitmap, 0, 0, bitmap->w, bitmap->h, &context, bitmap_x, bitmap_y); SDL_UpdateRect(display, bitmap_x, bitmap_y, bitmap->w, bitmap->h); SDL_UpdateRect(display, 20, 20, 300, 50); diff --git a/tests/SDL/showimage.c b/tests/SDL/showimage.c index 937296d..b043b72 100644 --- a/tests/SDL/showimage.c +++ b/tests/SDL/showimage.c @@ -54,7 +54,7 @@ void event_loop(void) printf("brightness = %i %ux%un", brightness, res->w, res->h); - GP_Blit_Naive(res, 0, 0, res->w, res->h, &context, 0, 0); + GP_Blit(res, 0, 0, res->w, res->h, &context, 0, 0); SDL_Flip(display); GP_ContextFree(res); break; @@ -112,7 +112,7 @@ int main(int argc, char *argv[]) GP_SDL_ContextFromSurface(&context, display); - GP_Blit_Naive(bitmap, 0, 0, bitmap->w, bitmap->h, &context, 0, 0); + GP_Blit(bitmap, 0, 0, bitmap->w, bitmap->h, &context, 0, 0); SDL_Flip(display); event_loop(); ----------------------------------------------------------------------- Summary of changes: include/GP.h | 3 +++ include/core/GP_Blit.h | 6 ++++-- include/core/GP_Core.h | 3 +++ include/filters/GP_Filters.h | 2 +- include/filters/GP_Resize.h | 2 ++ libs/SDL/GP_SDL_Context.c | 2 +- libs/SDL/Makefile | 1 + libs/core/GP_Blit.c | 7 +++---- tests/SDL/blittest.c | 2 +- tests/SDL/showimage.c | 4 ++-- 10 files changed, 21 insertions(+), 11 deletions(-) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos@gmail.com if you want to unsubscribe, or site admin admin@repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")