restructure folders to avoid possible namespace collision

Android.bp

@@ -36,15 +36,15 @@ cc_library {
     enabled: false,
     host_supported: true,
     vendor_available: true,
-    export_include_dirs: ["lib"],
-    local_include_dirs: ["lib"],
+    export_include_dirs: ["lib/include"],
+    local_include_dirs: ["lib/include"],
 
     srcs: [
-        "lib/icc.cpp",
-        "lib/jpegr.cpp",
-        "lib/gainmapmath.cpp",
-        "lib/jpegrutils.cpp",
-        "lib/multipictureformat.cpp",
+        "lib/src/icc.cpp",
+        "lib/src/jpegr.cpp",
+        "lib/src/gainmapmath.cpp",
+        "lib/src/jpegrutils.cpp",
+        "lib/src/multipictureformat.cpp",
     ],
 
     shared_libs: [
@@ -67,10 +67,10 @@ cc_library {
         "liblog",
     ],
 
-    export_include_dirs: ["lib"],
+    export_include_dirs: ["lib/include"],
 
     srcs: [
-        "lib/jpegencoderhelper.cpp",
+        "lib/src/jpegencoderhelper.cpp",
     ],
 }
 
@@ -85,9 +85,9 @@ cc_library {
         "liblog",
     ],
 
-    export_include_dirs: ["lib"],
+    export_include_dirs: ["lib/include"],
 
     srcs: [
-        "lib/jpegdecoderhelper.cpp",
+        "lib/src/jpegdecoderhelper.cpp",
     ],
 }

CMakeLists.txt

