Improve compatibility for more recent magick versions

Author: oli414

rct-graphics-helper/builders/scene_builder.py

@@ -98,7 +98,7 @@ def create_camera(self, context):
     def create_main_light(self, context):
         lamp_data = self.create_lamp_data(context, "MainLight", "SUN")
 
-        lamp_data.energy = 1.2
+        lamp_data.energy = 1.5
         lamp_data.use_specular = True
         lamp_data.use_diffuse = True
         lamp_data.shadow_method = "RAY_SHADOW"

rct-graphics-helper/magick_command.py

@@ -26,7 +26,7 @@ def write_to_cache(self, id, delete_previous=False, next_file=""):
     # Quantizes the image using a palette
     def quantize(self, palette, amount):
         self.full_command += " -dither FloydSteinberg -define dither:diffusion-amount=" + str(amount) + "% -remap " + \
-            self.__stringify_input(palette) + " -colorspace sRGB"
+            self.__stringify_input(palette) + " -depth 16"
 
     # Trims the image to the smallest possible size and outputs the offset difference
     def trim(self):
@@ -77,6 +77,9 @@ def copy_alpha(self, alpha_source):
             " ) ( " + \
             mask + " ) -compose CopyOpacity -composite"
 
+    def set_bit_depth(self, depth):
+        self.full_command += " -depth " + str(depth)
+
     # Gets the cli command to perform the ImageMagick operation
 
     def get_command_string(self, magick_path, output):

rct-graphics-helper/processors/frame_processors/merge_masks_processor.py

@@ -41,7 +41,7 @@ def process(self, frame, callback=None):
 
             if frame.use_anti_aliasing:
                 merged_tile_indices = MagickCommand(tile_index_aa_meta_output)
-                merged_tile_indices.combine("mpr:ti_naa")
+                merged_tile_indices.combine(tile_indices)
 
                 tile_indices = merged_tile_indices