Fixed the bmp loading warning issue of Mario.rte using pyvips + np + PIL, instead of redirecting the warning away from the terminal. Closes #41.

Author: MyNameIsTrez

Python/palette.py

@@ -1,9 +1,27 @@
-import os, sys, io, cv2
+import os, sys, io
 
+import numpy as np
 from PIL import Image
 
 
-palette = Image.open(os.path.join("Media", "palette.bmp")).getpalette()
+def load_vips_env():
+	# pyvips from pip doesn't seem to work, unzip the latest vips-dev-w64-all.zip instead from https://github.com/libvips/libvips/releases.
+	vipshome = 'c:\\vips-dev-8.10\\bin'
+	os.environ['PATH'] = vipshome + ';' + os.environ['PATH']
+
+load_vips_env()
+
+import pyvips
+
+
+# TODO: Move to shared_globals.py
+def resource_path(relative_path):
+	if hasattr(sys, '_MEIPASS'):
+		return os.path.join(sys._MEIPASS, relative_path)
+	return os.path.join(os.path.abspath("."), relative_path)
+
+
+palette = Image.open(resource_path(os.path.join("Media", "palette.bmp"))).getpalette()
 
 
 def is_input_image(full_filename):
@@ -15,61 +33,43 @@ def process_image(full_filename, input_image_path, output_image_path):
 
 	old_img = get_old_img(input_image_path)
 
-	# scale = 1
-	# old_img = old_img.resize((int(old_img.width * scale), int(old_img.height * scale)))
+	scale = 1
+	old_img = old_img.resize((int(old_img.width * scale), int(old_img.height * scale)))
 
-	# # putpalette() always expects 256 * 3 ints.
-	# for k in range(256 - int(len(palette) / 3)):
-	# 	for j in range(3):
-	# 		palette.append(palette[j])
+	# putpalette() always expects 256 * 3 ints.
+	for k in range(256 - int(len(palette) / 3)):
+		for j in range(3):
+			palette.append(palette[j])
 
-	# palette_img = Image.new('P', (1, 1))
-	# palette_img.putpalette(palette)
-	# new_img = old_img.convert(mode="RGB").quantize(palette=palette_img, dither=False)
+	palette_img = Image.new('P', (1, 1))
+	palette_img.putpalette(palette)
+	new_img = old_img.convert(mode="RGB").quantize(palette=palette_img, dither=False)
 
-	# new_img.save(os.path.splitext(output_image_path)[0] + ".png")
+	new_img.save(os.path.splitext(output_image_path)[0] + ".png")
 
 
 def get_old_img(input_image_path):
