From 525cdc663afda3c2c95081201ce4c6a007a390e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Garramu=C3=B1o?= Date: Sat, 23 Sep 2023 01:45:57 -0300 Subject: [PATCH] Fixed image flip 6. --- CMakeLists.txt | 7 ------- lib/tlIO/RAWRead.cpp | 8 ++++---- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b9cb5edbf..27e488c37 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -36,7 +36,6 @@ set(TLRENDER_STB TRUE CACHE BOOL "Enable support for STB I/O (TGA, BMP, PSD)") set(TLRENDER_PNG TRUE CACHE BOOL "Enable support for PNG I/O") set(TLRENDER_EXR TRUE CACHE BOOL "Enable support for EXR I/O") set(TLRENDER_FFMPEG TRUE CACHE BOOL "Enable support for FFmpeg I/O") -set(TLRENDER_X264 TRUE CACHE BOOL "Enable support for x264") set(TLRENDER_USD FALSE CACHE BOOL "Enable support for USD") set(TLRENDER_RAW TRUE CACHE BOOL "Enable support for LibRaw") set(TLRENDER_BMD FALSE CACHE BOOL "Enable support for Blackmagic Design devices") @@ -207,12 +206,6 @@ if(TLRENDER_RAW) add_definitions(-DTLRENDER_RAW) endif() endif() -if(TLRENDER_X264) - find_package(X264) - if(X264_FOUND) - add_definitions(-DTLRENDER_X264) - endif() -endif() # Python dependencies if(TLRENDER_PYTHON) diff --git a/lib/tlIO/RAWRead.cpp b/lib/tlIO/RAWRead.cpp index 58aa5a75f..4d2ad61f1 100644 --- a/lib/tlIO/RAWRead.cpp +++ b/lib/tlIO/RAWRead.cpp @@ -82,15 +82,15 @@ namespace tl const libraw_imgother_t& other(iProcessor->imgdata.other); switch(sizes.flip) { - case 5: + case 5: // 90 deg counter clockwise + case 6: // 90 deg clockwise info.layout.mirror.y = true; - case 6: info.size.h = sizes.width; info.size.w = sizes.height; break; - case 0: + case 0: // no rotation info.layout.mirror.y = true; - case 3: // no rotation + case 3: // 180 degree rotation default: info.size.w = sizes.width; info.size.h = sizes.height;