move exif.cc into heifio

strukturag · Sep 18, 2024 · d9a358f · d9a358f
1 parent 98a97ba
commit d9a358f
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 11 deletions.
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
@@ -21,7 +21,6 @@ install(FILES heif-info.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
 
 add_executable(heif-dec ${getopt_sources}
         heif_dec.cc
-        ../libheif/exif.cc
         common.cc
         common.h)
 target_link_libraries(heif-dec PRIVATE heif heifio)
@@ -39,8 +38,6 @@ endif()
 
 add_executable(heif-enc ${getopt_sources}
         heif_enc.cc
-        ../libheif/exif.cc
-        ../libheif/exif.cc
         benchmark.h
         benchmark.cc
         common.cc
@@ -58,8 +55,6 @@ endif ()
 if (PNG_FOUND)
     add_executable(heif-thumbnailer ${getopt_sources}
             heif_thumbnailer.cc
-            ../libheif/exif.h
-            ../libheif/exif.cc
             common.cc
             common.h)
     target_link_libraries(heif-thumbnailer heif heifio)

diff --git a/examples/heif_enc.cc b/examples/heif_enc.cc
@@ -24,8 +24,9 @@
   SOFTWARE.
 */
 
-#include <errno.h>
-#include <string.h>
+#include <cassert>
+#include <cerrno>
+#include <cstring>
 #include <getopt.h>
 
 #include <fstream>
@@ -52,11 +53,9 @@
 #include "heifio/decoder_tiff.h"
 #endif
 
-#include "../heifio/decoder_y4m.h"
+#include "heifio/decoder_y4m.h"
 
-#include <assert.h>
 #include "benchmark.h"
-#include "exif.h"
 #include "common.h"
 
 int master_alpha = 1;

diff --git a/heifio/CMakeLists.txt b/heifio/CMakeLists.txt
@@ -8,7 +8,9 @@ add_library(heifio STATIC
         encoder.h
         encoder.cc
         encoder_y4m.h
-        encoder_y4m.cc)
+        encoder_y4m.cc
+        exif.h
+        exif.cc)
 
 target_link_libraries(heifio PRIVATE heif)
 

diff --git a/libheif/exif.cc → heifio/exif.cc b/libheif/exif.cc → heifio/exif.cc
diff --git a/libheif/exif.h → heifio/exif.h b/libheif/exif.h → heifio/exif.h