[Scummvm-git-logs] scummvm master -> d925d62f4fce03240487b51d18af7fb313af7bb2

[antoniou79]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
d925d62f4f DEVTOOLS: BLADERUNNER: Abort on unsupported optimization of PNG input


Commit: d925d62f4fce03240487b51d18af7fb313af7bb2
    https://github.com/scummvm/scummvm/commit/d925d62f4fce03240487b51d18af7fb313af7bb2
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2020-12-31T16:17:51+02:00

Commit Message:
DEVTOOLS: BLADERUNNER: Abort on unsupported optimization of PNG input

Also revert the sample pngs to the non-optimized versions.

Changed paths:
    devtools/create_bladerunner/subtitles/fontCreator/grabberFromPNG17BR.py
    devtools/create_bladerunner/subtitles/fontCreator/samples/KIA6PT.FON-Ext012TranspZeroThresh0002.png
    devtools/create_bladerunner/subtitles/fontCreator/samples/Tahoma_18Shdw-G3NewMrgd.png
    devtools/create_bladerunner/subtitles/fontCreator/samples/Tahoma_18ShdwSimpleN4TransOnBlack.png
    devtools/create_bladerunner/subtitles/fontCreator/samples/Tahoma_24ShdwSimpleN3BlackMrgd.png
    devtools/create_bladerunner/subtitles/fontCreator/samples/subtitlesFontREVAMP.png
    devtools/create_bladerunner/subtitles/sampleInput/subtitlesFont.png
    engines/bladerunner/subtitles.cpp


diff --git a/devtools/create_bladerunner/subtitles/fontCreator/grabberFromPNG17BR.py b/devtools/create_bladerunner/subtitles/fontCreator/grabberFromPNG17BR.py
index e77fe72802..34035e2ba2 100644
--- a/devtools/create_bladerunner/subtitles/fontCreator/grabberFromPNG17BR.py
+++ b/devtools/create_bladerunner/subtitles/fontCreator/grabberFromPNG17BR.py
@@ -102,7 +102,7 @@ else:
 	structLibFound = True
 	
 try:
-	from PIL import Image 
+	from PIL import Image
 except ImportError:
 	print "[Error] Image python library (PIL) is required to be installed!" 
 else:
@@ -129,7 +129,7 @@ from struct import *
 from fonFileLib import *
 
 COMPANY_EMAIL = "classic.adventures.in.greek at gmail.com"
-APP_VERSION = "1.00"
+APP_VERSION = "1.10"
 APP_NAME = "grabberFromPNGHHBR"
 APP_WRAPPER_NAME = "fontCreator.py"
 APP_NAME_SPACED = "Blade Runner Font Creator/Exporter"
@@ -484,6 +484,11 @@ class grabberFromPNG:
 			if startCol != 0:
 				break
 			for y in range(0, imheight):	 # we search all rows (for each column)
+				if type(loadedImag[x, y]) is not tuple or len(loadedImag[x, y]) < 4:
+					#print type(loadedImag[x, y]), len(loadedImag[x, y])
+					print "[Error] Bad format for pixel type -- probable cause: unsupported PNG optimization"
+					return -2
+
 				r1,g1,b1,a1 = loadedImag[x, y]
 				if a1 != 0:	 # if pixel not completely transparent -- this is not necessarily the *top* left pixel of a font letter though! -- the startRow is still to be determined.
 					#if gTraceModeEnabled:
@@ -646,8 +651,8 @@ class grabberFromPNG:
 			errorFound = True
 		if not errorFound:
 			#debug
-			#if gTraceModeEnabled:
-			#	print "[Debug] ", self.imageRowFilePNG, im.format, "%dx%d" % im.size, im.mode
+			if gTraceModeEnabled:
+				print "[Debug] ", self.imageRowFilePNG, im.format, "%dx%d" % im.size, im.mode
 			w1, h1 = im.size
 			trimTopPixels = 0
 			trimBottomPixels = 0
