summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Spilsbury <sam.spilsbury@canonical.com>2011-02-24 14:28:27 +0800
committerSam Spilsbury <sam.spilsbury@canonical.com>2011-02-24 14:28:27 +0800
commit8431ee3a49938b0baf8af727ac638b6526ad1ab8 (patch)
tree8bd0803198b10b3954de201f203fd51f141a18f1
parent3a1ac995d1078529a25bb8530cb4dd453a27e2f2 (diff)
downloadsplash-8431ee3a49938b0baf8af727ac638b6526ad1ab8.tar.gz
splash-8431ee3a49938b0baf8af727ac638b6526ad1ab8.tar.bz2
Adapt for new core API
-rw-r--r--src/splash.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/splash.cpp b/src/splash.cpp
index 88b3b51..c7f400e 100644
--- a/src/splash.cpp
+++ b/src/splash.cpp
@@ -67,19 +67,20 @@ SplashScreen::preparePaint (int ms)
mMove = 0.0;
CompString back_s (optionGetBackground ());
CompString logo_s (optionGetLogo ());
+ CompString pname ("splash");
back_img =
- GLTexture::readImageToTexture (back_s,
+ GLTexture::readImageToTexture (back_s, pname,
backSize);
logo_img =
- GLTexture::readImageToTexture (logo_s,
+ GLTexture::readImageToTexture (logo_s, pname,
logoSize);
if (!back_img.size ())
{
CompString defaultBack (SPLASH_BACKGROUND_DEFAULT);
back_img =
- GLTexture::readImageToTexture (defaultBack, backSize);
+ GLTexture::readImageToTexture (defaultBack, pname, backSize);
if (back_img.size ())
{
@@ -94,7 +95,7 @@ SplashScreen::preparePaint (int ms)
{
CompString defaultLogo (SPLASH_LOGO_DEFAULT);
logo_img =
- GLTexture::readImageToTexture (defaultLogo, logoSize);
+ GLTexture::readImageToTexture (defaultLogo, pname, logoSize);
if (logo_img.size ())
{