summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEamon Walsh <ewalsh@tycho.nsa.gov>2011-08-01 15:18:52 -0400
committerEamon Walsh <ewalsh@tycho.nsa.gov>2011-08-01 15:18:52 -0400
commit2171eaef1e863be608aa4db952b2110e4489469a (patch)
tree6c1270cf330b90eecd8f4749b5555f5e32f62531
parent126ed568fd60b518af16d0d63fa8980835dce0a3 (diff)
Rename sclient_read_background_image() -> sclient_load_image().
-rw-r--r--src/dclient.c2
-rw-r--r--src/sclient.c5
-rw-r--r--src/sclient.h3
3 files changed, 4 insertions, 6 deletions
diff --git a/src/dclient.c b/src/dclient.c
index 20f4aa3..98253d7 100644
--- a/src/dclient.c
+++ b/src/dclient.c
@@ -144,7 +144,7 @@ dclient_setup(void)
if (!background)
return -1;
- sclient_read_background_image(DESKTOP_BG_FILE, background, width, height);
+ sclient_load_image(DESKTOP_BG_FILE, background, width, height);
/* Set up preallocated DirectFB surface with the data */
memset(&sdesc, 0, sizeof(sdesc));
diff --git a/src/sclient.c b/src/sclient.c
index 20402f5..2d2be70 100644
--- a/src/sclient.c
+++ b/src/sclient.c
@@ -54,8 +54,7 @@ sclient_mouse(struct display *d, struct mouse_event *m)
}
void
-sclient_read_background_image(const char *filename, unsigned char *buf,
- const int dw, const int dh)
+sclient_load_image(const char *filename, unsigned char *buf, const int dw, const int dh)
{
uint32_t iw, ih, w, h, o;
unsigned i;
@@ -109,7 +108,7 @@ sclient_setup(void)
if (!background)
return -1;
- sclient_read_background_image(SERVER_BG_FILE, background, width, height);
+ sclient_load_image(SERVER_BG_FILE, background, width, height);
/* Set up preallocated DirectFB surface with the data */
memset(&sdesc, 0, sizeof(sdesc));
diff --git a/src/sclient.h b/src/sclient.h
index b846a1f..db7907b 100644
--- a/src/sclient.h
+++ b/src/sclient.h
@@ -23,8 +23,7 @@ extern int
sclient_setup(void);
extern void
-sclient_read_background_image(const char *filename, unsigned char *buf,
- const int buf_width, const int buf_height);
+sclient_load_image(const char *filename, unsigned char *buf, const int buf_width, const int buf_height);
extern struct display *
dclient_new(void);