Skip to content

Commit 6284b36

Browse files
fix: Respect EXIF rotate flag (#1568)
1 parent 98dba38 commit 6284b36

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/modules/image/util/image_loader.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@ std::shared_ptr<FIBITMAP> load_image(const std::wstring& filename)
6666
CASPAR_THROW_EXCEPTION(invalid_argument() << msg_info("Unsupported image format."));
6767

6868
#ifdef WIN32
69-
auto bitmap = std::shared_ptr<FIBITMAP>(FreeImage_LoadU(fif, filename.c_str(), 0), FreeImage_Unload);
69+
auto bitmap = std::shared_ptr<FIBITMAP>(FreeImage_LoadU(fif, filename.c_str(), JPEG_EXIFROTATE), FreeImage_Unload);
7070
#else
71-
auto bitmap = std::shared_ptr<FIBITMAP>(FreeImage_Load(fif, u8(filename).c_str(), 0), FreeImage_Unload);
71+
auto bitmap = std::shared_ptr<FIBITMAP>(FreeImage_Load(fif, u8(filename).c_str(), JPEG_EXIFROTATE), FreeImage_Unload);
7272
#endif
7373

7474
if (FreeImage_GetBPP(bitmap.get()) != 32) {
@@ -94,7 +94,7 @@ std::shared_ptr<FIBITMAP> load_png_from_memory(const void* memory_location, size
9494
auto memory = std::unique_ptr<FIMEMORY, decltype(&FreeImage_CloseMemory)>(
9595
FreeImage_OpenMemory(static_cast<BYTE*>(const_cast<void*>(memory_location)), static_cast<DWORD>(size)),
9696
FreeImage_CloseMemory);
97-
auto bitmap = std::shared_ptr<FIBITMAP>(FreeImage_LoadFromMemory(fif, memory.get(), 0), FreeImage_Unload);
97+
auto bitmap = std::shared_ptr<FIBITMAP>(FreeImage_LoadFromMemory(fif, memory.get(), JPEG_EXIFROTATE), FreeImage_Unload);
9898

9999
if (FreeImage_GetBPP(bitmap.get()) != 32) {
100100
bitmap = std::shared_ptr<FIBITMAP>(FreeImage_ConvertTo32Bits(bitmap.get()), FreeImage_Unload);

0 commit comments

Comments
 (0)