Gfxprim May 2012

gfxprim@ucw.cz

2 participants
55 discussions

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

13 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 cfc171705f4af25d48d768ed3b5e89e1ef668393 (commit) from 33a4746b83e0cebb41776cc50b9d44a5c31a06fd (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/cfc171705f4af25d48d768ed3b5e89e1ef66… commit cfc171705f4af25d48d768ed3b5e89e1ef668393 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun May 13 16:14:02 2012 +0200 doc: Used spell checker to fix typos. diff --git a/doc/backends.txt b/doc/backends.txt index ced9548..2a614ff 100644 --- a/doc/backends.txt +++ b/doc/backends.txt @@ -3,14 +3,14 @@ Drawing Backends Drawing backends provide means to draw into computer screen or into an window inside of running operating system. Instead of having one unified -initalization interface each backend has it's specific function and sematics -but once backend is initalized the backend structure provides unified API for -controling the drawing. +initialization interface each backend has it's specific function and semantics +but once backend is initialized the backend structure provides unified API for +controlling the drawing. -So far there are three backends implemented, linux mmaped framebuffer, libSDL +So far there are three backends implemented, Linux mmaped frame-buffer, libSDL and X11 backend. -Initalization functions +Initialization functions ~~~~~~~~~~~~~~~~~~~~~~~ [source,c] @@ -18,12 +18,12 @@ Initalization functions GP_Backend *GP_BackendLinuxFBInit(const char *path); ------------------------------------------------------------------------------- -Initalizes mmaped framebuffer backend. The path is path to the framebuffer -device ie. '/dev/fbX'. This backend is not buffered, everything you draw -appears on the screen right away (an swich may be added for that purpose). +Initializes mmaped frame-buffer backend. The path is path to the frame-buffer +device i.e. '/dev/fbX'. This backend is not buffered, everything you draw +appears on the screen right away (an switch may be added for that purpose). -Also note that this backend doesn't initalize any input driver. You need to -initalize input driver in order to get keystrokes and/or pointer events. +Also note that this backend doesn't initialize any input driver. You need to +initialize input driver in order to get keystrokes and/or pointer events. [source,c] @@ -38,15 +38,15 @@ GP_Backend *GP_BackendSDLInit(GP_Size w, GP_Size h, const char *caption); ------------------------------------------------------------------------------- -Initalize SDL as an backend driver. The backend is thread safe as all the -operations are guarded by locks. You can't initalize more than one backend at a -time, that is inherited SDL limiation. If you call the initalizaiton for a -second time, you will get a pointer to allready running backend. This driver +Initialize SDL as an backend driver. The backend is thread safe as all the +operations are guarded by locks. You can't initialize more than one backend at a +time, that is inherited SDL limitation. If you call the initialization for a +second time, you will get a pointer to already running backend. This driver feeds input events into global input event queue (see input docs for details). If w, h and/or bpp are zero SDL tries to do a guess, most of the time wrong for w and h though. The caption is window caption and may be ignored for some of -the backends. And finally flags may change the SDL to go to fullscreen mode or -make the window resizeable. +the backends. And finally flags may change the SDL to go to full-screen mode or +make the window resizable. [source,c] ------------------------------------------------------------------------------- @@ -65,7 +65,7 @@ windows at a time. Overall init function ~~~~~~~~~~~~~~~~~~~~~ -Althoug there is no unified backend initalization, there is something close to +Although there is no unified backend initialization, there is something close to it. [source,c] @@ -76,23 +76,23 @@ GP_Backend *GP_BackendInit(const char *params, const char *caption, FILE *help); ------------------------------------------------------------------------------- This function takes a params string as an parameter which is used for -determining backend-dependend parametrs. The format is +determining backend-dependent parameters. The format is 'backend_name:backend_parameters' where backend parameters may be window size (either 'WxH' or 'FS' in case of SDL backend). The caption is window caption (which is ignored in some of the cases) and the 'FILE' is file, where an error is printed in case of failure, you should mostly use 'stderr' for that purpose. If params is set to 'NULL' the the call only prints help into the -passed help 'FILE'. If intitalizaton was succesfull pointer to allocated and -initalized backend is returned otherwise 'NULL' is returned and some helpful -infomation should be printed into the passed help 'FILE'. +passed help 'FILE'. If initialization was successful pointer to allocated and +initialized backend is returned otherwise 'NULL' is returned and some helpful +information should be printed into the passed help 'FILE'. Drawing Backend API ~~~~~~~~~~~~~~~~~~~ The drawing backend API consist of structure with callbacks. Every backend -initalization yields pointer to this structure. Although is possible to call -these pointers directly it's not recomended and everbody should rather use +initialization yields pointer to this structure. Although is possible to call +these pointers directly it's not recommended and everybody should rather use backend inline functions instead. The backend API consist of several functions: @@ -109,7 +109,7 @@ Calls an backend exit callback. GP_BackendFlip(GP_Backend *backend); ------------------------------------------------------------------------------- -Flips a screen. Updates rect for a buffered backends. +Flips a screen. Updates rectangle for a buffered backends. [source,c] ------------------------------------------------------------------------------- @@ -127,4 +127,4 @@ void GP_BackendPoll(GP_Backend *backend); Polls for backend events. For backends that do not expose file descriptor (namely SDL) this should be called repeatedly. For other backend it may be -called either repeatedly or when data are ready on filedescriptor. +called either repeatedly or when data are ready on file-descriptor. diff --git a/doc/context.txt b/doc/context.txt index 00c6c08..809f995 100644 --- a/doc/context.txt +++ b/doc/context.txt @@ -54,7 +54,7 @@ you could use variants with _Raw suffix (although this is not recommended). There are various helper macros for transforming coordinates and sizes in 'core/GP_Transform.h'. And context helper functions to "rotate" the flags clock wise and counter clock wise as well as functions to get the context size -when taking into the accout the widht and height. +when taking into the account the width and height. [source,c] ------------------------------------------------------------------------------- @@ -108,7 +108,7 @@ void GP_ContextInit(GP_Context *context, GP_Size w, GP_Size h, GP_PixelType type, void *pixels); ------------------------------------------------------------------------------- -Initalize given context accordingly to parameters, the rest of context +Initialize given context accordingly to parameters, the rest of context parameters are set to the default values (i.e. rotation flags are all set to zero, 'free_pixels' flag is not set). Number of bits per pixel and bytes per row are computed from the given pixel type and size. @@ -125,7 +125,7 @@ will *not* try to allocate the pixel memory automatically). GP_Context *GP_ContextAlloc(GP_Size w, GP_Size h, GP_PixelType type); ------------------------------------------------------------------------------- -The 'GP_ContextAlloc()' allocates and initalizes a context. +The 'GP_ContextAlloc()' allocates and initializes a context. The orientation flags are all set to zero, the 'free_pixels' flag is set and the rest of the metadata are calculated accordingly to width, height and @@ -141,7 +141,7 @@ appropriate size; the initial contents of the bitmap are undefined. GP_Context *GP_ContextCopy(const GP_Context *src, int flag); ------------------------------------------------------------------------------- -The 'GP_ContextCopy()' allocates and initalizes a copy of the context passed +The 'GP_ContextCopy()' allocates and initializes a copy of the context passed as argument. If 'flag' is set, the bitmap contents ('src->pixels') are also copied; otherwise the copy will have the same dimensions but undefined contents. diff --git a/doc/drawing_api.txt b/doc/drawing_api.txt index d836680..a7f65c9 100644 --- a/doc/drawing_api.txt +++ b/doc/drawing_api.txt @@ -292,6 +292,6 @@ The Descent is the height in pixels from baseline to the bottom. unsigned int GP_TextHeight(const GP_TextStyle *style); -------------------------------------------------------------------------------- -The Height is size of the font from top to the bottom, eg. equals exactly to +The Height is size of the font from top to the bottom, i.e. equals exactly to the sum of ascent and descent. diff --git a/doc/filters.txt b/doc/filters.txt index 6750a70..a2647b7 100644 --- a/doc/filters.txt +++ b/doc/filters.txt @@ -25,7 +25,7 @@ type and the context size must be big enough to store the result. For filters that work 'in-place' (which is explicitly said for each filter) the source and the destination could be the same context. Note that this is -not expected to work if you do several overlaping subcontexts and pass these +not expected to work if you do several overlapping subcontexts and pass these as arguments. When 'NULL' is passed as destination new context for storing the result is @@ -38,7 +38,7 @@ pixel_type, parameters, etc... [source,c] ------------------------------------------------------------------------------- /* - * Filter common api. + * Filter common API. */ GP_Context *GP_FilterFoo(const GP_Context *src, GP_Context *dst, foo params ..., @@ -69,7 +69,7 @@ Point operation filters Point operations are filters that works with pixels as with independent values (the value of destination pixel depends only on the pixel on the same -coodrdinates in source image). All of these filters works 'in-place' and the +coordinates in source image). All of these filters works 'in-place' and the result has always the same size as the source. [source,c] @@ -90,7 +90,7 @@ GP_Context *GP_FilterContrast(const GP_Context *src, GP_Context *dst, float mul, GP_ProgressCallback *callback); ------------------------------------------------------------------------------- -Constrast filter, multiplies all pixel channels by a fixed value. +Contrast filter, multiplies all pixel channels by a fixed value. [source,c] ------------------------------------------------------------------------------- @@ -149,7 +149,7 @@ Rotate context by 90 degrees. Doesn't work 'in-place' (yet). The destination has to have the same pixel type and destination size must be -big enough to fit rotated context (eg. W and H are swapped). +big enough to fit rotated context (i.e. W and H are swapped). [source,c] ------------------------------------------------------------------------------- @@ -178,7 +178,7 @@ Rotate context by 270 degrees. Doesn't work 'in-place' (yet). -The destinatoin has to have the same pixel type and destination size must be +The destination has to have the same pixel type and destination size must be big enough to fit rotated context (eg. W and H are swapped). [source,c] @@ -253,14 +253,14 @@ Nearest Neighbour Interpolation ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Fast, but produces "pixelated" images. May however work better for images with -sharp edges mostly consisting of big one colour regions (it doesn't blur the +sharp edges mostly consisting of big one color regions (it doesn't blur the result on upscaling). Bicubic Interpolation ^^^^^^^^^^^^^^^^^^^^^ Works well as is on image upscaling. To get decent result on downscaling -low-pass filter (gaussian blur) must be used on original image before actuall +low-pass filter (Gaussian blur) must be used on original image before actual downscaling. To do this reasonably fast we could cheat a little: first resize big images a little without the low-pass filter, then apply low-pass filter and finally downscale it to desired size. diff --git a/doc/general.txt b/doc/general.txt index 96310bb..d71ec1f 100644 --- a/doc/general.txt +++ b/doc/general.txt @@ -22,7 +22,7 @@ Graphics Rendering ** PutPixel/GetPixel ** Lines ** Circles -** Elipses +** Ellipses ** Polygons * Text Drawing @@ -30,7 +30,7 @@ Graphics Rendering ** Basic fonts are compiled in the library ** Font rendering can be altered by style attributes ** Supports, for example, pixel multiplication and tracking -** Includes basic suppport for freetype +** Includes basic support for freetype * Bitmaps and Blitting ** Create, Destroy bitmap @@ -44,7 +44,7 @@ Graphics Rendering ** Read support for GIF * Graphic backed input event handling -** Linux Framebuffer +** Linux Frame-buffer ** SDL support ** Experimental X11 support @@ -60,7 +60,7 @@ Bitmap Filters ** Separable Convolution ** General Convolution -* Arihtmetics filters +* Arithmetics filters ** Addition ** Multiplication ** Difference diff --git a/doc/loaders.txt b/doc/loaders.txt index 72aae8c..0f31498 100644 --- a/doc/loaders.txt +++ b/doc/loaders.txt @@ -9,7 +9,7 @@ a failure 'NULL' is returned and 'errno' is set. The possible errno values are: * anything returned by fopen(), fclose(), fseek(), ... -* 'ENOSYS' if library wasn't compiled with particual library support +* 'ENOSYS' if library wasn't compiled with particular library support * 'ENOMEM' as returned by malloc() * 'EIO'/'EILSEQ' invalid image data * 'ECANCELED' loading canceled from callback @@ -27,7 +27,7 @@ GP_Context *GP_LoadImage(const char *src_path, GP_ProgressCallback *callback); ------------------------------------------------------------------------------- Loads image from a file. The format is now matched by an image file extension. -File sinature loading method is on the TODO. +File signature loading method is on the TODO. [source,c] ------------------------------------------------------------------------------- @@ -40,16 +40,17 @@ int GP_SaveImage(GP_Context *src, const char *dst_path, ------------------------------------------------------------------------------- Saves a context into a file. The file format is matched accordingly to the -file extension, if extension is invalid or if support for request image format -wasn't compiled in, non-zero is returned and 'errno' is set to 'ENOSYS'. +file extension, if extension is invalid or if support for requested image +format wasn't compiled in, non-zero is returned and 'errno' is set to +'ENOSYS'. -Returns zero on succes and non-zero on failure and 'errno' is set. The +Returns zero on success and non-zero on failure and 'errno' is set. The possible errno values are 'ENOSYS' for unknown format and anything that could be returned by 'fopen()', 'open()', 'fwrite()', 'write()', 'seek()', etc... PNG ~~~ -The 'PNG' loading support is optionaly implemented by libpng. +The 'PNG' loading support is optionally implemented by libpng. Just now, the 'PNG' support is not fully finished. Images with alpha channel are not supported yet. @@ -65,7 +66,7 @@ int GP_OpenPNG(const char *src_path, FILE **f); Opens file and checks for 'PNG' signature. Returns zero on success (file could be opened, signature matches), the opened file is returned and the file -possition points right after the end of the 'PNG' signature. +position points right after the end of the 'PNG' signature. Upon failure 'errno' is filled. @@ -81,7 +82,7 @@ GP_Context *GP_ReadPNG(FILE *f, GP_ProgressCallback *callback); ------------------------------------------------------------------------------- Loads 'PNG' file into context the file pointer must point to the start of the -'PNG' data stream (eg. should point right after the signature). The context, +'PNG' data stream (i.e. should point right after the signature). The context, to store the image to, is allocated. The loading process could by aborted by a callback, in such case all memory is freed. @@ -94,7 +95,7 @@ callback, in such case all memory is freed. GP_Context *GP_LoadPNG(const char *src_path, GP_ProgressCallback *callback); ------------------------------------------------------------------------------- -Same as abowe but takes path to the file as a parameter and check for the +Same as above but takes path to the file as a parameter and check for the signature. Basically this combines both of the calls above. [source,c] @@ -117,7 +118,7 @@ returned and 'errno' is set to 'ENOSYS'. JPEG ~~~~ -The 'JPEG' loading support is optionaly implemented by jpeg library. +The 'JPEG' loading support is optionally implemented by jpeg library. [source,c] ------------------------------------------------------------------------------- @@ -130,7 +131,7 @@ int GP_OpenJPG(const char *src_path, FILE **f); Opens file and checks for 'JPG' signature upon successful return (file could be opened, signature matches), the opened file is returned and the file -possition points right after the end of the 'JPG' signature. +position points right after the end of the 'JPG' signature. This function is semi-internal, you should rather use functions listed below. @@ -147,7 +148,7 @@ GP_Context *GP_ReadJPG(FILE *f, GP_ProgressCallback *callback); ------------------------------------------------------------------------------- Loads 'JPG' file into context the file pointer must point to the start of the -'JPG' data stream (eg. should point right after the signature). The context, +'JPG' data stream (i.e. should point right after the signature). The context, to store the image to, is allocated. The loading process could by aborted by a callback, in such case all memory is freed and the call returns 'NULL' and 'errno' is set to 'ECANCELED'. @@ -161,7 +162,7 @@ callback, in such case all memory is freed and the call returns 'NULL' and GP_Context *GP_LoadJPG(const char *src_path, GP_ProgressCallback *callback); ------------------------------------------------------------------------------- -Same as abowe but takes path to the file as a parameter and check for the +Same as above but takes path to the file as a parameter and check for the signature. Basically this combines both of the calls above. [source,c] @@ -179,12 +180,12 @@ is closed and removed before the call returns non-zero and 'errno' is set to 'ECANCELED'. The 'JPG' format could store either 'G8' or 'RGB888' pixeltypes and you must -convert the context into one of them before this fucntions is called. +convert the context into one of them before this functions is called. GIF ~~~ -The 'GIF' format is supported optionaly by giflib library. +The 'GIF' format is supported optionally by giflib library. [source,c] ------------------------------------------------------------------------------- @@ -227,7 +228,7 @@ Currently this function loads only first image from the gif container. GP_Context *GP_LoadGIF(const char *src_path, GP_ProgressCallback *callback); ------------------------------------------------------------------------------- -Same as abowe but takes path to the file as a parameter and check for the +Same as above but takes path to the file as a parameter and check for the signature. Basically this combines both of the calls above. BMP @@ -248,7 +249,7 @@ int GP_OpenBMP(const char *src_path, FILE **f, Opens file and checks for 'BMP' signature upon successful return (file could be opened, signature matches) zero is returned and the parameters, if -non-'NULL', are initalized. Upon failure non-zero is returned and 'errno' is +non-'NULL', are initialized. Upon failure non-zero is returned and 'errno' is set. This function is semi-internal, you should rather use functions listed below. @@ -278,7 +279,7 @@ Currently this function loads only first image from the 'GIF' container. GP_Context *GP_LoadBMP(const char *src_path, GP_ProgressCallback *callback); ------------------------------------------------------------------------------- -Same as abowe but takes path to the file as a parameter and check for the +Same as above but takes path to the file as a parameter and check for the signature. Basically this combines both of the calls above. PBM, PGM, PPM diff --git a/doc/pixel_types.txt b/doc/pixel_types.txt index bf5acd8..b54ad7a 100644 --- a/doc/pixel_types.txt +++ b/doc/pixel_types.txt @@ -2,10 +2,10 @@ Supported pixel sizes --------------------- The default maximum size of a single pixel is 32 bits. The limitations would -be analoguous for other settings (8, 16 and 64). +be analogous for other settings (8, 16 and 64). Pixel sizes 8, 16 and 32 are supported on all systems and generally very efficient -(assigment is used for all operations). 24 bpp is supported, but the operations may be +(assignment is used for all operations). 24 bpp is supported, but the operations may be slightly slower. Pixel sizes 1, 2 and 4 depend on bit-endian setting and are supported on all systems. @@ -19,7 +19,7 @@ to decode/encode. Pixel sizes between 25 and 31 are not supported at all, as these pixels might not fit into a 32-bit byte-aligned window. -The pixel sizes to be supported must be explicitely listed in the configuration file, +The pixel sizes to be supported must be explicitly listed in the configuration file, each including the bit-endian if required (see below). Supported pixel types ----------------------------------------------------------------------- Summary of changes: doc/backends.txt | 50 +++++++++++++++++++++++++------------------------- doc/context.txt | 8 ++++---- doc/drawing_api.txt | 2 +- doc/filters.txt | 16 ++++++++-------- doc/general.txt | 8 ++++---- doc/loaders.txt | 37 +++++++++++++++++++------------------ doc/pixel_types.txt | 6 +++--- 7 files changed, 64 insertions(+), 63 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: 33a4746b83e0cebb41776cc50b9d44a5c31a06fd
by metan 13 May '12

13 May '12

1 0

[repo.or.cz] gfxprim.git branch master updated: 16abe6513b0fa77891c43da149b891edea2a912b
by metan 13 May '12

13 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 16abe6513b0fa77891c43da149b891edea2a912b (commit) via f966f16f2202d808c1286a6e06b4d6c182741986 (commit) from 5da172bec1439fa9219e02da0f1e68383d56caad (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/16abe6513b0fa77891c43da149b891edea2a… commit 16abe6513b0fa77891c43da149b891edea2a912b Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun May 13 13:47:45 2012 +0200 doc: Fix typo. diff --git a/doc/context.txt b/doc/context.txt index 294d026..00c6c08 100644 --- a/doc/context.txt +++ b/doc/context.txt @@ -203,6 +203,6 @@ GP_Context *GP_ContextConvert(const GP_Context *src, GP_Context *dst, Provides basic context conversion functionality. A newly allocated context is returned. -This fuction does no error distribution, it only multiplies or rounds the pixel +This function does no error distribution, it only multiplies or rounds the pixel values. If you need something better use Floyd Steinberg dithering instead. http://repo.or.cz/w/gfxprim.git/commit/f966f16f2202d808c1286a6e06b4d6c18274… commit f966f16f2202d808c1286a6e06b4d6c182741986 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun May 13 13:47:13 2012 +0200 backends: GP_BackendInit() Add default size for X11. diff --git a/libs/backends/GP_BackendInit.c b/libs/backends/GP_BackendInit.c index fb49b92..b00fd10 100644 --- a/libs/backends/GP_BackendInit.c +++ b/libs/backends/GP_BackendInit.c @@ -140,9 +140,13 @@ static void backend_x11_help(FILE *help, const char *err) static GP_Backend *backend_x11_init(char *params, const char *caption, FILE *help) { - unsigned int w, h, n; + unsigned int n, w = 640, h = 480; - if (sscanf(params, "%u%*[xX]%u%n", &w, &h, &n) == 2 && n == strlen(params)) + if (params == NULL) + return GP_BackendX11Init(NULL, 0, 0, w, h, caption); + + if (sscanf(params, "%u%*[xX]%u%n", &w, &h, &n) == 2 && + n == strlen(params)) return GP_BackendX11Init(NULL, 0, 0, w, h, caption); backend_x11_help(help, "X11: Invalid parameters"); ----------------------------------------------------------------------- Summary of changes: doc/context.txt | 2 +- libs/backends/GP_BackendInit.c | 8 ++++++-- 2 files changed, 7 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: 5da172bec1439fa9219e02da0f1e68383d56caad
by metan 12 May '12

12 May '12

1 0

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

12 May '12

1 0

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

12 May '12

1 0

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

12 May '12

1 0

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

12 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 790d61419cab392ce0c0b2468bf43f2c554c666b (commit) via 853705c02b23d77e8d9c973224e66d59ab4637d9 (commit) via 0efc7277bb74f43e38de741c7af24174f45b8820 (commit) from 263af6f5f591eda466248479aade49b8c3b27f29 (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/790d61419cab392ce0c0b2468bf43f2c554c… commit 790d61419cab392ce0c0b2468bf43f2c554c666b Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat May 12 14:18:25 2012 +0200 doc: Add gfx example. diff --git a/doc/examples.txt b/doc/examples.txt index 053b3c6..5c426f0 100644 --- a/doc/examples.txt +++ b/doc/examples.txt @@ -31,6 +31,20 @@ Example in Python include::../demos/py_simple/loaders_example.py[] ------------------------------------------------------------------ +GFX Examples +------------ + +Drawing Lines +~~~~~~~~~~~~~ + +Example in C +^^^^^^^^^^^^ + +[source,c] +------------------------------------------------------------------ +include::../demos/c_simple/gfx_koch.c[] +------------------------------------------------------------------ + Filters ------- http://repo.or.cz/w/gfxprim.git/commit/853705c02b23d77e8d9c973224e66d59ab46… commit 853705c02b23d77e8d9c973224e66d59ab4637d9 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat May 12 14:17:14 2012 +0200 examples: Fix loaders return value. diff --git a/demos/c_simple/loaders.c b/demos/c_simple/loaders.c index 1446d52..8239b90 100644 --- a/demos/c_simple/loaders.c +++ b/demos/c_simple/loaders.c @@ -60,7 +60,7 @@ int main(int argc, char *argv[]) if (argc != 2) { fprintf(stderr, "Takes an image as an parametern"); - return 0; + return 1; } priv.op = "Loading"; diff --git a/demos/c_simple/loaders_example.c b/demos/c_simple/loaders_example.c index ab0b5b4..76ffe07 100644 --- a/demos/c_simple/loaders_example.c +++ b/demos/c_simple/loaders_example.c @@ -41,7 +41,7 @@ int main(int argc, char *argv[]) if (argc != 2) { fprintf(stderr, "Takes an image as an parametern"); - return 0; + return 1; } img = GP_LoadImage(argv[1], NULL); http://repo.or.cz/w/gfxprim.git/commit/0efc7277bb74f43e38de741c7af24174f45b… commit 0efc7277bb74f43e38de741c7af24174f45b8820 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat May 12 14:04:44 2012 +0200 examples: Add simple gfx C example. diff --git a/demos/c_simple/Makefile b/demos/c_simple/Makefile index de507b3..323ae99 100644 --- a/demos/c_simple/Makefile +++ b/demos/c_simple/Makefile @@ -5,7 +5,7 @@ CSOURCES=$(shell echo *.c) INCLUDE= LDLIBS+=-lGP -lGP_backends -lSDL -L$(TOPDIR)/build/ -APPS=backend_example loaders_example loaders filters_symmetry +APPS=backend_example loaders_example loaders filters_symmetry gfx_koch include $(TOPDIR)/pre.mk include $(TOPDIR)/app.mk diff --git a/demos/c_simple/gfx_koch.c b/demos/c_simple/gfx_koch.c new file mode 100644 index 0000000..dda5e80 --- /dev/null +++ b/demos/c_simple/gfx_koch.c @@ -0,0 +1,135 @@ +/***************************************************************************** + * 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> * + * * + *****************************************************************************/ + + /* + + Simple GFX Example. + + */ + +#include <stdio.h> +#include <string.h> +#include <errno.h> + +#include <GP.h> + +/* Set to 1 to use Anti Aliased drawing */ +static int aa_flag = 0; + +/* + * Generate color depending on distance from center + * + * We could do this only and only because the context + * pixel type is fixed to GP_PIXEL_RGB888. + */ +static GP_Pixel do_color(int xc, int yc, float x, float y) +{ + float dx = GP_ABS(1.00 * xc - x)/(2*xc); + float dy = GP_ABS(1.00 * yc - y)/(2*yc); + + float dc = sqrt(dx*dx + dy*dy); + + int rmask = 0; + int gmask = 0xff * sqrt(dc); + int bmask = 0xff * (1 - dc); + + if (dc < 0.1) { + rmask = 0xff * (1 - dc); + bmask = 0x00; + } + + if (dc > 0.55) { + rmask = 0xff * dc; + gmask /= 6; + bmask = 0x00; + } + + return bmask | (gmask<<8) | (rmask << 16); +} + +static void draw(GP_Context *img, int level, float x0, float y0, float x1, float y1) +{ + if (level == 0) { + GP_Pixel pixel; + + pixel = do_color(img->w/2, img->h/2, 1.00 * (x0+x1)/2, 1.00 * (y0 + y1)/2); + + if (aa_flag) + GP_LineAA(img, x0 * 256, y0 * 256, x1 * 256, y1 * 256, pixel); + else + GP_Line(img, x0, y0, x1, y1, pixel); + + return; + } + + /* Compute varation of Koch curve */ + float x34 = (x0 + 3 * x1) / 4; + float y34 = (y0 + 3 * y1) / 4; + + float x14 = (3 * x0 + x1) / 4; + float y14 = (3 * y0 + y1) / 4; + + float x12 = (x0 + x1)/2; + float y12 = (y0 + y1)/2; + + float dx = (x1 - x0)/4; + float dy = (y1 - y0)/4; + + draw(img, level - 1, x0, y0, x14, y14); + draw(img, level - 1, x14, y14, x14 - dy, y14 + dx); + draw(img, level - 1, x14 - dy, y14 + dx, x12 - dy, y12 + dx); + draw(img, level - 1, x12 - dy, y12 + dx, x12, y12); + draw(img, level - 1, x12, y12, x12 + dy, y12 - dx); + draw(img, level - 1, x12 + dy, y12 - dx, x34 + dy, y34 - dx); + draw(img, level - 1, x34 + dy, y34 - dx, x34, y34); + draw(img, level - 1, x1, y1, x34, y34); +} + +int main(void) +{ + GP_Context *img; + + /* Create RGB 24 bit image */ + img = GP_ContextAlloc(600, 600, GP_PIXEL_RGB888); + + if (img == NULL) { + fprintf(stderr, "Failed to allocate context"); + return 1; + } + + /* Clean up the bitmap */ + GP_Fill(img, 0); + + /* Draw a fractal */ + draw(img, 4, 0, 0, img->w - 1, img->h - 1); + draw(img, 4, 0, img->h - 1, img->w - 1, 0); + + if (GP_SavePNG(img, "out.png", NULL)) { + fprintf(stderr, "Failed to save image %s", strerror(errno)); + return 1; + } + + /* Cleanup */ + GP_ContextFree(img); + + return 0; +} ----------------------------------------------------------------------- Summary of changes: demos/c_simple/Makefile | 2 +- demos/c_simple/gfx_koch.c | 135 ++++++++++++++++++++++++++++++++++++++ demos/c_simple/loaders.c | 2 +- demos/c_simple/loaders_example.c | 2 +- doc/examples.txt | 14 ++++ 5 files changed, 152 insertions(+), 3 deletions(-) create mode 100644 demos/c_simple/gfx_koch.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: 263af6f5f591eda466248479aade49b8c3b27f29
by metan 12 May '12

12 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 263af6f5f591eda466248479aade49b8c3b27f29 (commit) via 22558f86de3b76b3a9262ee5df3f8802b4c38f88 (commit) via 59c8a325a33dcdbb0afdeb0f08b33e7359246d55 (commit) from 7f40abdf975259a1285023927c27a9fe4c394bbd (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/263af6f5f591eda466248479aade49b8c3b2… commit 263af6f5f591eda466248479aade49b8c3b27f29 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat May 12 00:52:53 2012 +0200 examples: python: Fix image saving usage. diff --git a/demos/py_simple/loaders_example.py b/demos/py_simple/loaders_example.py index 3cebc4d..c9db630 100755 --- a/demos/py_simple/loaders_example.py +++ b/demos/py_simple/loaders_example.py @@ -1,4 +1,5 @@ #!/usr/bin/env python + import sys import gfxprim.core as core @@ -12,7 +13,7 @@ def main(): # Load Image img = loaders.LoadImage(sys.argv[1], None) # Save result - loaders.SavePNG("out.png", img, None) + img.Save("out.png"); if __name__ == '__main__': main() diff --git a/demos/py_simple/rotate90.py b/demos/py_simple/rotate90.py index d14022d..d93756b 100755 --- a/demos/py_simple/rotate90.py +++ b/demos/py_simple/rotate90.py @@ -18,7 +18,7 @@ def main(): # Rotate by 90 degrees res = filters.FilterRotate90Alloc(src, None) # Save Image - loaders.SaveImage(res, sys.argv[2], None); + res.Save(sys.argv[2]) if __name__ == '__main__': main() http://repo.or.cz/w/gfxprim.git/commit/22558f86de3b76b3a9262ee5df3f8802b4c3… commit 22558f86de3b76b3a9262ee5df3f8802b4c38f88 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat May 12 00:51:30 2012 +0200 pywrap: Fix the loaders extend context after API change. diff --git a/pylib/gfxprim/loaders/_extend_context.py b/pylib/gfxprim/loaders/_extend_context.py index 5e0b8c4..e252b4b 100644 --- a/pylib/gfxprim/loaders/_extend_context.py +++ b/pylib/gfxprim/loaders/_extend_context.py @@ -15,7 +15,7 @@ def extend_context(_context): return c @extend(_context) - def Save(self, filename, format=None): + def Save(self, filename, format=None, callback=None): """Save the image in given format (or guess it from the extension) Currently, JPG, PNG and P[BGP]M are supported, but not for all @@ -25,15 +25,15 @@ def extend_context(_context): format = filename.rsplit('.', 1)[-1] format = format.lower() if format == 'jpg': - res = loaders_c.GP_SaveJPG(filename, self, None) + res = loaders_c.GP_SaveJPG(self, filename, callback) elif format == 'png': - res = loaders_c.GP_SavePNG(filename, self, None) + res = loaders_c.GP_SavePNG(self, filename, callback) elif format == 'pbm': - res = loaders_c.GP_SavePBM(filename, self, None) + res = loaders_c.GP_SavePBM(filename, self, callback) elif format == 'pgm': - res = loaders_c.GP_SavePGM(filename, self, None) + res = loaders_c.GP_SavePGM(filename, self, callback) elif format == 'ppm': - res = loaders_c.GP_SavePPM(filename, self, None) + res = loaders_c.GP_SavePPM(filename, self, callback) else: raise Exception("Format %r not supported.", format) if res != 0: http://repo.or.cz/w/gfxprim.git/commit/59c8a325a33dcdbb0afdeb0f08b33e735924… commit 59c8a325a33dcdbb0afdeb0f08b33e7359246d55 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat May 12 00:41:21 2012 +0200 pywrap: Update _extend_backend.py. diff --git a/pylib/gfxprim/backends/_extend_backend.py b/pylib/gfxprim/backends/_extend_backend.py index 2f739fc..31c56ef 100644 --- a/pylib/gfxprim/backends/_extend_backend.py +++ b/pylib/gfxprim/backends/_extend_backend.py @@ -28,3 +28,12 @@ def extend_backend(_backend): "Poll the backend for events." return backends_c.GP_BackendPoll(self) + @extend(_backend) + def SetCaption(self, caption): + "Set backend window caption (if possible)" + return backends_c.GP_BackendSetCaption(self, caption) + + @extend(_backend) + def Resize(self, w, h): + "Resize backend window (if possible)" + return backends_c.GP_BackendResize(self, w, h) ----------------------------------------------------------------------- Summary of changes: demos/py_simple/loaders_example.py | 3 ++- demos/py_simple/rotate90.py | 2 +- pylib/gfxprim/backends/_extend_backend.py | 9 +++++++++ pylib/gfxprim/loaders/_extend_context.py | 12 ++++++------ 4 files changed, 18 insertions(+), 8 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: 7f40abdf975259a1285023927c27a9fe4c394bbd
by metan 12 May '12

12 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 7f40abdf975259a1285023927c27a9fe4c394bbd (commit) via f26e8c4084153dc28b77d603162662744d84a1ac (commit) from 4f9126b65e5597524ac218023ac7520e6219ad23 (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/7f40abdf975259a1285023927c27a9fe4c39… commit 7f40abdf975259a1285023927c27a9fe4c394bbd Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat May 12 00:26:06 2012 +0200 pywrap: Add pywrap for input module. diff --git a/pylib/gfxprim/Makefile b/pylib/gfxprim/Makefile index 3032f62..afcad67 100644 --- a/pylib/gfxprim/Makefile +++ b/pylib/gfxprim/Makefile @@ -1,4 +1,4 @@ TOPDIR=../.. -SUBDIRS=core loaders backends gfx filters text +SUBDIRS=core loaders backends gfx filters text input CLEAN+=*.pyc include $(TOPDIR)/post.mk diff --git a/pylib/gfxprim/input/C.py b/pylib/gfxprim/input/C.py new file mode 100644 index 0000000..c8f987f --- /dev/null +++ b/pylib/gfxprim/input/C.py @@ -0,0 +1,3 @@ +""" +Submodule for constants +""" diff --git a/pylib/gfxprim/input/Makefile b/pylib/gfxprim/input/Makefile new file mode 100644 index 0000000..3430bc9 --- /dev/null +++ b/pylib/gfxprim/input/Makefile @@ -0,0 +1,8 @@ +TOPDIR=../../.. +LIBNAME=input + +include $(TOPDIR)/pre.mk +include $(TOPDIR)/pywrap.mk +include $(TOPDIR)/post.mk + +include ../silence_swig_warnings.mk diff --git a/pylib/gfxprim/input/__init__.py b/pylib/gfxprim/input/__init__.py new file mode 100644 index 0000000..31c371f --- /dev/null +++ b/pylib/gfxprim/input/__init__.py @@ -0,0 +1,29 @@ +""" +Module wrapping GfxPrim Input. +""" + +from . import input_c + +# Constants module +from . import C + +def _init(module): + # Import some members from the SWIG module + from ..utils import import_members + import re + def strip_GP(s): + return re.sub('^GP_', '', s) + + # Constants + const_regexes = ['^GP_[A-Z0-9_]*$'] + import_members(input_c, C, include=const_regexes, sub=strip_GP) + + # Functions + import_members(input_c, module, sub=strip_GP, + exclude=const_regexes + [ + '^gfxprim$', + '^w+_swigregister$', + '^_w+$']) + +_init(locals()) +del _init diff --git a/pylib/gfxprim/input/input.i b/pylib/gfxprim/input/input.i new file mode 100644 index 0000000..f870e10 --- /dev/null +++ b/pylib/gfxprim/input/input.i @@ -0,0 +1,7 @@ +%module(package="gfxprim.input") input_c + +%{ +#include "input/GP_Input.h" +%} + +%include "GP_Event.h" http://repo.or.cz/w/gfxprim.git/commit/f26e8c4084153dc28b77d603162662744d84… commit f26e8c4084153dc28b77d603162662744d84a1ac Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat May 12 00:00:31 2012 +0200 pywrap: backends: Update swig bindings. diff --git a/pylib/gfxprim/backends/backends.i b/pylib/gfxprim/backends/backends.i index 4785281..dd1394d 100644 --- a/pylib/gfxprim/backends/backends.i +++ b/pylib/gfxprim/backends/backends.i @@ -33,12 +33,12 @@ %include "GP_Backend.h" - /* * Particular backends. We need to list every header separately. */ - -%include "GP_Backends.h" +/* Overall backend init header */ +%newobject GP_BackendInit; +%include "GP_BackendInit.h" %newobject GP_BackendLinuxFBInit; %include "GP_LinuxFB.h" @@ -46,3 +46,5 @@ %newobject GP_BackendSDLInit; %include "GP_SDL.h" +%newobject GP_BackendX11Init; +%include "GP_X11.h" ----------------------------------------------------------------------- Summary of changes: pylib/gfxprim/Makefile | 2 +- pylib/gfxprim/backends/backends.i | 8 +++++--- pylib/gfxprim/{backends => input}/C.py | 0 pylib/gfxprim/{core => input}/Makefile | 2 +- pylib/gfxprim/{gfx => input}/__init__.py | 24 +++++++++++++----------- pylib/gfxprim/input/input.i | 7 +++++++ 6 files changed, 27 insertions(+), 16 deletions(-) copy pylib/gfxprim/{backends => input}/C.py (100%) copy pylib/gfxprim/{core => input}/Makefile (90%) copy pylib/gfxprim/{gfx => input}/__init__.py (52%) create mode 100644 pylib/gfxprim/input/input.i 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

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

Gfxprim May 2012