Commit ce6a2de2 authored by Gerhard Stein's avatar Gerhard Stein

Merge branch 'stable'

parents 0c00f120 0e6443e6
......@@ -201,7 +201,7 @@ bool loadStrFunction(PyObject * pModule,
{
PyObject *objectsRepresentation = PyObject_Repr(pValue);
char *str = PyUnicode_AsUTF8(objectsRepresentation) ;
auto *str = PyUnicode_AsUTF8(objectsRepresentation) ;
if(str)
{
......@@ -265,7 +265,7 @@ bool loadStrFunction(PyObject * pModule,
{
PyObject *objectsRepresentation = PyObject_Repr(pValue);
char *str = PyUnicode_AsUTF8(objectsRepresentation) ;
auto *str = PyUnicode_AsUTF8(objectsRepresentation) ;
if(str)
{
......
......@@ -146,6 +146,17 @@ public:
return mpTexture;
}
void fillRGB( SDL_Renderer *renderer,
const Uint8 r,
const Uint8 g,
const Uint8 b );
bool loadFromMem(const unsigned char *data,
const unsigned int size,
SDL_Renderer *renderer,
const bool dark);
private:
SDL_Texture* mpTexture = nullptr;
......
#!/bin/sh
VERSION=2.0.1
VERSION=2.2.3
SUBVER=ppa1
KEY="0x6A1F4CC6"
......
......@@ -73,7 +73,7 @@ bool CFuse::loadPythonScripts(const std::string &scriptBaseName)
{
PyObject *objectsRepresentation = PyObject_Repr(pValue);
char *str = PyUnicode_AsUTF8(objectsRepresentation) ;
auto *str = PyUnicode_AsUTF8(objectsRepresentation) ;
if(str)
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment