Merge pull request #4363 from kepstin/bbb-20-rec-fixes

RnP: Don't fail processing if an image can't be converted to png

record-and-playback/core/lib/recordandplayback/generators/presentation.rb

@@ -71,7 +71,12 @@ module BigBlueButton
     def self.convert_image_to_png(image, png_image, resize = '800x600')
       BigBlueButton.logger.info("Task: Converting image to .png")
       command = "convert #{image} -resize #{resize} -background white -flatten #{png_image}"
-      BigBlueButton.execute(command)
+      status = BigBlueButton.execute(command, false)
+      if !status.success? or !File.exist?(png_image)
+        # If image conversion failed, generate a blank white image
+        command = "convert -size #{resize} xc:white -quality 90 +dither -depth 8 -colors 256 #{png_image}"
+        BigBlueButton.execute(command)
+      end
     end
 
     # Gathers the text from the slide

record-and-playback/presentation/scripts/process/presentation.rb

@@ -190,9 +190,8 @@ if not FileTest.directory?(target_dir)
         end
       else
         ext = File.extname("#{images[0]}")
-        #BigBlueButton::Presentation.convert_image_to_png(images[0],"#{target_pres_dir}/slide-1.png")
-        command="convert #{images[0]} -resize 1600x1200 -background white -flatten #{target_pres_dir}/slide-1.png"
-        BigBlueButton.execute(command)
+        BigBlueButton::Presentation.convert_image_to_png(
+          images[0], "#{target_pres_dir}/slide-1.png", '1600x1200')
       end
 
       # Copy thumbnails from raw files