diff --git a/Android.bp b/Android.bp index d3cb33eb..ce5f3a0f 100644 --- a/Android.bp +++ b/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", ], } diff --git a/CMakeLists.txt b/CMakeLists.txt index 84091f41..857972a2 100644 --- a/CMakeLists.txt +++ b/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) ########################################################### diff --git a/README.md b/README.md index 27e5361d..5c341b3b 100644 --- a/README.md +++ b/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. diff --git a/benchmark/benchmark_test.cpp b/benchmark/benchmark_test.cpp index e9f95333..d0138387 100644 --- a/benchmark/benchmark_test.cpp +++ b/benchmark/benchmark_test.cpp @@ -19,7 +19,7 @@ #include -#include "jpegr.h" +#include "ultrahdr/jpegr.h" using namespace ultrahdr; diff --git a/examples/ultrahdr_app.cpp b/examples/ultrahdr_app.cpp index f3fd3721..43b4b507 100644 --- a/examples/ultrahdr_app.cpp +++ b/examples/ultrahdr_app.cpp @@ -27,9 +27,9 @@ #include #include -#include "ultrahdrcommon.h" -#include "gainmapmath.h" -#include "jpegr.h" +#include "ultrahdr/ultrahdrcommon.h" +#include "ultrahdr/gainmapmath.h" +#include "ultrahdr/jpegr.h" using namespace ultrahdr; diff --git a/fuzzer/ultrahdr_dec_fuzzer.cpp b/fuzzer/ultrahdr_dec_fuzzer.cpp index 0e9c5d3b..49dc9135 100644 --- a/fuzzer/ultrahdr_dec_fuzzer.cpp +++ b/fuzzer/ultrahdr_dec_fuzzer.cpp @@ -18,7 +18,7 @@ #include #include -#include "jpegr.h" +#include "ultrahdr/jpegr.h" using namespace ultrahdr; diff --git a/fuzzer/ultrahdr_enc_fuzzer.cpp b/fuzzer/ultrahdr_enc_fuzzer.cpp index db6021ed..23cc845b 100644 --- a/fuzzer/ultrahdr_enc_fuzzer.cpp +++ b/fuzzer/ultrahdr_enc_fuzzer.cpp @@ -20,9 +20,9 @@ #include #include -#include "ultrahdrcommon.h" -#include "gainmapmath.h" -#include "jpegr.h" +#include "ultrahdr/ultrahdrcommon.h" +#include "ultrahdr/gainmapmath.h" +#include "ultrahdr/jpegr.h" using namespace ultrahdr; diff --git a/lib/gainmapmath.h b/lib/include/ultrahdr/gainmapmath.h similarity index 100% rename from lib/gainmapmath.h rename to lib/include/ultrahdr/gainmapmath.h diff --git a/lib/icc.h b/lib/include/ultrahdr/icc.h similarity index 100% rename from lib/icc.h rename to lib/include/ultrahdr/icc.h diff --git a/lib/jpegdecoderhelper.h b/lib/include/ultrahdr/jpegdecoderhelper.h similarity index 100% rename from lib/jpegdecoderhelper.h rename to lib/include/ultrahdr/jpegdecoderhelper.h diff --git a/lib/jpegencoderhelper.h b/lib/include/ultrahdr/jpegencoderhelper.h similarity index 100% rename from lib/jpegencoderhelper.h rename to lib/include/ultrahdr/jpegencoderhelper.h diff --git a/lib/jpegr.h b/lib/include/ultrahdr/jpegr.h similarity index 99% rename from lib/jpegr.h rename to lib/include/ultrahdr/jpegr.h index 5c8f9c3c..8ac227d4 100644 --- a/lib/jpegr.h +++ b/lib/include/ultrahdr/jpegr.h @@ -19,9 +19,9 @@ #include -#include "ultrahdr.h" -#include "jpegdecoderhelper.h" -#include "jpegencoderhelper.h" +#include "ultrahdr/ultrahdr.h" +#include "ultrahdr/jpegdecoderhelper.h" +#include "ultrahdr/jpegencoderhelper.h" namespace ultrahdr { diff --git a/lib/jpegrutils.h b/lib/include/ultrahdr/jpegrutils.h similarity index 98% rename from lib/jpegrutils.h rename to lib/include/ultrahdr/jpegrutils.h index c3fa8ab1..d5bfa0b2 100644 --- a/lib/jpegrutils.h +++ b/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 { diff --git a/lib/multipictureformat.h b/lib/include/ultrahdr/multipictureformat.h similarity index 95% rename from lib/multipictureformat.h rename to lib/include/ultrahdr/multipictureformat.h index 888f2337..9a9141bd 100644 --- a/lib/multipictureformat.h +++ b/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 { diff --git a/lib/ultrahdr.h b/lib/include/ultrahdr/ultrahdr.h similarity index 100% rename from lib/ultrahdr.h rename to lib/include/ultrahdr/ultrahdr.h diff --git a/lib/ultrahdrcommon.h b/lib/include/ultrahdr/ultrahdrcommon.h similarity index 100% rename from lib/ultrahdrcommon.h rename to lib/include/ultrahdr/ultrahdrcommon.h diff --git a/lib/gainmapmath.cpp b/lib/src/gainmapmath.cpp similarity index 99% rename from lib/gainmapmath.cpp rename to lib/src/gainmapmath.cpp index 23791c2c..8ace1e70 100644 --- a/lib/gainmapmath.cpp +++ b/lib/src/gainmapmath.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "gainmapmath.h" +#include "ultrahdr/gainmapmath.h" namespace ultrahdr { diff --git a/lib/icc.cpp b/lib/src/icc.cpp similarity index 99% rename from lib/icc.cpp rename to lib/src/icc.cpp index 851dd9da..b8386603 100644 --- a/lib/icc.cpp +++ b/lib/src/icc.cpp @@ -16,8 +16,8 @@ #include -#include "ultrahdrcommon.h" -#include "icc.h" +#include "ultrahdr/ultrahdrcommon.h" +#include "ultrahdr/icc.h" namespace ultrahdr { diff --git a/lib/jpegdecoderhelper.cpp b/lib/src/jpegdecoderhelper.cpp similarity index 99% rename from lib/jpegdecoderhelper.cpp rename to lib/src/jpegdecoderhelper.cpp index eb55a2e2..8a8278d4 100644 --- a/lib/jpegdecoderhelper.cpp +++ b/lib/src/jpegdecoderhelper.cpp @@ -19,9 +19,9 @@ #include -#include "ultrahdrcommon.h" -#include "ultrahdr.h" -#include "jpegdecoderhelper.h" +#include "ultrahdr/ultrahdrcommon.h" +#include "ultrahdr/ultrahdr.h" +#include "ultrahdr/jpegdecoderhelper.h" using namespace std; diff --git a/lib/jpegencoderhelper.cpp b/lib/src/jpegencoderhelper.cpp similarity index 99% rename from lib/jpegencoderhelper.cpp rename to lib/src/jpegencoderhelper.cpp index c6f0b77f..7bab01f7 100644 --- a/lib/jpegencoderhelper.cpp +++ b/lib/src/jpegencoderhelper.cpp @@ -18,9 +18,9 @@ #include #include -#include "ultrahdrcommon.h" -#include "ultrahdr.h" -#include "jpegencoderhelper.h" +#include "ultrahdr/ultrahdrcommon.h" +#include "ultrahdr/ultrahdr.h" +#include "ultrahdr/jpegencoderhelper.h" namespace ultrahdr { diff --git a/lib/jpegr.cpp b/lib/src/jpegr.cpp similarity index 99% rename from lib/jpegr.cpp rename to lib/src/jpegr.cpp index 015ffce1..ed4fef18 100644 --- a/lib/jpegr.cpp +++ b/lib/src/jpegr.cpp @@ -27,10 +27,10 @@ #include #include -#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" diff --git a/lib/jpegrutils.cpp b/lib/src/jpegrutils.cpp similarity index 99% rename from lib/jpegrutils.cpp rename to lib/src/jpegrutils.cpp index 2fdc347c..77cb26b0 100644 --- a/lib/jpegrutils.cpp +++ b/lib/src/jpegrutils.cpp @@ -17,9 +17,9 @@ #include #include -#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" diff --git a/lib/multipictureformat.cpp b/lib/src/multipictureformat.cpp similarity index 98% rename from lib/multipictureformat.cpp rename to lib/src/multipictureformat.cpp index dc31fbb0..59efc66e 100644 --- a/lib/multipictureformat.cpp +++ b/lib/src/multipictureformat.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "multipictureformat.h" +#include "ultrahdr/multipictureformat.h" namespace ultrahdr { size_t calculateMpfSize() { diff --git a/tests/gainmapmath_test.cpp b/tests/gainmapmath_test.cpp index b474bd65..95fd159e 100644 --- a/tests/gainmapmath_test.cpp +++ b/tests/gainmapmath_test.cpp @@ -17,7 +17,7 @@ #include #include -#include "gainmapmath.h" +#include "ultrahdr/gainmapmath.h" namespace ultrahdr { diff --git a/tests/icchelper_test.cpp b/tests/icchelper_test.cpp index 02ad27b8..26f78a6a 100644 --- a/tests/icchelper_test.cpp +++ b/tests/icchelper_test.cpp @@ -16,7 +16,7 @@ #include -#include "icc.h" +#include "ultrahdr/icc.h" namespace ultrahdr { diff --git a/tests/jpegdecoderhelper_test.cpp b/tests/jpegdecoderhelper_test.cpp index 3b8e88ed..4e72be11 100644 --- a/tests/jpegdecoderhelper_test.cpp +++ b/tests/jpegdecoderhelper_test.cpp @@ -19,9 +19,9 @@ #include #include -#include "ultrahdrcommon.h" -#include "jpegdecoderhelper.h" -#include "icc.h" +#include "ultrahdr/ultrahdrcommon.h" +#include "ultrahdr/jpegdecoderhelper.h" +#include "ultrahdr/icc.h" namespace ultrahdr { diff --git a/tests/jpegencoderhelper_test.cpp b/tests/jpegencoderhelper_test.cpp index 3463c262..23ab3f3a 100644 --- a/tests/jpegencoderhelper_test.cpp +++ b/tests/jpegencoderhelper_test.cpp @@ -19,9 +19,9 @@ #include #include -#include "ultrahdrcommon.h" -#include "ultrahdr.h" -#include "jpegencoderhelper.h" +#include "ultrahdr/ultrahdrcommon.h" +#include "ultrahdr/ultrahdr.h" +#include "ultrahdr/jpegencoderhelper.h" namespace ultrahdr { diff --git a/tests/jpegr_test.cpp b/tests/jpegr_test.cpp index bfbfcdec..39c7af0d 100644 --- a/tests/jpegr_test.cpp +++ b/tests/jpegr_test.cpp @@ -24,9 +24,9 @@ #include #include -#include "ultrahdrcommon.h" -#include "jpegr.h" -#include "jpegrutils.h" +#include "ultrahdr/ultrahdrcommon.h" +#include "ultrahdr/jpegr.h" +#include "ultrahdr/jpegrutils.h" //#define DUMP_OUTPUT