DPF

commit a9da60adf9b910cc28d7e0f372b013464c64e930
parent 7936e6f1d08165407c1e1c2a6560f5cb278c3b5e
Author: falkTX <falktx@gmail.com>
Date:   Tue, 27 May 2014 13:55:40 +0100

Fix conflicts when using more than 1 generated artwork file

Diffstat:
M
utils/png2rgba.py
 | 
4
++--

1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/utils/png2rgba.py b/utils/png2rgba.py
@@ -59,7 +59,7 @@ def png2rgba(namespace, filenames):
         if tempIndex != len(filenames):
             fdH.write("\n")
 
-        fdC.write("static const unsigned char temp%i[] = {\n" % tempIndex)
+        fdC.write("static const unsigned char temp_%s_%i[] = {\n" % (shortFilename, tempIndex))
 
         curColumn = 1
         fdC.write(" ")
@@ -101,7 +101,7 @@ def png2rgba(namespace, filenames):
                     curColumn += 1
 
         fdC.write("};\n")
-        fdC.write("const char* %s::%sData = (const char*)temp%i;\n" % (namespace, shortFilename, tempIndex))
+        fdC.write("const char* %s::%sData = (const char*)temp_%s_%i;\n" % (namespace, shortFilename, shortFilename, tempIndex))
 
         if tempIndex != len(filenames):
             fdC.write("\n")