Skip to content

Commit

Permalink
Rename folders and namespace to use the lytroIO library name
Browse files Browse the repository at this point in the history
  • Loading branch information
Martin TOUZOT committed Dec 21, 2023
1 parent 160540f commit bc3ef71
Show file tree
Hide file tree
Showing 10 changed files with 29 additions and 29 deletions.
14 changes: 7 additions & 7 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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")

#------------------------------------------------------------
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -111,7 +111,7 @@ install(TARGETS lytroIO
)

# Install public headers
install(DIRECTORY include/lytroio
install(DIRECTORY include/lytroIO
DESTINATION include
FILES_MATCHING PATTERN "*.hpp"
)
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 <lytroio_build_directory>
cmake -G <cmake_generator> -DBUILD_EXAMPLES=<ON/OFF> -DBUILD_DOCS=<ON/OFF> <lytroio_source_directory>
cd <lytroIO_build_directory>
cmake -G <cmake_generator> -DBUILD_EXAMPLES=<ON/OFF> -DBUILD_DOCS=<ON/OFF> <lytroIO_source_directory>
cmake --build . --config <cfg>
```
By default, **BUILD_EXAMPLES** and **BUILD_DOCS** are set to **OFF**.
Expand Down
4 changes: 2 additions & 2 deletions examples/lytroreader/lytroreader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Distributed under the GPL-3.0 Licence
// (https://opensource.org/license/gpl-3-0/)

#include <lytroio/lytrostream/lytrofile.hpp>
#include <lytroIO/lytrostream/lytrofile.hpp>

#include <fstream>
#include <iostream>
Expand All @@ -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)
{
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

#include <filesystem>
#include <fstream>
#include <lytroio/lytrostream/lytroelement.hpp>
#include <lytroIO/lytrostream/lytroelement.hpp>
#include <map>
#include <vector>

Expand All @@ -33,7 +33,7 @@
#define LYTRO_SHA1 45
#define LYTRO_SHA1_PADDING 35

namespace lytroio
namespace lytroIO
{
class LytroDecoder
{
Expand Down Expand Up @@ -99,6 +99,6 @@ class LytroDecoder
{ "\x89\x4c\x46\x4D\x0D\x0A\x1A\x0A",
LytroElement::LytroElementType::LFM } };
};
} // namespace lytroio
} // namespace lytroIO

#endif // LYTRODECODER_H
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#include <iostream>
#include <string>

namespace lytroio
namespace lytroIO
{
class LytroElement
{
Expand Down Expand Up @@ -172,6 +172,6 @@ class LytroElement
std::filesystem::path filepath_ = "";
};

} // namespace lytroio
} // namespace lytroIO

#endif // LYTROELEMENT_H
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@

#include <fstream>
#include <iterator>
#include <lytroio/lytrostream/lytrodecoder.hpp>
#include <lytroio/lytrostream/lytroelement.hpp>
#include <lytroIO/lytrostream/lytrodecoder.hpp>
#include <lytroIO/lytrostream/lytroelement.hpp>
#include <vector>

#define LYTRO_STEP 16
Expand All @@ -32,7 +32,7 @@
#define LYTRO_SHA1 45
#define LYTRO_SHA1_PADDING 35

namespace lytroio
namespace lytroIO
{
class LytroFile
{
Expand Down Expand Up @@ -149,6 +149,6 @@ class LytroFile
std::vector<LytroElement> *elements_;
LytroDecoder *ldecoder_;
};
} // namespace lytroio
} // namespace lytroIO

#endif // LYTROFILE_H
6 changes: 3 additions & 3 deletions src/lytrostream/lytrodecoder.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
// (https://opensource.org/license/gpl-3-0/)

#include "utils.hpp"
#include <lytroio/lytrostream/lytrodecoder.hpp>
#include <lytroIO/lytrostream/lytrodecoder.hpp>
#include <nlohmann/json.hpp>

namespace lytroio
namespace lytroIO
{
using json = nlohmann::json;

Expand Down Expand Up @@ -137,4 +137,4 @@ LytroDecoder::contains_png (std::string data, size_t &begin)

return (begin != std::string::npos);
}
} // namespace lytroio
} // namespace lytroIO
6 changes: 3 additions & 3 deletions src/lytrostream/lytroelement.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
// Distributed under the GPL-3.0 Licence
// (https://opensource.org/license/gpl-3-0/)

#include <lytroio/lytrostream/lytroelement.hpp>
#include <lytroIO/lytrostream/lytroelement.hpp>

namespace lytroio
namespace lytroIO
{
LytroElement::LytroElement (enum LytroElement::LytroElementType type)
: type_ (type)
Expand Down Expand Up @@ -130,4 +130,4 @@ operator<< (std::ostream &os, const LytroElement &element)

return os;
}
} // namespace lytroio
} // namespace lytroIO
6 changes: 3 additions & 3 deletions src/lytrostream/lytrofile.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
// (https://opensource.org/license/gpl-3-0/)

#include "utils.hpp"
#include <lytroio/lytrostream/lytrofile.hpp>
#include <lytroIO/lytrostream/lytrofile.hpp>

namespace lytroio
namespace lytroIO
{
LytroFile::LytroFile (std::string filename) : filename_ (filename)
{
Expand Down Expand Up @@ -78,4 +78,4 @@ LytroFile::save ()
}
}
}
} // namespace lytroio
} // namespace lytroIO

0 comments on commit bc3ef71

Please sign in to comment.