diff --git a/devtools/create_bladerunner/subtitles/fontCreator/samples/KIA6PT.FON-Ext012TranspZeroThresh0002.png b/devtools/create_bladerunner/subtitles/fontCreator/samples/KIA6PT.FON-Ext012TranspZeroThresh0002.png
index d83348fcbd..85cab20f36 100644
Binary files a/devtools/create_bladerunner/subtitles/fontCreator/samples/KIA6PT.FON-Ext012TranspZeroThresh0002.png and b/devtools/create_bladerunner/subtitles/fontCreator/samples/KIA6PT.FON-Ext012TranspZeroThresh0002.png differ
diff --git a/devtools/create_bladerunner/subtitles/fontCreator/samples/Tahoma_18Shdw-G3NewMrgd.png b/devtools/create_bladerunner/subtitles/fontCreator/samples/Tahoma_18Shdw-G3NewMrgd.png
index fd25fc3393..bed9020750 100644
Binary files a/devtools/create_bladerunner/subtitles/fontCreator/samples/Tahoma_18Shdw-G3NewMrgd.png and b/devtools/create_bladerunner/subtitles/fontCreator/samples/Tahoma_18Shdw-G3NewMrgd.png differ
diff --git a/devtools/create_bladerunner/subtitles/fontCreator/samples/Tahoma_18ShdwSimpleN4TransOnBlack.png b/devtools/create_bladerunner/subtitles/fontCreator/samples/Tahoma_18ShdwSimpleN4TransOnBlack.png
index d734f94e9f..2ecc871fe4 100644
Binary files a/devtools/create_bladerunner/subtitles/fontCreator/samples/Tahoma_18ShdwSimpleN4TransOnBlack.png and b/devtools/create_bladerunner/subtitles/fontCreator/samples/Tahoma_18ShdwSimpleN4TransOnBlack.png differ
diff --git a/devtools/create_bladerunner/subtitles/fontCreator/samples/Tahoma_24ShdwSimpleN3BlackMrgd.png b/devtools/create_bladerunner/subtitles/fontCreator/samples/Tahoma_24ShdwSimpleN3BlackMrgd.png
index 4facd0964c..d0c930b7a3 100644
Binary files a/devtools/create_bladerunner/subtitles/fontCreator/samples/Tahoma_24ShdwSimpleN3BlackMrgd.png and b/devtools/create_bladerunner/subtitles/fontCreator/samples/Tahoma_24ShdwSimpleN3BlackMrgd.png differ
diff --git a/devtools/create_bladerunner/subtitles/fontCreator/samples/subtitlesFontREVAMP.png b/devtools/create_bladerunner/subtitles/fontCreator/samples/subtitlesFontREVAMP.png
index 19a2e0ca11..4a503cdfdf 100644
Binary files a/devtools/create_bladerunner/subtitles/fontCreator/samples/subtitlesFontREVAMP.png and b/devtools/create_bladerunner/subtitles/fontCreator/samples/subtitlesFontREVAMP.png differ
diff --git a/devtools/create_bladerunner/subtitles/sampleInput/subtitlesFont.png b/devtools/create_bladerunner/subtitles/sampleInput/subtitlesFont.png
index 19a2e0ca11..4a503cdfdf 100644
Binary files a/devtools/create_bladerunner/subtitles/sampleInput/subtitlesFont.png and b/devtools/create_bladerunner/subtitles/sampleInput/subtitlesFont.png differ
diff --git a/engines/bladerunner/subtitles.cpp b/engines/bladerunner/subtitles.cpp
index 66b3375f32..99505f6f02 100644
--- a/engines/bladerunner/subtitles.cpp
+++ b/engines/bladerunner/subtitles.cpp
@@ -125,12 +125,14 @@ void Subtitles::init(void) {
 	// Loading subtitles versioning info if available
 	TextResource versionTxtResource(_vm);
 	if ( versionTxtResource.open(SUBTITLES_VERSION_TRENAME, false)) {
-		_subtitlesInfo.credits = versionTxtResource.getText((uint32)0);
-		_subtitlesInfo.versionStr = versionTxtResource.getText((uint32)1);
+		_subtitlesInfo.credits       = versionTxtResource.getText((uint32)0);
+		_subtitlesInfo.versionStr    = versionTxtResource.getText((uint32)1);
 		_subtitlesInfo.dateOfCompile = versionTxtResource.getText((uint32)2);
-		_subtitlesInfo.languageMode = versionTxtResource.getText((uint32)3);
-		Common::String fontType = versionTxtResource.getText((uint32)4);
-		_subtitlesInfo.fontName = versionTxtResource.getText((uint32)5);
+		_subtitlesInfo.languageMode  = versionTxtResource.getText((uint32)3);
+		Common::String fontType      = versionTxtResource.getText((uint32)4);
+		_subtitlesInfo.fontName      = versionTxtResource.getText((uint32)5);
+		Common::String license       = versionTxtResource.getText((uint32)6);
+		Common::String licenseLink   = versionTxtResource.getText((uint32)7);
 
 		if (fontType.equalsIgnoreCase("ttf")) {
 			_subtitlesInfo.fontType = Subtitles::kSubtitlesFontTypeTTF;