summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJinghua Luo <sunmoon1997@gmail.com>2007-01-28 19:37:21 +0800
committerJinghua Luo <sunmoon1997@gmail.com>2007-01-28 19:37:21 +0800
commitbba48aef586cf3ed20d4cb751570f9fd3d50dd02 (patch)
treeddcaac2ee3d1134523e284cc211466adf2be0970
parent5f31ef2db07d24ced3a857a3e1f6f5fc8cb6d354 (diff)
rename sdl_freetype_area_find to sdl_freetype_area_manager_find.
-rw-r--r--src/sdl-freetype-area-manager.c52
-rw-r--r--src/sdl-freetype-area-manager.h12
2 files changed, 32 insertions, 32 deletions
diff --git a/src/sdl-freetype-area-manager.c b/src/sdl-freetype-area-manager.c
index 09bae34..055f535 100644
--- a/src/sdl-freetype-area-manager.c
+++ b/src/sdl-freetype-area-manager.c
@@ -150,12 +150,12 @@ sdl_freetype_area_get_top_scored_sub_area (sdl_freetype_area_manager_t * manager
}
static sdl_freetype_error_t
-sdl_freetype_area_find_intl (sdl_freetype_area_manager_t * manager,
- sdl_freetype_area_t * area,
- int width,
- int height,
- sdl_freetype_bool_t kick_out,
- void * closure)
+sdl_freetype_area_manager_find_intl (sdl_freetype_area_manager_t * manager,
+ sdl_freetype_area_t * area,
+ int width,
+ int height,
+ sdl_freetype_bool_t kick_out,
+ void * closure)
{
sdl_freetype_error_t err;
@@ -167,7 +167,7 @@ sdl_freetype_area_find_intl (sdl_freetype_area_manager_t * manager,
if (kick_out) {
if (manager->ops->compare_score (manager,
area,
- area->closure,
+ area->closure,
closure) >= 0)
return SDL_FREETYPE_ERR_OUT_OF_RESOURCES;
@@ -176,7 +176,7 @@ sdl_freetype_area_find_intl (sdl_freetype_area_manager_t * manager,
return SDL_FREETYPE_ERR_OUT_OF_RESOURCES;
}
- /* fall-through */
+ /* fall-through */
case SDL_FREETYPE_AREA_AVAILABLE: {
if (area->level == manager->max_level ||
(area->width == width && area->height == height)) {
@@ -214,10 +214,10 @@ sdl_freetype_area_find_intl (sdl_freetype_area_manager_t * manager,
area->state = SDL_FREETYPE_AREA_DIVIDED;
- err = sdl_freetype_area_find_intl (manager,
- area->area[0],
- width, height,
- kick_out, closure);
+ err = sdl_freetype_area_manager_find_intl (manager,
+ area->area[0],
+ width, height,
+ kick_out, closure);
if (err == SDL_FREETYPE_ERR_OK)
return SDL_FREETYPE_ERR_OK;
}
@@ -231,10 +231,10 @@ sdl_freetype_area_find_intl (sdl_freetype_area_manager_t * manager,
if (area->area[i]) {
if (area->area[i]->width >= width &&
area->area[i]->height >= height) {
- err = sdl_freetype_area_find_intl (manager,
- area->area[i],
- width, height,
- kick_out, closure);
+ err = sdl_freetype_area_manager_find_intl (manager,
+ area->area[i],
+ width, height,
+ kick_out, closure);
if (err == SDL_FREETYPE_ERR_OK)
return SDL_FREETYPE_ERR_OK;
@@ -266,8 +266,8 @@ sdl_freetype_area_find_intl (sdl_freetype_area_manager_t * manager,
area->closure = NULL;
area->state = SDL_FREETYPE_AREA_AVAILABLE;
- err = sdl_freetype_area_find_intl (manager, area, width, height,
- SDL_FREETYPE_TRUE, closure);
+ err = sdl_freetype_area_manager_find_intl (manager, area, width, height,
+ SDL_FREETYPE_TRUE, closure);
if (err == SDL_FREETYPE_ERR_OK)
return SDL_FREETYPE_ERR_OK;
} break;
@@ -277,15 +277,15 @@ sdl_freetype_area_find_intl (sdl_freetype_area_manager_t * manager,
}
sdl_freetype_error_t
-sdl_freetype_area_find (sdl_freetype_area_manager_t * manager,
- sdl_freetype_area_t * area,
- int width,
- int height,
- sdl_freetype_bool_t kick_out,
- void * closure)
+sdl_freetype_area_manager_find (sdl_freetype_area_manager_t * manager,
+ sdl_freetype_area_t * area,
+ int width,
+ int height,
+ sdl_freetype_bool_t kick_out,
+ void * closure)
{
- return sdl_freetype_area_find_intl (manager, manager->area,
- width, height, kick_out, closure);
+ return sdl_freetype_area_manager_find_intl (manager, manager->area,
+ width, height, kick_out, closure);
}
static sdl_freetype_error_t
diff --git a/src/sdl-freetype-area-manager.h b/src/sdl-freetype-area-manager.h
index e8a6c79..24c0725 100644
--- a/src/sdl-freetype-area-manager.h
+++ b/src/sdl-freetype-area-manager.h
@@ -69,12 +69,12 @@ sdl_freetype_area_manager_create(int width, int height, int max_level,
const sdl_freetype_area_manager_ops_t * ops);
sdl_freetype_error_t
-sdl_freetype_area_find (sdl_freetype_area_manager_t * manager,
- sdl_freetype_area_t * area,
- int width,
- int height,
- sdl_freetype_bool_t kick_out,
- void * closure);
+sdl_freetype_area_manager_find (sdl_freetype_area_manager_t * manager,
+ sdl_freetype_area_t * area,
+ int width,
+ int height,
+ sdl_freetype_bool_t kick_out,
+ void * closure);
void
sdl_freetype_area_manager_destroy(sdl_freetype_area_manager_t * manager);