diff options
| author | [email protected] <[email protected]> | 2012-04-16 04:58:50 +0000 |
|---|---|---|
| committer | [email protected] <[email protected]> | 2012-04-16 04:58:50 +0000 |
| commit | e86f34052123539439cb42cfdfc444432e6232f2 (patch) | |
| tree | 8a88de4bac30f248eefec758832e885cbf2a9bad /components/rtgui/common | |
| parent | 016aeaf2ff538d96d4dfea2059403debd6b5ab40 (diff) | |
fixed RT-Thread/GUI building warning.
git-svn-id: https://rt-thread.googlecode.com/svn/trunk@2079 bbd45198-f89e-11dd-88c7-29a3b14d5316
Diffstat (limited to 'components/rtgui/common')
| -rw-r--r-- | components/rtgui/common/image.c | 30 | ||||
| -rw-r--r-- | components/rtgui/common/rtgui_system.c | 2 |
2 files changed, 16 insertions, 16 deletions
diff --git a/components/rtgui/common/image.c b/components/rtgui/common/image.c index 0160c990ea..45a1013a69 100644 --- a/components/rtgui/common/image.c +++ b/components/rtgui/common/image.c @@ -64,47 +64,47 @@ void rtgui_system_image_init(void) #endif } -static struct rtgui_image_engine* rtgui_image_get_engine_by_filename(const char* fn) +static struct rtgui_image_engine* rtgui_image_get_engine(const char* type) { struct rtgui_list_node *node; struct rtgui_image_engine *engine; - const char* ext; - - ext = fn + rt_strlen(fn); - while (ext != fn) - { - if (*ext == '.') { ext ++; break; } - ext --; - } - if (ext == fn) return RT_NULL; /* no ext */ rtgui_list_foreach(node, &_rtgui_system_image_list) { engine = rtgui_list_entry(node, struct rtgui_image_engine, list); - if (strncasecmp(engine->name, ext, strlen(engine->name)) == 0) + + if (strncasecmp(engine->name, type, strlen(engine->name)) ==0) return engine; } return RT_NULL; } -static struct rtgui_image_engine* rtgui_image_get_engine(const char* type) +#if defined(RTGUI_USING_DFS_FILERW) || defined(RTGUI_USING_STDIO_FILERW)
+static struct rtgui_image_engine* rtgui_image_get_engine_by_filename(const char* fn) { struct rtgui_list_node *node; struct rtgui_image_engine *engine; + const char* ext; + + ext = fn + rt_strlen(fn); + while (ext != fn) + { + if (*ext == '.') { ext ++; break; } + ext --; + } + if (ext == fn) return RT_NULL; /* no ext */ rtgui_list_foreach(node, &_rtgui_system_image_list) { engine = rtgui_list_entry(node, struct rtgui_image_engine, list); - - if (strncasecmp(engine->name, type, strlen(engine->name)) ==0) + if (strncasecmp(engine->name, ext, strlen(engine->name)) == 0) return engine; } return RT_NULL; } -#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_filerw* filerw; diff --git a/components/rtgui/common/rtgui_system.c b/components/rtgui/common/rtgui_system.c index 5005156ec5..3d9d48445c 100644 --- a/components/rtgui/common/rtgui_system.c +++ b/components/rtgui/common/rtgui_system.c @@ -21,7 +21,7 @@ #include <rtgui/widgets/window.h> #include <rtgui/rtgui_theme.h> -// #define RTGUI_EVENT_DEBUG +#define RTGUI_EVENT_DEBUG #ifdef _WIN32 #define RTGUI_EVENT_DEBUG |