From: Helge Norberg <helge.norberg@svt.se>
Date: Tue, 12 Apr 2016 08:18:23 +0000 (+0200)
Subject: Merge branch '2.1.0' of https://github.com/CasparCG/Server into 2.1.0
X-Git-Tag: 2.1.0_Beta1~85
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=a660f13c38fbd89c3db2169449baa5e2268db815;hp=d97664b1a327c7486bb737b452f776359aa0045d;p=casparcg

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 fd4348058..ab466f046 100644
--- 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