Merge branch '2.1.0' of https://github.com/CasparCG/Server into 2.1.0

diff --git a/modules/image/consumer/image_consumer.cpp b/modules/image/consumer/image_consumer.cpp
index fd4348058443dec1e7f65534a83b18cf618fd03c..ab466f046ce6e804d9ba718db0f795da577a0a2e 100644 (file)
--- a/modules/image/consumer/image_consumer.cpp
+++ b/modules/image/consumer/image_consumer.cpp
@@ -66,7 +66,11 @@ void write_cropped_png(
 
        std::copy(thumbnail_view.begin(), thumbnail_view.end(), destination_view.begin());
        FreeImage_FlipVertical(bitmap.get());
+#ifdef WIN32
        FreeImage_SaveU(FIF_PNG, bitmap.get(), output_file.wstring().c_str(), 0);
+#else
+       FreeImage_Save(FIF_PNG, bitmap.get(), u8(output_file.wstring()).c_str(), 0);
+#endif
 }
 
 struct image_consumer : public core::frame_consumer