-	# This prevents cv2 from printing warnings to the terminal.
-	# TODO: Fix the cv2 and PIL bmp reading issue instead of redirecting a warning away from the terminal.
-	with suppress_stdout_stderr():
-		# A bmp threw an "Unsupported BMP compression (1)" with Image.open(), so we open it in cv2 first.
-		# cv2 solution: https://stackoverflow.com/a/52416250/13279557
-		# cv2 to PIL:   https://stackoverflow.com/a/43234001/13279557
-		# old_img = Image.fromarray(cv2.imread(input_image_path)) # TODO: This may work just as well as the line below for all cases.
-		old_img = Image.fromarray(cv2.cvtColor(cv2.imread(input_image_path), cv2.COLOR_BGR2RGB))
-
-	return old_img
-
-
-# This stackoverflow's question answers itself in the question with the solution to getting rid of "libpng warning: iCCP: known incorrect sRGB profile".
-# https://stackoverflow.com/q/11130156/13279557
-class suppress_stdout_stderr(object):
-    '''
-    A context manager for doing a "deep suppression" of stdout and stderr in 
-    Python, i.e. will suppress all print, even if the print originates in a 
-    compiled C/Fortran sub-function.
-    	This will not suppress raised exceptions, since exceptions are printed
-    to stderr just before a script exits, and after the context manager has
-    exited (at least, I think that is why it lets exceptions through).      
-
-    '''
-    def __init__(self):
-        # Open a pair of null files
-        self.null_fds =  [os.open(os.devnull,os.O_RDWR) for x in range(2)]
-        # Save the actual stdout (1) and stderr (2) file descriptors.
-        self.save_fds = [os.dup(1), os.dup(2)]
-
-    def __enter__(self):
-        # Assign the null pointers to stdout and stderr.
-        os.dup2(self.null_fds[0],1)
-        os.dup2(self.null_fds[1],2)
-
-    def __exit__(self, *_):
-        # Re-assign the real stdout/stderr back to (1) and (2)
-        os.dup2(self.save_fds[0],1)
-        os.dup2(self.save_fds[1],2)
-        # Close all file descriptors
-        for fd in self.null_fds + self.save_fds:
-            os.close(fd)
+	# pyvips acts as a substitute for PIL and cv2, because both of those can throw a warning in the terminal with RLE bmps.
+	pyvips_img = pyvips.Image.new_from_file(input_image_path, access='sequential')
+	np_img = vips2numpy(pyvips_img)
+	return Image.fromarray(np.uint8(np_img))
+
+
+format_to_np_dtype = {
+    'uchar': np.uint8,
+    'char': np.int8,
+    'ushort': np.uint16,
+    'short': np.int16,
+    'uint': np.uint32,
+    'int': np.int32,
+    'float': np.float32,
+    'double': np.float64,
+    'complex': np.complex64,
+    'dpcomplex': np.complex128,
+}
+
+
+def vips2numpy(vi):
+	return np.ndarray(buffer=vi.write_to_memory(),
+						dtype=format_to_np_dtype[vi.format],
+						shape=[vi.height, vi.width, vi.bands])

foo.py

@@ -0,0 +1,38 @@
+import os
+
+import numpy as np
+from PIL import Image
+
+def load_vips_env():
+    vipshome = 'c:\\vips-dev-8.10\\bin'
+    os.environ['PATH'] = vipshome + ';' + os.environ['PATH']
+
+load_vips_env()
+
+import pyvips
+
+def get_old_img(input_image_path):
+    # pyvips acts as a substitute for PIL and cv2, because both of those can throw a warning in the terminal with RLE bmps.
+    pyvips_img = pyvips.Image.new_from_file(input_image_path, access='sequential')
+    np_img = vips2numpy(pyvips_img)
+    return Image.fromarray(np.uint8(np_img))
+
+format_to_np_dtype = {
+    'uchar': np.uint8,
+    'char': np.int8,
+    'ushort': np.uint16,
+    'short': np.int16,
+    'uint': np.uint32,
+    'int': np.int32,
+    'float': np.float32,
+    'double': np.float64,
+    'complex': np.complex64,
+    'dpcomplex': np.complex128,
+}
+
+def vips2numpy(vi):
+    return np.ndarray(buffer=vi.write_to_memory(),
+                        dtype=format_to_np_dtype[vi.format],
+                        shape=[vi.height, vi.width, vi.bands])
+
+get_old_img("input.bmp").show()

main.py

@@ -1,5 +1,5 @@
 # Run manually: python main.py
-# Build EXE: pyinstaller --noconsole --onefile --icon="Media/legacy-mod-converter.ico" --add-data="Media/github-icon.png;Media" --add-data="Media/discord-icon.png;Media" --add-data="Media/finish.wav;Media" --name="Legacy Mod Converter" main.py
+# Build EXE: pyinstaller --noconsole --onefile --icon="Media/legacy-mod-converter.ico" --add-data="Media/github-icon.png;Media" --add-data="Media/discord-icon.png;Media" --add-data="Media/finish.wav;Media" --add-data="Media/palette.bmp;Media" --name="Legacy Mod Converter" main.py
 
 from Python import gui
 

requirements.txt

@@ -4,4 +4,6 @@ pyinstaller
 jsoncomment
 Pillow
 opencv-python
+numpy
+pyvips # You also need to unzip the latest vips-dev-w64-all.zip from https://github.com/libvips/libvips/releases and use the path in palette.py's load_vips_env().
 # python3 needs sudo apt-get install python3-tk