Add support jpeg Exif.Image.Orientation (fix aseprite#2525)

Added tinyexif submodule also.
Gasparoken · Oct 8, 2024 · 77754dc · 77754dc
1 parent 3848134
commit 77754dc
Show file tree

Hide file tree

Showing 5 changed files with 110 additions and 12 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -81,3 +81,6 @@
 [submodule "third_party/tinyxml2"]
 	path = third_party/tinyxml2
 	url = https://github.com/aseprite/tinyxml2.git
+[submodule "third_party/tinyexif"]
+	path = third_party/tinyexif
+	url = https://github.com/aseprite/tinyexif.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -43,8 +43,9 @@ option(USE_SHARED_GIFLIB  "Use your installed copy of giflib" off)
 option(USE_SHARED_JPEGLIB "Use your installed copy of jpeglib" off)
 option(USE_SHARED_ZLIB    "Use your installed copy of zlib" off)
 option(USE_SHARED_LIBPNG  "Use your installed copy of libpng" off)
-option(USE_SHARED_TINYXML "Use your installed copy of tinyxml" off)
-option(USE_SHARED_PIXMAN  "Use your installed copy of pixman" off)
+# option(USE_SHARED_TINYEXIF "Use your installed copy of tinyexif" off)
+option(USE_SHARED_TINYXML  "Use your installed copy of tinyxml" off)
+option(USE_SHARED_PIXMAN   "Use your installed copy of pixman" off)
 option(USE_SHARED_FREETYPE "Use shared FreeType library" off)
 option(USE_SHARED_HARFBUZZ "Use shared HarfBuzz library" off)
 option(ENABLE_ASEPRITE_EXE "Compile main Aseprite executable" on)
@@ -165,6 +166,7 @@ set(PIXMAN_DIR          ${CMAKE_CURRENT_SOURCE_DIR}/third_party/pixman)
 set(FREETYPE_DIR        ${CMAKE_CURRENT_SOURCE_DIR}/third_party/freetype2)
 set(HARFBUZZ_DIR        ${CMAKE_CURRENT_SOURCE_DIR}/third_party/harfbuzz)
 set(SIMPLEINI_DIR       ${CMAKE_CURRENT_SOURCE_DIR}/third_party/simpleini)
+set(TINYEXIF_DIR        ${CMAKE_CURRENT_SOURCE_DIR}/third_party/tinyexif)
 set(TINYXML_DIR         ${CMAKE_CURRENT_SOURCE_DIR}/third_party/tinyxml2)
 set(ZLIB_DIR            ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zlib)
 
@@ -227,6 +229,16 @@ endif()
 include_directories(${PNG_INCLUDE_DIRS})
 add_definitions(-DPNG_NO_MMX_CODE) # Do not use MMX optimizations in PNG code
 
+# tinyexif
+# if(USE_SHARED_TINYEXIF)
+#   find_library(TINYEXIF_LIBRARY NAMES tinyexif)
+#   find_path(TINYEXIF_INCLUDE_DIR NAMES TinyEXIF.h)
+# else()
+#   set(TINYXML_LIBRARY tinyexif)
+#   set(TINYXML_INCLUDE_DIR ${TINYEXIF_DIR})
+# endif()
+# include_directories(${TINYEXIF_INCLUDE_DIR})
+
 # tinyxml2
 if(USE_SHARED_TINYXML)
   find_library(TINYXML_LIBRARY NAMES tinyxml2)
@@ -278,6 +290,13 @@ else()
 endif()
 include_directories(${GIF_INCLUDE_DIRS})
 
+set(TINYEXIF_FOUND ON)
+set(TINYEXIF_INCLUDE_DIR ${TINYEXIF_DIR})
+set(TINYEXIF_LIBRARY tinyexif CACHE FILEPATH "")
+set(TINYEXIF_LIBRARIES ${TINYEXIF_LIBRARY})
+set(TINYEXIF_INCLUDE_DIRS ${TINYEXIF_INCLUDE_DIR})
+include_directories(${TINYEXIF_INCLUDE_DIRS})
+
 if(USE_SHARED_JPEGLIB)
   find_package(JPEG REQUIRED)
 else()

diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
@@ -745,6 +745,7 @@ target_link_libraries(app-lib
   updater-lib
   undo
   ${CMARK_LIBRARIES}
+  # ${TINYEXIF_LIBRARY}
   ${TINYXML_LIBRARY}
   ${JPEG_LIBRARIES}
   ${GIF_LIBRARIES}
@@ -754,7 +755,8 @@ target_link_libraries(app-lib
   archive_static
   fmt
   tinyexpr
-  qoi)
+  qoi
+  tinyexif)
 
 if(ENABLE_WEBP AND WEBP_FOUND)
   target_link_libraries(app-lib ${WEBP_LIBRARIES})

diff --git a/src/app/file/jpeg_format.cpp b/src/app/file/jpeg_format.cpp
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2018-2023  Igara Studio S.A.
+// Copyright (C) 2018-2024  Igara Studio S.A.
 // Copyright (C) 2001-2018  David Capello
 //
 // This program is distributed under the terms of
@@ -31,6 +31,7 @@
 #include "jpeg_options.xml.h"
 
 #include "jpeglib.h"
+#include "TinyEXIF.h"
 
 namespace app {
 
@@ -177,12 +178,19 @@ bool JpegFormat::onLoad(FileOp* fop)
   // Start decompressor.
   jpeg_start_decompress(&dinfo);
 
+  // Get orientation:
+  TinyEXIF::EXIFInfo info;
+  info.parseFrom(file->_bf._base, file->_bf._size);
+  int orientation = info.Orientation;
+
+  int outputW = (orientation < 5 ? dinfo.output_width : dinfo.output_height);
+  int outputH = (orientation < 5 ? dinfo.output_height : dinfo.output_width);
   // Create the image.
   ImageRef image = fop->sequenceImageToLoad(
     (dinfo.out_color_space == JCS_RGB ? IMAGE_RGB:
                                         IMAGE_GRAYSCALE),
-    dinfo.output_width,
-    dinfo.output_height);
+    outputW,
+    outputH);
   if (!image) {
     jpeg_destroy_decompress(&dinfo);
     return false;
@@ -217,6 +225,61 @@ bool JpegFormat::onLoad(FileOp* fop)
   while (dinfo.output_scanline < dinfo.output_height) {
     num_scanlines = jpeg_read_scanlines(&dinfo, buffer, buffer_height);
 
+    // Orientation function/variables adjust
+    std::function<int(int)> start_dst_x;
+    std::function<int(int)> start_dst_y;
+    int next_addr_increment = 1;
+    switch (orientation) {
+      case 2:
+        start_dst_x = [image](int y) { return image->width() - 1; };
+        start_dst_y = [dinfo](int y) {
+          return dinfo.output_scanline - 1 + y; };
+        next_addr_increment = -1;
+        break;
+      case 3:
+        start_dst_x = [image](int y) { return image->width() - 1; };
+        start_dst_y = [image, dinfo](int y) {
+          return image->height() - dinfo.output_scanline + y; };
+        next_addr_increment = -1;
+        break;
+      case 4:
+        start_dst_x = [](int y) { return 0; };
+        start_dst_y = [image, dinfo](int y) {
+          return image->height() - dinfo.output_scanline - y; };
+        next_addr_increment = 1;
+        break;
+      case 5:
+        start_dst_x = [dinfo](int y) {
+          return dinfo.output_scanline - 1 + y; };
+        start_dst_y = [](int y) { return 0; };
+        next_addr_increment = image->width();
+        break;
+      case 6:
+        start_dst_x = [image, dinfo](int y) {
+          return image->width() - dinfo.output_scanline - y; };
+        start_dst_y = [](int y) { return 0; };
+        next_addr_increment = image->width();
+        break;
+      case 7:
+        start_dst_x = [image, dinfo](int y) {
+          return image->width() - dinfo.output_scanline - y; };
+        start_dst_y = [image](int y) { return image->height() - 1; };
+        next_addr_increment = -image->width();
+        break;
+      case 8:
+        start_dst_x = [dinfo](int y) {
+          return dinfo.output_scanline - 1 + y; };
+        start_dst_y = [image](int y) { return image->height() - 1; };
+        next_addr_increment = -image->width();
+        break;
+      default:
+        start_dst_x = [](int y) { return 0; };
+        start_dst_y = [dinfo](int y) {
+          return dinfo.output_scanline - 1 + y; };
+        next_addr_increment = 1;
+        break;
+    }
+
     // RGB
     if (image->pixelFormat() == IMAGE_RGB) {
       uint8_t* src_address;
@@ -225,13 +288,14 @@ bool JpegFormat::onLoad(FileOp* fop)
 
       for (y=0; y<(int)num_scanlines; y++) {
         src_address = ((uint8_t**)buffer)[y];
-        dst_address = (uint32_t*)image->getPixelAddress(0, dinfo.output_scanline-1+y);
+        dst_address = (uint32_t*)image->getPixelAddress(start_dst_x(y), start_dst_y(y));
 
-        for (x=0; x<image->width(); x++) {
+        for (x=0; x<dinfo.output_width; x++) {
           r = *(src_address++);
           g = *(src_address++);
           b = *(src_address++);
-          *(dst_address++) = rgba(r, g, b, 255);
+          *dst_address = rgba(r, g, b, 255);
+          dst_address += next_addr_increment;
         }
       }
     }
@@ -243,10 +307,12 @@ bool JpegFormat::onLoad(FileOp* fop)
 
       for (y=0; y<(int)num_scanlines; y++) {
         src_address = ((uint8_t**)buffer)[y];
-        dst_address = (uint16_t*)image->getPixelAddress(0, dinfo.output_scanline-1+y);
+        dst_address = (uint16_t*)image->getPixelAddress(start_dst_x(y), start_dst_y(y));
 
-        for (x=0; x<image->width(); x++)
-          *(dst_address++) = graya(*(src_address++), 255);
+        for (x=0; x<dinfo.output_width; x++) {
+          *dst_address = graya(*(src_address++), 255);
+          dst_address += next_addr_increment;
+        }
       }
     }
 

diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt
@@ -53,6 +53,14 @@ if(ENABLE_WEBP AND NOT LAF_BACKEND STREQUAL "skia")
   endif()
 endif()
 
+# Jpeg exif fields
+add_subdirectory(tinyexif)
+
+# if(NOT USE_SHARED_TINYEXIF)
+#   set(tinyexif_BUILD_TESTING OFF CACHE BOOL "Build tests for tinyexif")
+#   add_subdirectory(tinyexif)
+# endif()
+
 if(NOT USE_SHARED_TINYXML)
   set(tinyxml2_BUILD_TESTING OFF CACHE BOOL "Build tests for tinyxml2")
   add_subdirectory(tinyxml2)