Добавлена возможность указывать WatermarkImage в calculate секции

src/plugins/splash/two-step/plugin.c

@@ -161,6 +161,7 @@ struct _ply_boot_splash_plugin
 
         double                              watermark_horizontal_alignment;
         double                              watermark_vertical_alignment;
+        char                               *watermark_imagename;
 
         double                              animation_horizontal_alignment;
         double                              animation_vertical_alignment;
@@ -1198,6 +1199,10 @@ load_mode_settings (ply_boot_splash_plugin_t *plugin,
                 plugin->use_firmware_background = true;
 
         settings->watermark_imagename = ply_key_file_get_value (key_file, group_name, "WatermarkImage");
+        if( settings->watermark_imagename == NULL &&
+            plugin->watermark_imagename != NULL )
+            settings->watermark_imagename = strdup(plugin->watermark_imagename);
+
         settings->title = ply_key_file_get_value (key_file, group_name, "Title");
         settings->subtitle = ply_key_file_get_value (key_file, group_name, "SubTitle");
 
@@ -1359,6 +1364,8 @@ create_plugin (ply_key_file_t *key_file)
                                        "ProgressBarHeight",
                                        PROGRESS_BAR_HEIGHT);
 
+        plugin->watermark_imagename = ply_key_file_get_value (key_file, "calculate", "WatermarkImage");
+
         load_mode_settings (plugin, key_file, "boot-up", PLY_BOOT_SPLASH_MODE_BOOT_UP);
         load_mode_settings (plugin, key_file, "shutdown", PLY_BOOT_SPLASH_MODE_SHUTDOWN);
         load_mode_settings (plugin, key_file, "reboot", PLY_BOOT_SPLASH_MODE_REBOOT);
@@ -1461,6 +1468,7 @@ destroy_plugin (ply_boot_splash_plugin_t *plugin)
 
         for (i = 0; i < PLY_BOOT_SPLASH_MODE_COUNT; i++) {
                 free (plugin->mode_settings[i].title);
+                free (plugin->mode_settings[i].watermark_imagename);
                 free (plugin->mode_settings[i].subtitle);
                 free (plugin->mode_settings[i].animation_vertical_alignment_type);
         }
@@ -1469,6 +1477,7 @@ destroy_plugin (ply_boot_splash_plugin_t *plugin)
         free (plugin->title_font);
         free (plugin->animation_vertical_alignment_type);
         free (plugin->animation_dir);
+        free (plugin->watermark_imagename);
         free_views (plugin);
         free (plugin);
 }