Browse Source

Fixed a std::unique_ptr compile error

tags/2021-05-28
jules 7 years ago
parent
commit
8454db395e
2 changed files with 3 additions and 3 deletions
  1. +2
    -2
      modules/juce_gui_basics/misc/juce_JUCESplashScreen.cpp
  2. +1
    -1
      modules/juce_gui_basics/misc/juce_JUCESplashScreen.h

+ 2
- 2
modules/juce_gui_basics/misc/juce_JUCESplashScreen.cpp View File

@@ -257,7 +257,7 @@ JUCESplashScreen::~JUCESplashScreen()
{
}
Drawable* JUCESplashScreen::getSplashScreenLogo()
std::unique_ptr<Drawable> JUCESplashScreen::getSplashScreenLogo()
{
const char* svgData = R"JUCESPLASHSCREEN(
<?xml version="1.0" encoding="UTF-8"?>
@@ -295,7 +295,7 @@ Drawable* JUCESplashScreen::getSplashScreenLogo()
)JUCESPLASHSCREEN";
std::unique_ptr<XmlElement> svgXml (XmlDocument::parse (svgData));
return Drawable::createFromSVG (*svgXml);
return std::unique_ptr<Drawable> (Drawable::createFromSVG (*svgXml));
}
void JUCESplashScreen::paint (Graphics& g)


+ 1
- 1
modules/juce_gui_basics/misc/juce_JUCESplashScreen.h View File

@@ -55,7 +55,7 @@ public:
JUCESplashScreen (Component& parentToAddTo);
~JUCESplashScreen();
static Drawable* getSplashScreenLogo();
static std::unique_ptr<Drawable> getSplashScreenLogo();
private:
void paint (Graphics&) override;


Loading…
Cancel
Save