@@ -295,12 +295,12 @@ set_property(DIRECTORY PROPERTY ADDITIONAL_MAKE_CLEAN_FILES
 ###########################################################
 # File Lists
 ###########################################################
-file(GLOB UHDR_LIB_LIST "${SOURCE_DIR}/*.cpp")
+file(GLOB UHDR_LIB_LIST "${SOURCE_DIR}/src/*.cpp")
 file(GLOB UHDR_TEST_LIST "${TESTS_DIR}/*.cpp")
 file(GLOB UHDR_BM_LIST "${BENCHMARK_DIR}/*.cpp")
 file(GLOB IMAGE_IO_LIST "${THIRD_PARTY_DIR}/image_io/src/**/*.cc")
 
-set(COMMON_INCLUDE_LIST ${SOURCE_DIR} ${JPEG_INCLUDE_DIRS})
+set(COMMON_INCLUDE_LIST ${SOURCE_DIR}/include/ ${JPEG_INCLUDE_DIRS})
 set(COMMON_LIBS_LIST ${JPEG_LIBRARIES} Threads::Threads)
 
 ###########################################################

README.md

@@ -83,7 +83,7 @@ This will generate the following files under *{build_directory/Release}*:
     mkdir {build_directory}
     cd {build_directory}
     cmake -G "NMake Makefiles" -DUHDR_BUILD_TESTS=1 ../
-    cmake --build ./ --config=Release
+    cmake --build ./
     ctest
 
 This will generate the following files under *{build_directory}*:
@@ -132,5 +132,5 @@ Using libultrahdr
 libultrahdr includes two classes of APIs, one to compress and the other to
 decompress HDR images:
 
-- Refer to [jpegr.h](lib/jpegr.h) for detailed description of various encode and decode api.
+- Refer to [jpegr.h](lib/include/ultrahdr/jpegr.h) for detailed description of various encode and decode api.
 - Refer to [ultrahdr_app.cpp](examples/ultrahdr_app.cpp) for examples of its usage.

benchmark/benchmark_test.cpp

@@ -19,7 +19,7 @@
 
 #include <benchmark/benchmark.h>
 
-#include "jpegr.h"
+#include "ultrahdr/jpegr.h"
 
 using namespace ultrahdr;
 

examples/ultrahdr_app.cpp

@@ -27,9 +27,9 @@
 #include <fstream>
 #include <iostream>
 
-#include "ultrahdrcommon.h"
-#include "gainmapmath.h"
-#include "jpegr.h"
+#include "ultrahdr/ultrahdrcommon.h"
+#include "ultrahdr/gainmapmath.h"
+#include "ultrahdr/jpegr.h"
 
 using namespace ultrahdr;
 

fuzzer/ultrahdr_dec_fuzzer.cpp

@@ -18,7 +18,7 @@
 #include <iostream>
 #include <memory>
 
-#include "jpegr.h"
+#include "ultrahdr/jpegr.h"
 
 using namespace ultrahdr;
 

fuzzer/ultrahdr_enc_fuzzer.cpp

@@ -20,9 +20,9 @@
 #include <memory>
 #include <random>
 
-#include "ultrahdrcommon.h"
-#include "gainmapmath.h"
-#include "jpegr.h"
+#include "ultrahdr/ultrahdrcommon.h"
+#include "ultrahdr/gainmapmath.h"
+#include "ultrahdr/jpegr.h"
 
 using namespace ultrahdr;
 

lib/jpegr.h → lib/include/ultrahdr/jpegr.h

@@ -19,9 +19,9 @@
 
 #include <cfloat>
 
-#include "ultrahdr.h"
-#include "jpegdecoderhelper.h"
-#include "jpegencoderhelper.h"
+#include "ultrahdr/ultrahdr.h"
+#include "ultrahdr/jpegdecoderhelper.h"
+#include "ultrahdr/jpegencoderhelper.h"
 
 namespace ultrahdr {
 

lib/jpegrutils.h → lib/include/ultrahdr/jpegrutils.h

@@ -17,8 +17,8 @@
 #ifndef ULTRAHDR_JPEGRUTILS_H
 #define ULTRAHDR_JPEGRUTILS_H
 
-#include "ultrahdr.h"
-#include "jpegr.h"
+#include "ultrahdr/ultrahdr.h"
+#include "ultrahdr/jpegr.h"
 
 namespace ultrahdr {
 

lib/multipictureformat.h → lib/include/ultrahdr/multipictureformat.h

@@ -33,10 +33,10 @@
 #define Endian_SwapBE16(n) (n)
 #endif
 
-#include "ultrahdr.h"
-#include "jpegr.h"
-#include "gainmapmath.h"
-#include "jpegrutils.h"
+#include "ultrahdr/ultrahdr.h"
+#include "ultrahdr/jpegr.h"
+#include "ultrahdr/gainmapmath.h"
+#include "ultrahdr/jpegrutils.h"
 
 namespace ultrahdr {
 

lib/gainmapmath.cpp → lib/src/gainmapmath.cpp

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "gainmapmath.h"
+#include "ultrahdr/gainmapmath.h"
 
 namespace ultrahdr {
 

lib/icc.cpp → lib/src/icc.cpp

@@ -16,8 +16,8 @@
 
 #include <cstring>
 
-#include "ultrahdrcommon.h"
-#include "icc.h"
+#include "ultrahdr/ultrahdrcommon.h"
+#include "ultrahdr/icc.h"
 
 namespace ultrahdr {
 

lib/jpegdecoderhelper.cpp → lib/src/jpegdecoderhelper.cpp

@@ -19,9 +19,9 @@
 
 #include <cstring>
 
-#include "ultrahdrcommon.h"
-#include "ultrahdr.h"
-#include "jpegdecoderhelper.h"
+#include "ultrahdr/ultrahdrcommon.h"
+#include "ultrahdr/ultrahdr.h"
+#include "ultrahdr/jpegdecoderhelper.h"
 
 using namespace std;
 

lib/jpegencoderhelper.cpp → lib/src/jpegencoderhelper.cpp

@@ -18,9 +18,9 @@
 #include <memory>
 #include <string>
 
-#include "ultrahdrcommon.h"
-#include "ultrahdr.h"
-#include "jpegencoderhelper.h"
+#include "ultrahdr/ultrahdrcommon.h"
+#include "ultrahdr/ultrahdr.h"
+#include "ultrahdr/jpegencoderhelper.h"
 
 namespace ultrahdr {
 

lib/jpegr.cpp → lib/src/jpegr.cpp

@@ -27,10 +27,10 @@
 #include <mutex>
 #include <thread>
 
-#include "ultrahdrcommon.h"
-#include "jpegr.h"
-#include "icc.h"
-#include "multipictureformat.h"
+#include "ultrahdr/ultrahdrcommon.h"
+#include "ultrahdr/jpegr.h"
+#include "ultrahdr/icc.h"
+#include "ultrahdr/multipictureformat.h"
 
 #include "image_io/base/data_segment_data_source.h"
 #include "image_io/jpeg/jpeg_info.h"

lib/jpegrutils.cpp → lib/src/jpegrutils.cpp

@@ -17,9 +17,9 @@
 #include <algorithm>
 #include <cmath>
 
-#include "ultrahdrcommon.h"
-#include "jpegr.h"
-#include "jpegrutils.h"
+#include "ultrahdr/ultrahdrcommon.h"
+#include "ultrahdr/jpegr.h"
+#include "ultrahdr/jpegrutils.h"
 
 #include "image_io/xml/xml_reader.h"
 #include "image_io/xml/xml_writer.h"

lib/multipictureformat.cpp → lib/src/multipictureformat.cpp

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "multipictureformat.h"
+#include "ultrahdr/multipictureformat.h"
 
 namespace ultrahdr {
 size_t calculateMpfSize() {

tests/gainmapmath_test.cpp

@@ -17,7 +17,7 @@
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
 
-#include "gainmapmath.h"
+#include "ultrahdr/gainmapmath.h"
 
 namespace ultrahdr {
 

tests/icchelper_test.cpp

@@ -16,7 +16,7 @@
 
 #include <gtest/gtest.h>
 
-#include "icc.h"
+#include "ultrahdr/icc.h"
 
 namespace ultrahdr {
 

tests/jpegdecoderhelper_test.cpp

@@ -19,9 +19,9 @@
 #include <fstream>
 #include <iostream>
 
-#include "ultrahdrcommon.h"
-#include "jpegdecoderhelper.h"
-#include "icc.h"
+#include "ultrahdr/ultrahdrcommon.h"
+#include "ultrahdr/jpegdecoderhelper.h"
+#include "ultrahdr/icc.h"
 
 namespace ultrahdr {
 

tests/jpegencoderhelper_test.cpp

@@ -19,9 +19,9 @@
 #include <fstream>
 #include <iostream>
 
-#include "ultrahdrcommon.h"
-#include "ultrahdr.h"
-#include "jpegencoderhelper.h"
+#include "ultrahdr/ultrahdrcommon.h"
+#include "ultrahdr/ultrahdr.h"
+#include "ultrahdr/jpegencoderhelper.h"
 
 namespace ultrahdr {
 

tests/jpegr_test.cpp

@@ -24,9 +24,9 @@
 #include <fstream>
 #include <iostream>
 
-#include "ultrahdrcommon.h"
-#include "jpegr.h"
-#include "jpegrutils.h"
+#include "ultrahdr/ultrahdrcommon.h"
+#include "ultrahdr/jpegr.h"
+#include "ultrahdr/jpegrutils.h"
 
 //#define DUMP_OUTPUT