summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Shaw <jshaw@netsurf-browser.org>2008-03-23 22:31:30 (GMT)
committer James Shaw <jshaw@netsurf-browser.org>2008-03-23 22:31:30 (GMT)
commit4016cfba2d954196a9b4d7fe19d3b16d4c78b748 (patch)
tree23552c31b99a0169e3540426f79b3a1ae1ef3f13
parent6cb9eccf4902695aa9c84119e8608b0392e88791 (diff)
downloadlibrosprite-4016cfba2d954196a9b4d7fe19d3b16d4c78b748.tar.gz
librosprite-4016cfba2d954196a9b4d7fe19d3b16d4c78b748.tar.bz2
Rename load_file to just load(), since we can now load from any source
svn path=/import/jshaw/libsprite/; revision=10013
-rw-r--r--trunk/example.c2
-rw-r--r--trunk/librosprite.c2
-rw-r--r--trunk/librosprite.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/trunk/example.c b/trunk/example.c
index b7baaf3..7325c4a 100644
--- a/trunk/example.c
+++ b/trunk/example.c
@@ -57,7 +57,7 @@ int main(int argc, char *argv[])
printf("Loading %s\n", filename);
- struct rosprite_area* sprite_area = rosprite_load_file(rosprite_file_reader, ctx);
+ struct rosprite_area* sprite_area = rosprite_load(rosprite_file_reader, ctx);
printf("sprite_count %u\n", sprite_area->sprite_count);
printf("extension_size %u\n", sprite_area->extension_size);
diff --git a/trunk/librosprite.c b/trunk/librosprite.c
index 06e9ea6..8b69254 100644
--- a/trunk/librosprite.c
+++ b/trunk/librosprite.c
@@ -618,7 +618,7 @@ struct rosprite* sprite_load_sprite(reader reader, void* ctx)
return sprite;
}
-struct rosprite_area* rosprite_load_file(reader reader, void* ctx)
+struct rosprite_area* rosprite_load(reader reader, void* ctx)
{
struct rosprite_area* sprite_area = malloc(sizeof(struct rosprite_area));
diff --git a/trunk/librosprite.h b/trunk/librosprite.h
index e8bcdee..74167b3 100644
--- a/trunk/librosprite.h
+++ b/trunk/librosprite.h
@@ -54,7 +54,7 @@ struct rosprite_file_context* rosprite_create_file_context(FILE* f);
void rosprite_destroy_file_context(struct rosprite_file_context* ctx);
int rosprite_file_reader(uint8_t* buf, size_t count, void* ctx);
-struct rosprite_area* rosprite_load_file(reader reader, void* ctx);
+struct rosprite_area* rosprite_load(reader reader, void* ctx);
void rosprite_destroy_sprite_area(struct rosprite_area *);
struct rosprite_palette* rosprite_load_palette(reader reader, void* ctx);