From bb1518ef1d858fc95fd673d13adff61dfd2f8497 Mon Sep 17 00:00:00 2001 From: "bernard.xiong@gmail.com" Date: Sat, 22 Jan 2011 01:30:42 +0000 Subject: update image_container. git-svn-id: https://rt-thread.googlecode.com/svn/trunk@1254 bbd45198-f89e-11dd-88c7-29a3b14d5316 --- components/rtgui/include/rtgui/image.h | 151 ++++++++++++----------- components/rtgui/include/rtgui/image_bmp.h | 38 +++--- components/rtgui/include/rtgui/image_container.h | 24 ++-- components/rtgui/include/rtgui/image_hdc.h | 74 +++++------ components/rtgui/include/rtgui/image_jpeg.h | 16 +-- components/rtgui/include/rtgui/image_png.h | 42 +++---- components/rtgui/include/rtgui/image_xpm.h | 42 +++---- 7 files changed, 194 insertions(+), 193 deletions(-) (limited to 'components/rtgui/include') diff --git a/components/rtgui/include/rtgui/image.h b/components/rtgui/include/rtgui/image.h index c52d78f61a..1c71ef2f32 100644 --- a/components/rtgui/include/rtgui/image.h +++ b/components/rtgui/include/rtgui/image.h @@ -1,76 +1,77 @@ -/* - * File : image.h - * This file is part of RT-Thread RTOS - * COPYRIGHT (C) 2006 - 2009, RT-Thread Development Team - * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.rt-thread.org/license/LICENSE - * - * Change Logs: - * Date Author Notes - * 2009-10-16 Bernard first version - */ -#ifndef __RTGUI_IMAGE_H__ -#define __RTGUI_IMAGE_H__ - -#include -#include -#include - -struct rtgui_image; -struct rtgui_image_engine -{ - const char* name; - struct rtgui_list_node list; - - /* image engine function */ - rt_bool_t (*image_check)(struct rtgui_filerw* file); - - rt_bool_t (*image_load)(struct rtgui_image* image, struct rtgui_filerw* file, rt_bool_t load); - void (*image_unload)(struct rtgui_image* image); - - void (*image_blit)(struct rtgui_image* image, struct rtgui_dc* dc, struct rtgui_rect* rect); -}; - -struct rtgui_image_palette -{ - rtgui_color_t* colors; - rt_uint32_t ncolors; -}; -typedef struct rtgui_image_palette rtgui_image_palette_t; - -struct rtgui_image -{ - /* image metrics */ - rt_uint16_t w, h; - - /* image engine */ - const struct rtgui_image_engine* engine; - - /* image palette */ - rtgui_image_palette_t* palette; - - /* image private data */ - void* data; -}; -typedef struct rtgui_image rtgui_image_t; - -/* init rtgui image system */ -void rtgui_system_image_init(void); - -#if defined(RTGUI_USING_DFS_FILERW) || defined(RTGUI_USING_STDIO_FILERW) -struct rtgui_image* rtgui_image_create_from_file(const char* type, const char* filename, rt_bool_t load); -#endif -struct rtgui_image* rtgui_image_create_from_mem(const char* type, const rt_uint8_t* data, rt_size_t length, rt_bool_t load); -void rtgui_image_destroy(struct rtgui_image* image); - -/* register an image engine */ -void rtgui_image_register_engine(struct rtgui_image_engine* engine); - -/* blit an image on DC */ -void rtgui_image_blit(struct rtgui_image* image, struct rtgui_dc* dc, struct rtgui_rect* rect); +/* + * File : image.h + * This file is part of RT-Thread RTOS + * COPYRIGHT (C) 2006 - 2009, RT-Thread Development Team + * + * The license and distribution terms for this file may be + * found in the file LICENSE in this distribution or at + * http://www.rt-thread.org/license/LICENSE + * + * Change Logs: + * Date Author Notes + * 2009-10-16 Bernard first version + */ +#ifndef __RTGUI_IMAGE_H__ +#define __RTGUI_IMAGE_H__ + +#include +#include +#include + +struct rtgui_image; +struct rtgui_image_engine +{ + const char* name; + struct rtgui_list_node list; + + /* image engine function */ + rt_bool_t (*image_check)(struct rtgui_filerw* file); + + rt_bool_t (*image_load)(struct rtgui_image* image, struct rtgui_filerw* file, rt_bool_t load); + void (*image_unload)(struct rtgui_image* image); + + void (*image_blit)(struct rtgui_image* image, struct rtgui_dc* dc, struct rtgui_rect* rect); +}; + +struct rtgui_image_palette +{ + rtgui_color_t* colors; + rt_uint32_t ncolors; +}; +typedef struct rtgui_image_palette rtgui_image_palette_t; + +struct rtgui_image +{ + /* image metrics */ + rt_uint16_t w, h; + + /* image engine */ + const struct rtgui_image_engine* engine; + + /* image palette */ + rtgui_image_palette_t* palette; + + /* image private data */ + void* data; +}; +typedef struct rtgui_image rtgui_image_t; + +/* init rtgui image system */ +void rtgui_system_image_init(void); + +#if defined(RTGUI_USING_DFS_FILERW) || defined(RTGUI_USING_STDIO_FILERW) +struct rtgui_image* rtgui_image_create_from_file(const char* type, const char* filename, rt_bool_t load); +struct rtgui_image* rtgui_image_create(const char* filename, rt_bool_t load); +#endif +struct rtgui_image* rtgui_image_create_from_mem(const char* type, const rt_uint8_t* data, rt_size_t length, rt_bool_t load); +void rtgui_image_destroy(struct rtgui_image* image); + +/* register an image engine */ +void rtgui_image_register_engine(struct rtgui_image_engine* engine); + +/* blit an image on DC */ +void rtgui_image_blit(struct rtgui_image* image, struct rtgui_dc* dc, struct rtgui_rect* rect); struct rtgui_image_palette* rtgui_image_palette_create(rt_uint32_t ncolors); - - -#endif + + +#endif diff --git a/components/rtgui/include/rtgui/image_bmp.h b/components/rtgui/include/rtgui/image_bmp.h index 1dbcccff90..19fdfc7f6e 100644 --- a/components/rtgui/include/rtgui/image_bmp.h +++ b/components/rtgui/include/rtgui/image_bmp.h @@ -1,19 +1,19 @@ -/* - * File : image_bmp.h - * This file is part of RT-Thread RTOS - * COPYRIGHT (C) 2006 - 2009, RT-Thread Development Team - * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.rt-thread.org/license/LICENSE - * - * Change Logs: - * Date Author Notes - * 2010-08-10 Bernard first version - */ -#ifndef __RTGUI_IMAGE_BMP_H__ -#define __RTGUI_IMAGE_BMP_H__ - -void rtgui_image_bmp_init(void); - -#endif +/* + * File : image_bmp.h + * This file is part of RT-Thread RTOS + * COPYRIGHT (C) 2006 - 2009, RT-Thread Development Team + * + * The license and distribution terms for this file may be + * found in the file LICENSE in this distribution or at + * http://www.rt-thread.org/license/LICENSE + * + * Change Logs: + * Date Author Notes + * 2010-08-10 Bernard first version + */ +#ifndef __RTGUI_IMAGE_BMP_H__ +#define __RTGUI_IMAGE_BMP_H__ + +void rtgui_image_bmp_init(void); + +#endif diff --git a/components/rtgui/include/rtgui/image_container.h b/components/rtgui/include/rtgui/image_container.h index 6764a5b19b..8708ef0944 100644 --- a/components/rtgui/include/rtgui/image_container.h +++ b/components/rtgui/include/rtgui/image_container.h @@ -1,12 +1,12 @@ -#ifndef __RTGUI_IMAGE_CONTAINER_H__ -#define __RTGUI_IMAGE_CONTAINER_H__ - -#include -#include - -void image_container_system_init(void); - -rtgui_image_t* image_container_get(const char* filename); -void image_container_put(rtgui_image_t* image); - -#endif +#ifndef __RTGUI_IMAGE_CONTAINER_H__ +#define __RTGUI_IMAGE_CONTAINER_H__ + +#include +#include + +void image_container_system_init(void); + +rtgui_image_t* image_container_get(const char* filename); +void image_container_put(rtgui_image_t* image); + +#endif diff --git a/components/rtgui/include/rtgui/image_hdc.h b/components/rtgui/include/rtgui/image_hdc.h index 8d253631f1..122a6a3313 100644 --- a/components/rtgui/include/rtgui/image_hdc.h +++ b/components/rtgui/include/rtgui/image_hdc.h @@ -1,37 +1,37 @@ -/* - * File : image_xpm.h - * This file is part of RT-Thread RTOS - * COPYRIGHT (C) 2006 - 2009, RT-Thread Development Team - * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.rt-thread.org/license/LICENSE - * - * Change Logs: - * Date Author Notes - * 2009-10-16 Bernard first version - */ -#ifndef __RTGUI_IMAGE_HDC_H__ -#define __RTGUI_IMAGE_HDC_H__ - -#include - -struct rtgui_image_hdcmm -{ - struct rtgui_image parent; - - /* hdc image information */ - rt_uint16_t byte_per_pixel; - rt_uint16_t pitch; - - rt_uint8_t *pixels; -}; - -void rtgui_image_hdc_init(void); -extern const struct rtgui_image_engine rtgui_image_hdcmm_engine; - -#define HDC_HEADER_SIZE (5 * 4) -#define RTGUI_IMAGE_HDC_DEF(bpp, w, h, pixels) \ - {{w, h, &rtgui_image_hdcmm_engine, RT_NULL}, bpp, (bpp * w), ((rt_uint8_t*)pixels + HDC_HEADER_SIZE)} - -#endif +/* + * File : image_xpm.h + * This file is part of RT-Thread RTOS + * COPYRIGHT (C) 2006 - 2009, RT-Thread Development Team + * + * The license and distribution terms for this file may be + * found in the file LICENSE in this distribution or at + * http://www.rt-thread.org/license/LICENSE + * + * Change Logs: + * Date Author Notes + * 2009-10-16 Bernard first version + */ +#ifndef __RTGUI_IMAGE_HDC_H__ +#define __RTGUI_IMAGE_HDC_H__ + +#include + +struct rtgui_image_hdcmm +{ + struct rtgui_image parent; + + /* hdc image information */ + rt_uint16_t byte_per_pixel; + rt_uint16_t pitch; + + rt_uint8_t *pixels; +}; + +void rtgui_image_hdc_init(void); +extern const struct rtgui_image_engine rtgui_image_hdcmm_engine; + +#define HDC_HEADER_SIZE (5 * 4) +#define RTGUI_IMAGE_HDC_DEF(bpp, w, h, pixels) \ + {{w, h, &rtgui_image_hdcmm_engine, RT_NULL}, bpp, (bpp * w), ((rt_uint8_t*)pixels + HDC_HEADER_SIZE)} + +#endif diff --git a/components/rtgui/include/rtgui/image_jpeg.h b/components/rtgui/include/rtgui/image_jpeg.h index 48e88e701d..9a22a68805 100644 --- a/components/rtgui/include/rtgui/image_jpeg.h +++ b/components/rtgui/include/rtgui/image_jpeg.h @@ -1,8 +1,8 @@ -#ifndef __RTGUI_IMAGE_JPEG_H__ -#define __RTGUI_IMAGE_JPEG_H__ - -#include - -void rtgui_image_jpeg_init(void); - -#endif +#ifndef __RTGUI_IMAGE_JPEG_H__ +#define __RTGUI_IMAGE_JPEG_H__ + +#include + +void rtgui_image_jpeg_init(void); + +#endif diff --git a/components/rtgui/include/rtgui/image_png.h b/components/rtgui/include/rtgui/image_png.h index 09454d6a75..f2a6d2311d 100644 --- a/components/rtgui/include/rtgui/image_png.h +++ b/components/rtgui/include/rtgui/image_png.h @@ -1,21 +1,21 @@ -/* - * File : image_png.h - * This file is part of RT-Thread RTOS - * COPYRIGHT (C) 2006 - 2009, RT-Thread Development Team - * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.rt-thread.org/license/LICENSE - * - * Change Logs: - * Date Author Notes - * 2009-10-16 Bernard first version - */ -#ifndef __RTGUI_IMAGE_PNG_H__ -#define __RTGUI_IMAGE_PNG_H__ - -#include - -void rtgui_image_png_init(void); - -#endif +/* + * File : image_png.h + * This file is part of RT-Thread RTOS + * COPYRIGHT (C) 2006 - 2009, RT-Thread Development Team + * + * The license and distribution terms for this file may be + * found in the file LICENSE in this distribution or at + * http://www.rt-thread.org/license/LICENSE + * + * Change Logs: + * Date Author Notes + * 2009-10-16 Bernard first version + */ +#ifndef __RTGUI_IMAGE_PNG_H__ +#define __RTGUI_IMAGE_PNG_H__ + +#include + +void rtgui_image_png_init(void); + +#endif diff --git a/components/rtgui/include/rtgui/image_xpm.h b/components/rtgui/include/rtgui/image_xpm.h index e580327f6d..5c6af21313 100644 --- a/components/rtgui/include/rtgui/image_xpm.h +++ b/components/rtgui/include/rtgui/image_xpm.h @@ -1,21 +1,21 @@ -/* - * File : image_xpm.h - * This file is part of RT-Thread RTOS - * COPYRIGHT (C) 2006 - 2009, RT-Thread Development Team - * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.rt-thread.org/license/LICENSE - * - * Change Logs: - * Date Author Notes - * 2009-10-16 Bernard first version - */ -#ifndef __RTGUI_IMAGE_XPM_H__ -#define __RTGUI_IMAGE_XPM_H__ - -#include - -void rtgui_image_xpm_init(void); - -#endif +/* + * File : image_xpm.h + * This file is part of RT-Thread RTOS + * COPYRIGHT (C) 2006 - 2009, RT-Thread Development Team + * + * The license and distribution terms for this file may be + * found in the file LICENSE in this distribution or at + * http://www.rt-thread.org/license/LICENSE + * + * Change Logs: + * Date Author Notes + * 2009-10-16 Bernard first version + */ +#ifndef __RTGUI_IMAGE_XPM_H__ +#define __RTGUI_IMAGE_XPM_H__ + +#include + +void rtgui_image_xpm_init(void); + +#endif -- cgit v1.3.1