diff --git a/CMakeLists.txt b/CMakeLists.txt index 5620e70..7056b07 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,10 +14,10 @@ message(STATUS "Building lytroIO v${CMAKE_PROJECT_VERSION}") include(GNUInstallDirs) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/include/lytroio/config.h.in ${CMAKE_CURRENT_SOURCE_DIR}/include/lytroio/config.h) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/include/lytroIO/config.h.in ${CMAKE_CURRENT_SOURCE_DIR}/include/lytroIO/config.h) # Source and header dir -set(PROJECT_INCLUDE_DIR "include/lytroio") +set(PROJECT_INCLUDE_DIR "include/lytroIO") set(PROJECT_SOURCE_DIR "src") #------------------------------------------------------------ @@ -57,10 +57,10 @@ endif() # Define your library sources set(PUBLIC_HEADERS - include/lytroio/config.h - include/lytroio/lytrostream/lytrodecoder.hpp - include/lytroio/lytrostream/lytroelement.hpp - include/lytroio/lytrostream/lytrofile.hpp + include/lytroIO/config.h + include/lytroIO/lytrostream/lytrodecoder.hpp + include/lytroIO/lytrostream/lytroelement.hpp + include/lytroIO/lytrostream/lytrofile.hpp ) set(PRIVATE_HEADERS @@ -111,7 +111,7 @@ install(TARGETS lytroIO ) # Install public headers -install(DIRECTORY include/lytroio +install(DIRECTORY include/lytroIO DESTINATION include FILES_MATCHING PATTERN "*.hpp" ) diff --git a/README.md b/README.md index e26cff3..b038b58 100644 --- a/README.md +++ b/README.md @@ -29,8 +29,8 @@ Image taken with a Lytro camera animated by [Christopher Hahne](http://www.chris Here are the commands to compile this project : ```console -cd -cmake -G -DBUILD_EXAMPLES= -DBUILD_DOCS= +cd +cmake -G -DBUILD_EXAMPLES= -DBUILD_DOCS= cmake --build . --config ``` By default, **BUILD_EXAMPLES** and **BUILD_DOCS** are set to **OFF**. diff --git a/examples/lytroreader/lytroreader.cpp b/examples/lytroreader/lytroreader.cpp index ea134af..8863bf2 100644 --- a/examples/lytroreader/lytroreader.cpp +++ b/examples/lytroreader/lytroreader.cpp @@ -2,7 +2,7 @@ // Distributed under the GPL-3.0 Licence // (https://opensource.org/license/gpl-3-0/) -#include +#include #include #include @@ -20,7 +20,7 @@ main (int argc, char *argv[]) std::cout << "Decoding datas from " << argv[1] << std::endl; - lytroio::LytroFile lfile = lytroio::LytroFile (argv[1]); + lytroIO::LytroFile lfile = lytroIO::LytroFile (argv[1]); if (lfile.read () == true) { diff --git a/include/lytroio/config.h.in b/include/lytroIO/config.h.in similarity index 100% rename from include/lytroio/config.h.in rename to include/lytroIO/config.h.in diff --git a/include/lytroio/lytrostream/lytrodecoder.hpp b/include/lytroIO/lytrostream/lytrodecoder.hpp similarity index 96% rename from include/lytroio/lytrostream/lytrodecoder.hpp rename to include/lytroIO/lytrostream/lytrodecoder.hpp index 4b89ff4..6954439 100644 --- a/include/lytroio/lytrostream/lytrodecoder.hpp +++ b/include/lytroIO/lytrostream/lytrodecoder.hpp @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include @@ -33,7 +33,7 @@ #define LYTRO_SHA1 45 #define LYTRO_SHA1_PADDING 35 -namespace lytroio +namespace lytroIO { class LytroDecoder { @@ -99,6 +99,6 @@ class LytroDecoder { "\x89\x4c\x46\x4D\x0D\x0A\x1A\x0A", LytroElement::LytroElementType::LFM } }; }; -} // namespace lytroio +} // namespace lytroIO #endif // LYTRODECODER_H \ No newline at end of file diff --git a/include/lytroio/lytrostream/lytroelement.hpp b/include/lytroIO/lytrostream/lytroelement.hpp similarity index 98% rename from include/lytroio/lytrostream/lytroelement.hpp rename to include/lytroIO/lytrostream/lytroelement.hpp index 2c2cbfb..a7603a7 100644 --- a/include/lytroio/lytrostream/lytroelement.hpp +++ b/include/lytroIO/lytrostream/lytroelement.hpp @@ -25,7 +25,7 @@ #include #include -namespace lytroio +namespace lytroIO { class LytroElement { @@ -172,6 +172,6 @@ class LytroElement std::filesystem::path filepath_ = ""; }; -} // namespace lytroio +} // namespace lytroIO #endif // LYTROELEMENT_H \ No newline at end of file diff --git a/include/lytroio/lytrostream/lytrofile.hpp b/include/lytroIO/lytrostream/lytrofile.hpp similarity index 95% rename from include/lytroio/lytrostream/lytrofile.hpp rename to include/lytroIO/lytrostream/lytrofile.hpp index 9dc3772..8b18cf8 100644 --- a/include/lytroio/lytrostream/lytrofile.hpp +++ b/include/lytroIO/lytrostream/lytrofile.hpp @@ -21,8 +21,8 @@ #include #include -#include -#include +#include +#include #include #define LYTRO_STEP 16 @@ -32,7 +32,7 @@ #define LYTRO_SHA1 45 #define LYTRO_SHA1_PADDING 35 -namespace lytroio +namespace lytroIO { class LytroFile { @@ -149,6 +149,6 @@ class LytroFile std::vector *elements_; LytroDecoder *ldecoder_; }; -} // namespace lytroio +} // namespace lytroIO #endif // LYTROFILE_H \ No newline at end of file diff --git a/src/lytrostream/lytrodecoder.cpp b/src/lytrostream/lytrodecoder.cpp index 1913e26..f4f3184 100644 --- a/src/lytrostream/lytrodecoder.cpp +++ b/src/lytrostream/lytrodecoder.cpp @@ -3,10 +3,10 @@ // (https://opensource.org/license/gpl-3-0/) #include "utils.hpp" -#include +#include #include -namespace lytroio +namespace lytroIO { using json = nlohmann::json; @@ -137,4 +137,4 @@ LytroDecoder::contains_png (std::string data, size_t &begin) return (begin != std::string::npos); } -} // namespace lytroio \ No newline at end of file +} // namespace lytroIO \ No newline at end of file diff --git a/src/lytrostream/lytroelement.cpp b/src/lytrostream/lytroelement.cpp index 52d7cbb..34d98ce 100644 --- a/src/lytrostream/lytroelement.cpp +++ b/src/lytrostream/lytroelement.cpp @@ -2,9 +2,9 @@ // Distributed under the GPL-3.0 Licence // (https://opensource.org/license/gpl-3-0/) -#include +#include -namespace lytroio +namespace lytroIO { LytroElement::LytroElement (enum LytroElement::LytroElementType type) : type_ (type) @@ -130,4 +130,4 @@ operator<< (std::ostream &os, const LytroElement &element) return os; } -} // namespace lytroio \ No newline at end of file +} // namespace lytroIO \ No newline at end of file diff --git a/src/lytrostream/lytrofile.cpp b/src/lytrostream/lytrofile.cpp index 78ab286..368a2c1 100644 --- a/src/lytrostream/lytrofile.cpp +++ b/src/lytrostream/lytrofile.cpp @@ -3,9 +3,9 @@ // (https://opensource.org/license/gpl-3-0/) #include "utils.hpp" -#include +#include -namespace lytroio +namespace lytroIO { LytroFile::LytroFile (std::string filename) : filename_ (filename) { @@ -78,4 +78,4 @@ LytroFile::save () } } } -} // namespace lytroio \ No newline at end of file +} // namespace lytroIO \ No newline at end of file