From 674b782d17c9df43886023b6ff416bfb776d820b Mon Sep 17 00:00:00 2001 From: Leonetienne Date: Tue, 26 Apr 2022 15:39:28 +0200 Subject: [PATCH] New project structure --- .gitignore | 48 +------------ .gitmodules | 3 + BmpPP/CMakeLists.txt | 63 ++++++++++++++++++ {Doxygen => BmpPP/Doxygen}/.gitignore | 0 {Doxygen => BmpPP/Doxygen}/doxyfig | 0 {Doxygen => BmpPP/Doxygen}/doxyrun.sh | 0 {Exec => BmpPP/exec}/main.cpp | 4 +- Src/BMP.h => BmpPP/include/BmpPP/Bmp.h | 2 +- {Src => BmpPP/include/BmpPP}/BmpHeader.h | 0 {Src => BmpPP/include/BmpPP}/BmpReader.h | 0 {Src => BmpPP/include/BmpPP}/BmpWriter.h | 0 {Src => BmpPP/include/BmpPP}/Colormodes.h | 0 {Src => BmpPP/include/BmpPP}/Version.h | 0 Src/BMP.cpp => BmpPP/src/Bmp.cpp | 6 +- {Src => BmpPP/src}/BmpHeader.cpp | 2 +- {Src => BmpPP/src}/BmpReader.cpp | 6 +- {Src => BmpPP/src}/BmpWriter.cpp | 6 +- {Test => BmpPP/test}/BmpHeader.cpp | 2 +- {Test => BmpPP/test}/Catch2.h | 0 {Test => BmpPP/test}/ConvertColormode.cpp | 2 +- {Test => BmpPP/test}/Crop.cpp | 2 +- {Test => BmpPP/test}/FillChannel.cpp | 2 +- {Test => BmpPP/test}/MirrorHorizontally.cpp | 2 +- {Test => BmpPP/test}/MirrorVertically.cpp | 2 +- {Test => BmpPP/test}/OperatorEquals.cpp | 2 +- {Test => BmpPP/test}/ReInitialize.cpp | 2 +- {Test => BmpPP/test}/Read.cpp | 2 +- {Test => BmpPP/test}/Rotate.cpp | 2 +- {Test => BmpPP/test}/SwapChannels.cpp | 2 +- {Test => BmpPP/test}/Uninitialized.cpp | 2 +- {Test => BmpPP/test}/Write.cpp | 2 +- {Test => BmpPP/test}/main.cpp | 0 .../test/testAssets}/.gitignore | 0 .../test/testAssets}/base_blue.bmp | Bin .../test/testAssets}/base_fuwadera.bmp | Bin .../test/testAssets}/base_fuwadera2.bmp | Bin .../testAssets}/base_fuwadera2_mirror_hor.bmp | Bin .../testAssets}/base_fuwadera2_mirror_ver.bmp | Bin .../base_fuwadera_channelswap_gb.bmp | Bin .../base_fuwadera_channelswap_rb.bmp | Bin .../base_fuwadera_channelswap_rg.bmp | Bin .../test/testAssets}/base_gradient.bmp | Bin .../test/testAssets}/base_green.bmp | Bin .../test/testAssets}/base_hachi.bmp | Bin .../test/testAssets}/base_hachi_cropped.bmp | Bin ...base_hachi_cropped_extreme_bottomright.bmp | Bin .../base_hachi_cropped_extreme_topleft.bmp | Bin .../test/testAssets}/base_kyokucho.bmp | Bin .../test/testAssets}/base_mateya.bmp | Bin .../testAssets}/base_mateya_rot_180deg.bmp | Bin .../testAssets}/base_mateya_rot_270deg.bmp | Bin .../testAssets}/base_mateya_rot_90deg.bmp | Bin .../test/testAssets}/base_red.bmp | Bin .../test/testAssets}/basea_blue.bmp | Bin .../test/testAssets}/basea_fuwadera2.bmp | Bin .../basea_fuwadera2_mirror_hor.bmp | Bin .../basea_fuwadera2_mirror_ver.bmp | Bin .../test/testAssets}/basea_gradient.bmp | Bin .../test/testAssets}/basea_green.bmp | Bin .../test/testAssets}/basea_hachi.bmp | Bin .../test/testAssets}/basea_hachi_cropped.bmp | Bin .../test/testAssets}/basea_kyokucho.bmp | Bin .../test/testAssets}/basea_red.bmp | Bin .../test/testAssets}/readme.md | 0 Eule | 1 + Exec/CMakeLists.txt | 20 ------ Src/CMakeLists.txt | 17 ----- Test/CMakeLists.txt | 41 ------------ configure.sh | 5 -- 69 files changed, 94 insertions(+), 156 deletions(-) create mode 100644 BmpPP/CMakeLists.txt rename {Doxygen => BmpPP/Doxygen}/.gitignore (100%) rename {Doxygen => BmpPP/Doxygen}/doxyfig (100%) rename {Doxygen => BmpPP/Doxygen}/doxyrun.sh (100%) rename {Exec => BmpPP/exec}/main.cpp (89%) rename Src/BMP.h => BmpPP/include/BmpPP/Bmp.h (99%) rename {Src => BmpPP/include/BmpPP}/BmpHeader.h (100%) rename {Src => BmpPP/include/BmpPP}/BmpReader.h (100%) rename {Src => BmpPP/include/BmpPP}/BmpWriter.h (100%) rename {Src => BmpPP/include/BmpPP}/Colormodes.h (100%) rename {Src => BmpPP/include/BmpPP}/Version.h (100%) rename Src/BMP.cpp => BmpPP/src/Bmp.cpp (99%) rename {Src => BmpPP/src}/BmpHeader.cpp (97%) rename {Src => BmpPP/src}/BmpReader.cpp (98%) rename {Src => BmpPP/src}/BmpWriter.cpp (98%) rename {Test => BmpPP/test}/BmpHeader.cpp (95%) rename {Test => BmpPP/test}/Catch2.h (100%) rename {Test => BmpPP/test}/ConvertColormode.cpp (98%) rename {Test => BmpPP/test}/Crop.cpp (99%) rename {Test => BmpPP/test}/FillChannel.cpp (99%) rename {Test => BmpPP/test}/MirrorHorizontally.cpp (97%) rename {Test => BmpPP/test}/MirrorVertically.cpp (97%) rename {Test => BmpPP/test}/OperatorEquals.cpp (98%) rename {Test => BmpPP/test}/ReInitialize.cpp (98%) rename {Test => BmpPP/test}/Read.cpp (99%) rename {Test => BmpPP/test}/Rotate.cpp (98%) rename {Test => BmpPP/test}/SwapChannels.cpp (98%) rename {Test => BmpPP/test}/Uninitialized.cpp (99%) rename {Test => BmpPP/test}/Write.cpp (99%) rename {Test => BmpPP/test}/main.cpp (100%) rename {Test/TestAssets => BmpPP/test/testAssets}/.gitignore (100%) rename {Test/TestAssets => BmpPP/test/testAssets}/base_blue.bmp (100%) rename {Test/TestAssets => BmpPP/test/testAssets}/base_fuwadera.bmp (100%) rename {Test/TestAssets => BmpPP/test/testAssets}/base_fuwadera2.bmp (100%) rename {Test/TestAssets => BmpPP/test/testAssets}/base_fuwadera2_mirror_hor.bmp (100%) rename {Test/TestAssets => BmpPP/test/testAssets}/base_fuwadera2_mirror_ver.bmp (100%) rename {Test/TestAssets => BmpPP/test/testAssets}/base_fuwadera_channelswap_gb.bmp (100%) rename {Test/TestAssets => BmpPP/test/testAssets}/base_fuwadera_channelswap_rb.bmp (100%) rename {Test/TestAssets => BmpPP/test/testAssets}/base_fuwadera_channelswap_rg.bmp (100%) rename {Test/TestAssets => BmpPP/test/testAssets}/base_gradient.bmp (100%) rename {Test/TestAssets => BmpPP/test/testAssets}/base_green.bmp (100%) rename {Test/TestAssets => BmpPP/test/testAssets}/base_hachi.bmp (100%) rename {Test/TestAssets => BmpPP/test/testAssets}/base_hachi_cropped.bmp (100%) rename {Test/TestAssets => BmpPP/test/testAssets}/base_hachi_cropped_extreme_bottomright.bmp (100%) rename {Test/TestAssets => BmpPP/test/testAssets}/base_hachi_cropped_extreme_topleft.bmp (100%) rename {Test/TestAssets => BmpPP/test/testAssets}/base_kyokucho.bmp (100%) rename {Test/TestAssets => BmpPP/test/testAssets}/base_mateya.bmp (100%) rename {Test/TestAssets => BmpPP/test/testAssets}/base_mateya_rot_180deg.bmp (100%) rename {Test/TestAssets => BmpPP/test/testAssets}/base_mateya_rot_270deg.bmp (100%) rename {Test/TestAssets => BmpPP/test/testAssets}/base_mateya_rot_90deg.bmp (100%) rename {Test/TestAssets => BmpPP/test/testAssets}/base_red.bmp (100%) rename {Test/TestAssets => BmpPP/test/testAssets}/basea_blue.bmp (100%) rename {Test/TestAssets => BmpPP/test/testAssets}/basea_fuwadera2.bmp (100%) rename {Test/TestAssets => BmpPP/test/testAssets}/basea_fuwadera2_mirror_hor.bmp (100%) rename {Test/TestAssets => BmpPP/test/testAssets}/basea_fuwadera2_mirror_ver.bmp (100%) rename {Test/TestAssets => BmpPP/test/testAssets}/basea_gradient.bmp (100%) rename {Test/TestAssets => BmpPP/test/testAssets}/basea_green.bmp (100%) rename {Test/TestAssets => BmpPP/test/testAssets}/basea_hachi.bmp (100%) rename {Test/TestAssets => BmpPP/test/testAssets}/basea_hachi_cropped.bmp (100%) rename {Test/TestAssets => BmpPP/test/testAssets}/basea_kyokucho.bmp (100%) rename {Test/TestAssets => BmpPP/test/testAssets}/basea_red.bmp (100%) rename {Test/TestAssets => BmpPP/test/testAssets}/readme.md (100%) create mode 160000 Eule delete mode 100644 Exec/CMakeLists.txt delete mode 100644 Src/CMakeLists.txt delete mode 100644 Test/CMakeLists.txt delete mode 100644 configure.sh diff --git a/.gitignore b/.gitignore index 29aa1a1..dc84959 100644 --- a/.gitignore +++ b/.gitignore @@ -1,48 +1,2 @@ -# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider -# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 - -# All images -*.bmp -*.jpg -*.jpeg -*.png - -# Vim swap files -*.swp - -# User-specific stuff -.idea/ - -# CMake -cmake-build-*/ - -# File-based project format -*.iws - -# IntelliJ -out/ - -# mpeltonen/sbt-idea plugin -.idea_modules/ - -# JIRA plugin -atlassian-ide-plugin.xml - -# Cursive Clojure plugin -.idea/replstate.xml - -# SonarLint plugin -.idea/sonarlint/ - -# Crashlytics plugin (for Android Studio and IntelliJ) -com_crashlytics_export_strings.xml -crashlytics.properties -crashlytics-build.properties -fabric.properties - -# Editor-based Rest Client -.idea/httpRequests - -# Android studio 3.1+ serialized cache file -.idea/caches/build_file_checksums.ser +build/ diff --git a/.gitmodules b/.gitmodules index e69de29..42cbc36 100644 --- a/.gitmodules +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "Eule"] + path = Eule + url = git@gitea.leonetienne.de:leonetienne/Eule.git diff --git a/BmpPP/CMakeLists.txt b/BmpPP/CMakeLists.txt new file mode 100644 index 0000000..4f5f3da --- /dev/null +++ b/BmpPP/CMakeLists.txt @@ -0,0 +1,63 @@ +cmake_minimum_required(VERSION 3.16) +project(BmpPP) + +################### +# Library project # +################### +set(CMAKE_CXX_STANDARD 17) + +# Add library Eule +SET(eule_dir ../Eule/Eule) +SET(eule_include ${eule_dir}/include) +FILE(GLOB eule_src ${eule_dir}/src/*.cpp) +add_compile_definitions(_EULE_NO_INTRINSICS_) + +FILE(GLOB main_src src/*.cpp) +add_library(${PROJECT_NAME} + ${main_src} + + ${eule_src} +) + +target_include_directories(${PROJECT_NAME} PRIVATE + include + ${eule_include} +) + +######### +# Tests # +######### +FILE(GLOB test_src test/*.cpp) +add_executable(test + test/Catch2.h + ${test_src} +) +target_link_libraries(test ${PROJECT_NAME}) + +target_include_directories(test PRIVATE + include + ${eule_include} +) + +## Move test images to build dir +ADD_CUSTOM_COMMAND( + TARGET ${PROJECT_NAME} POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy_directory + ${CMAKE_SOURCE_DIR}/test/testAssets/ $ +) + + +############## +# Executable # +############## +FILE(GLOB exec_src exec/*.cpp) +add_executable(exec + ${exec_src} +) +target_link_libraries(exec ${PROJECT_NAME}) + +target_include_directories(exec PRIVATE + include + ${eule_include} +) + diff --git a/Doxygen/.gitignore b/BmpPP/Doxygen/.gitignore similarity index 100% rename from Doxygen/.gitignore rename to BmpPP/Doxygen/.gitignore diff --git a/Doxygen/doxyfig b/BmpPP/Doxygen/doxyfig similarity index 100% rename from Doxygen/doxyfig rename to BmpPP/Doxygen/doxyfig diff --git a/Doxygen/doxyrun.sh b/BmpPP/Doxygen/doxyrun.sh similarity index 100% rename from Doxygen/doxyrun.sh rename to BmpPP/Doxygen/doxyrun.sh diff --git a/Exec/main.cpp b/BmpPP/exec/main.cpp similarity index 89% rename from Exec/main.cpp rename to BmpPP/exec/main.cpp index 28f04fe..9bc232d 100644 --- a/Exec/main.cpp +++ b/BmpPP/exec/main.cpp @@ -1,6 +1,6 @@ -#include +#include #include -#include +#include #include using namespace Leonetienne::BmpPP; diff --git a/Src/BMP.h b/BmpPP/include/BmpPP/Bmp.h similarity index 99% rename from Src/BMP.h rename to BmpPP/include/BmpPP/Bmp.h index 0e75a5c..84d9422 100644 --- a/Src/BMP.h +++ b/BmpPP/include/BmpPP/Bmp.h @@ -4,7 +4,7 @@ #include #include #include -#include "Colormodes.h" +#include "BmpPP/Colormodes.h" namespace Leonetienne::BmpPP { diff --git a/Src/BmpHeader.h b/BmpPP/include/BmpPP/BmpHeader.h similarity index 100% rename from Src/BmpHeader.h rename to BmpPP/include/BmpPP/BmpHeader.h diff --git a/Src/BmpReader.h b/BmpPP/include/BmpPP/BmpReader.h similarity index 100% rename from Src/BmpReader.h rename to BmpPP/include/BmpPP/BmpReader.h diff --git a/Src/BmpWriter.h b/BmpPP/include/BmpPP/BmpWriter.h similarity index 100% rename from Src/BmpWriter.h rename to BmpPP/include/BmpPP/BmpWriter.h diff --git a/Src/Colormodes.h b/BmpPP/include/BmpPP/Colormodes.h similarity index 100% rename from Src/Colormodes.h rename to BmpPP/include/BmpPP/Colormodes.h diff --git a/Src/Version.h b/BmpPP/include/BmpPP/Version.h similarity index 100% rename from Src/Version.h rename to BmpPP/include/BmpPP/Version.h diff --git a/Src/BMP.cpp b/BmpPP/src/Bmp.cpp similarity index 99% rename from Src/BMP.cpp rename to BmpPP/src/Bmp.cpp index 56e69b8..f0995f8 100644 --- a/Src/BMP.cpp +++ b/BmpPP/src/Bmp.cpp @@ -1,8 +1,8 @@ -#include "BMP.h" +#include "BmpPP/Bmp.h" #include #include -#include "BmpWriter.h" -#include "BmpReader.h" +#include "BmpPP/BmpWriter.h" +#include "BmpPP/BmpReader.h" #define CHECK_IF_INITIALIZED if (!isInitialized) throw std::runtime_error("Image not initialized!"); diff --git a/Src/BmpHeader.cpp b/BmpPP/src/BmpHeader.cpp similarity index 97% rename from Src/BmpHeader.cpp rename to BmpPP/src/BmpHeader.cpp index ef551db..b4cb6d3 100644 --- a/Src/BmpHeader.cpp +++ b/BmpPP/src/BmpHeader.cpp @@ -1,4 +1,4 @@ -#include "BmpHeader.h" +#include "BmpPP/BmpHeader.h" namespace Leonetienne::BmpPP { diff --git a/Src/BmpReader.cpp b/BmpPP/src/BmpReader.cpp similarity index 98% rename from Src/BmpReader.cpp rename to BmpPP/src/BmpReader.cpp index 8fd1cb4..596bd7f 100644 --- a/Src/BmpReader.cpp +++ b/BmpPP/src/BmpReader.cpp @@ -1,6 +1,6 @@ -#include "BmpReader.h" -#include "Colormodes.h" -#include "BMP.h" +#include "BmpPP/BmpReader.h" +#include "BmpPP/Colormodes.h" +#include "BmpPP/Bmp.h" #include #include diff --git a/Src/BmpWriter.cpp b/BmpPP/src/BmpWriter.cpp similarity index 98% rename from Src/BmpWriter.cpp rename to BmpPP/src/BmpWriter.cpp index 71d4746..b108c9b 100644 --- a/Src/BmpWriter.cpp +++ b/BmpPP/src/BmpWriter.cpp @@ -1,6 +1,6 @@ -#include "BmpWriter.h" -#include "BmpHeader.h" -#include "Bmp.h" +#include "BmpPP/BmpWriter.h" +#include "BmpPP/BmpHeader.h" +#include "BmpPP/Bmp.h" #include namespace Leonetienne::BmpPP { diff --git a/Test/BmpHeader.cpp b/BmpPP/test/BmpHeader.cpp similarity index 95% rename from Test/BmpHeader.cpp rename to BmpPP/test/BmpHeader.cpp index ff1eeba..4fb680c 100644 --- a/Test/BmpHeader.cpp +++ b/BmpPP/test/BmpHeader.cpp @@ -1,4 +1,4 @@ -#include +#include #include "Catch2.h" using namespace Leonetienne::BmpPP; diff --git a/Test/Catch2.h b/BmpPP/test/Catch2.h similarity index 100% rename from Test/Catch2.h rename to BmpPP/test/Catch2.h diff --git a/Test/ConvertColormode.cpp b/BmpPP/test/ConvertColormode.cpp similarity index 98% rename from Test/ConvertColormode.cpp rename to BmpPP/test/ConvertColormode.cpp index 7709923..57c06e0 100644 --- a/Test/ConvertColormode.cpp +++ b/BmpPP/test/ConvertColormode.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include "Catch2.h" diff --git a/Test/Crop.cpp b/BmpPP/test/Crop.cpp similarity index 99% rename from Test/Crop.cpp rename to BmpPP/test/Crop.cpp index dbe8adb..3ee722c 100644 --- a/Test/Crop.cpp +++ b/BmpPP/test/Crop.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include "Catch2.h" diff --git a/Test/FillChannel.cpp b/BmpPP/test/FillChannel.cpp similarity index 99% rename from Test/FillChannel.cpp rename to BmpPP/test/FillChannel.cpp index ce27bbb..83b9a75 100644 --- a/Test/FillChannel.cpp +++ b/BmpPP/test/FillChannel.cpp @@ -1,4 +1,4 @@ -#include +#include #include "Catch2.h" #include #include diff --git a/Test/MirrorHorizontally.cpp b/BmpPP/test/MirrorHorizontally.cpp similarity index 97% rename from Test/MirrorHorizontally.cpp rename to BmpPP/test/MirrorHorizontally.cpp index c7ca4c7..38b9129 100644 --- a/Test/MirrorHorizontally.cpp +++ b/BmpPP/test/MirrorHorizontally.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include "Catch2.h" diff --git a/Test/MirrorVertically.cpp b/BmpPP/test/MirrorVertically.cpp similarity index 97% rename from Test/MirrorVertically.cpp rename to BmpPP/test/MirrorVertically.cpp index b90b308..8ab099f 100644 --- a/Test/MirrorVertically.cpp +++ b/BmpPP/test/MirrorVertically.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include "Catch2.h" diff --git a/Test/OperatorEquals.cpp b/BmpPP/test/OperatorEquals.cpp similarity index 98% rename from Test/OperatorEquals.cpp rename to BmpPP/test/OperatorEquals.cpp index e7b3cd2..8f3d63e 100644 --- a/Test/OperatorEquals.cpp +++ b/BmpPP/test/OperatorEquals.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include "Catch2.h" diff --git a/Test/ReInitialize.cpp b/BmpPP/test/ReInitialize.cpp similarity index 98% rename from Test/ReInitialize.cpp rename to BmpPP/test/ReInitialize.cpp index 1048cf2..d0a39c3 100644 --- a/Test/ReInitialize.cpp +++ b/BmpPP/test/ReInitialize.cpp @@ -1,4 +1,4 @@ -#include +#include #include "Catch2.h" using namespace Leonetienne::BmpPP; diff --git a/Test/Read.cpp b/BmpPP/test/Read.cpp similarity index 99% rename from Test/Read.cpp rename to BmpPP/test/Read.cpp index e164af0..f6a718f 100644 --- a/Test/Read.cpp +++ b/BmpPP/test/Read.cpp @@ -1,4 +1,4 @@ -#include +#include #include "Catch2.h" #include #include diff --git a/Test/Rotate.cpp b/BmpPP/test/Rotate.cpp similarity index 98% rename from Test/Rotate.cpp rename to BmpPP/test/Rotate.cpp index 22101b6..b42d810 100644 --- a/Test/Rotate.cpp +++ b/BmpPP/test/Rotate.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include "Catch2.h" diff --git a/Test/SwapChannels.cpp b/BmpPP/test/SwapChannels.cpp similarity index 98% rename from Test/SwapChannels.cpp rename to BmpPP/test/SwapChannels.cpp index cc59134..8b32dd5 100644 --- a/Test/SwapChannels.cpp +++ b/BmpPP/test/SwapChannels.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include "Catch2.h" diff --git a/Test/Uninitialized.cpp b/BmpPP/test/Uninitialized.cpp similarity index 99% rename from Test/Uninitialized.cpp rename to BmpPP/test/Uninitialized.cpp index b081d12..b104668 100644 --- a/Test/Uninitialized.cpp +++ b/BmpPP/test/Uninitialized.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include "Catch2.h" diff --git a/Test/Write.cpp b/BmpPP/test/Write.cpp similarity index 99% rename from Test/Write.cpp rename to BmpPP/test/Write.cpp index 6db14e1..a80066c 100644 --- a/Test/Write.cpp +++ b/BmpPP/test/Write.cpp @@ -1,4 +1,4 @@ -#include +#include #include "Catch2.h" #include #include diff --git a/Test/main.cpp b/BmpPP/test/main.cpp similarity index 100% rename from Test/main.cpp rename to BmpPP/test/main.cpp diff --git a/Test/TestAssets/.gitignore b/BmpPP/test/testAssets/.gitignore similarity index 100% rename from Test/TestAssets/.gitignore rename to BmpPP/test/testAssets/.gitignore diff --git a/Test/TestAssets/base_blue.bmp b/BmpPP/test/testAssets/base_blue.bmp similarity index 100% rename from Test/TestAssets/base_blue.bmp rename to BmpPP/test/testAssets/base_blue.bmp diff --git a/Test/TestAssets/base_fuwadera.bmp b/BmpPP/test/testAssets/base_fuwadera.bmp similarity index 100% rename from Test/TestAssets/base_fuwadera.bmp rename to BmpPP/test/testAssets/base_fuwadera.bmp diff --git a/Test/TestAssets/base_fuwadera2.bmp b/BmpPP/test/testAssets/base_fuwadera2.bmp similarity index 100% rename from Test/TestAssets/base_fuwadera2.bmp rename to BmpPP/test/testAssets/base_fuwadera2.bmp diff --git a/Test/TestAssets/base_fuwadera2_mirror_hor.bmp b/BmpPP/test/testAssets/base_fuwadera2_mirror_hor.bmp similarity index 100% rename from Test/TestAssets/base_fuwadera2_mirror_hor.bmp rename to BmpPP/test/testAssets/base_fuwadera2_mirror_hor.bmp diff --git a/Test/TestAssets/base_fuwadera2_mirror_ver.bmp b/BmpPP/test/testAssets/base_fuwadera2_mirror_ver.bmp similarity index 100% rename from Test/TestAssets/base_fuwadera2_mirror_ver.bmp rename to BmpPP/test/testAssets/base_fuwadera2_mirror_ver.bmp diff --git a/Test/TestAssets/base_fuwadera_channelswap_gb.bmp b/BmpPP/test/testAssets/base_fuwadera_channelswap_gb.bmp similarity index 100% rename from Test/TestAssets/base_fuwadera_channelswap_gb.bmp rename to BmpPP/test/testAssets/base_fuwadera_channelswap_gb.bmp diff --git a/Test/TestAssets/base_fuwadera_channelswap_rb.bmp b/BmpPP/test/testAssets/base_fuwadera_channelswap_rb.bmp similarity index 100% rename from Test/TestAssets/base_fuwadera_channelswap_rb.bmp rename to BmpPP/test/testAssets/base_fuwadera_channelswap_rb.bmp diff --git a/Test/TestAssets/base_fuwadera_channelswap_rg.bmp b/BmpPP/test/testAssets/base_fuwadera_channelswap_rg.bmp similarity index 100% rename from Test/TestAssets/base_fuwadera_channelswap_rg.bmp rename to BmpPP/test/testAssets/base_fuwadera_channelswap_rg.bmp diff --git a/Test/TestAssets/base_gradient.bmp b/BmpPP/test/testAssets/base_gradient.bmp similarity index 100% rename from Test/TestAssets/base_gradient.bmp rename to BmpPP/test/testAssets/base_gradient.bmp diff --git a/Test/TestAssets/base_green.bmp b/BmpPP/test/testAssets/base_green.bmp similarity index 100% rename from Test/TestAssets/base_green.bmp rename to BmpPP/test/testAssets/base_green.bmp diff --git a/Test/TestAssets/base_hachi.bmp b/BmpPP/test/testAssets/base_hachi.bmp similarity index 100% rename from Test/TestAssets/base_hachi.bmp rename to BmpPP/test/testAssets/base_hachi.bmp diff --git a/Test/TestAssets/base_hachi_cropped.bmp b/BmpPP/test/testAssets/base_hachi_cropped.bmp similarity index 100% rename from Test/TestAssets/base_hachi_cropped.bmp rename to BmpPP/test/testAssets/base_hachi_cropped.bmp diff --git a/Test/TestAssets/base_hachi_cropped_extreme_bottomright.bmp b/BmpPP/test/testAssets/base_hachi_cropped_extreme_bottomright.bmp similarity index 100% rename from Test/TestAssets/base_hachi_cropped_extreme_bottomright.bmp rename to BmpPP/test/testAssets/base_hachi_cropped_extreme_bottomright.bmp diff --git a/Test/TestAssets/base_hachi_cropped_extreme_topleft.bmp b/BmpPP/test/testAssets/base_hachi_cropped_extreme_topleft.bmp similarity index 100% rename from Test/TestAssets/base_hachi_cropped_extreme_topleft.bmp rename to BmpPP/test/testAssets/base_hachi_cropped_extreme_topleft.bmp diff --git a/Test/TestAssets/base_kyokucho.bmp b/BmpPP/test/testAssets/base_kyokucho.bmp similarity index 100% rename from Test/TestAssets/base_kyokucho.bmp rename to BmpPP/test/testAssets/base_kyokucho.bmp diff --git a/Test/TestAssets/base_mateya.bmp b/BmpPP/test/testAssets/base_mateya.bmp similarity index 100% rename from Test/TestAssets/base_mateya.bmp rename to BmpPP/test/testAssets/base_mateya.bmp diff --git a/Test/TestAssets/base_mateya_rot_180deg.bmp b/BmpPP/test/testAssets/base_mateya_rot_180deg.bmp similarity index 100% rename from Test/TestAssets/base_mateya_rot_180deg.bmp rename to BmpPP/test/testAssets/base_mateya_rot_180deg.bmp diff --git a/Test/TestAssets/base_mateya_rot_270deg.bmp b/BmpPP/test/testAssets/base_mateya_rot_270deg.bmp similarity index 100% rename from Test/TestAssets/base_mateya_rot_270deg.bmp rename to BmpPP/test/testAssets/base_mateya_rot_270deg.bmp diff --git a/Test/TestAssets/base_mateya_rot_90deg.bmp b/BmpPP/test/testAssets/base_mateya_rot_90deg.bmp similarity index 100% rename from Test/TestAssets/base_mateya_rot_90deg.bmp rename to BmpPP/test/testAssets/base_mateya_rot_90deg.bmp diff --git a/Test/TestAssets/base_red.bmp b/BmpPP/test/testAssets/base_red.bmp similarity index 100% rename from Test/TestAssets/base_red.bmp rename to BmpPP/test/testAssets/base_red.bmp diff --git a/Test/TestAssets/basea_blue.bmp b/BmpPP/test/testAssets/basea_blue.bmp similarity index 100% rename from Test/TestAssets/basea_blue.bmp rename to BmpPP/test/testAssets/basea_blue.bmp diff --git a/Test/TestAssets/basea_fuwadera2.bmp b/BmpPP/test/testAssets/basea_fuwadera2.bmp similarity index 100% rename from Test/TestAssets/basea_fuwadera2.bmp rename to BmpPP/test/testAssets/basea_fuwadera2.bmp diff --git a/Test/TestAssets/basea_fuwadera2_mirror_hor.bmp b/BmpPP/test/testAssets/basea_fuwadera2_mirror_hor.bmp similarity index 100% rename from Test/TestAssets/basea_fuwadera2_mirror_hor.bmp rename to BmpPP/test/testAssets/basea_fuwadera2_mirror_hor.bmp diff --git a/Test/TestAssets/basea_fuwadera2_mirror_ver.bmp b/BmpPP/test/testAssets/basea_fuwadera2_mirror_ver.bmp similarity index 100% rename from Test/TestAssets/basea_fuwadera2_mirror_ver.bmp rename to BmpPP/test/testAssets/basea_fuwadera2_mirror_ver.bmp diff --git a/Test/TestAssets/basea_gradient.bmp b/BmpPP/test/testAssets/basea_gradient.bmp similarity index 100% rename from Test/TestAssets/basea_gradient.bmp rename to BmpPP/test/testAssets/basea_gradient.bmp diff --git a/Test/TestAssets/basea_green.bmp b/BmpPP/test/testAssets/basea_green.bmp similarity index 100% rename from Test/TestAssets/basea_green.bmp rename to BmpPP/test/testAssets/basea_green.bmp diff --git a/Test/TestAssets/basea_hachi.bmp b/BmpPP/test/testAssets/basea_hachi.bmp similarity index 100% rename from Test/TestAssets/basea_hachi.bmp rename to BmpPP/test/testAssets/basea_hachi.bmp diff --git a/Test/TestAssets/basea_hachi_cropped.bmp b/BmpPP/test/testAssets/basea_hachi_cropped.bmp similarity index 100% rename from Test/TestAssets/basea_hachi_cropped.bmp rename to BmpPP/test/testAssets/basea_hachi_cropped.bmp diff --git a/Test/TestAssets/basea_kyokucho.bmp b/BmpPP/test/testAssets/basea_kyokucho.bmp similarity index 100% rename from Test/TestAssets/basea_kyokucho.bmp rename to BmpPP/test/testAssets/basea_kyokucho.bmp diff --git a/Test/TestAssets/basea_red.bmp b/BmpPP/test/testAssets/basea_red.bmp similarity index 100% rename from Test/TestAssets/basea_red.bmp rename to BmpPP/test/testAssets/basea_red.bmp diff --git a/Test/TestAssets/readme.md b/BmpPP/test/testAssets/readme.md similarity index 100% rename from Test/TestAssets/readme.md rename to BmpPP/test/testAssets/readme.md diff --git a/Eule b/Eule new file mode 160000 index 0000000..3ff7a3c --- /dev/null +++ b/Eule @@ -0,0 +1 @@ +Subproject commit 3ff7a3cc25e628ce92c8f416a922228adc0230d8 diff --git a/Exec/CMakeLists.txt b/Exec/CMakeLists.txt deleted file mode 100644 index 356f283..0000000 --- a/Exec/CMakeLists.txt +++ /dev/null @@ -1,20 +0,0 @@ -cmake_minimum_required(VERSION 3.16) -project(BmpPP_exec) - -set(CMAKE_CXX_STANDARD 17) - -ADD_COMPILE_DEFINITIONS(_EULE_NO_INTRINSICS_) -ADD_COMPILE_DEFINITIONS(_BMPLIB_DEBUG_OUTPUT_) - -INCLUDE_DIRECTORIES(../Src/Eule/) -INCLUDE_DIRECTORIES(../Src/) - -FILE(GLOB Eule ../Src/Eule/Eule/*.cpp) -FILE(GLOB BmpPP ../Src/*.cpp) - -add_executable(BmpPP_exec - ${Eule} - ${BmpPP} - - main.cpp -) diff --git a/Src/CMakeLists.txt b/Src/CMakeLists.txt deleted file mode 100644 index b3d93d3..0000000 --- a/Src/CMakeLists.txt +++ /dev/null @@ -1,17 +0,0 @@ -cmake_minimum_required(VERSION 3.16) -project(BmpPP) - -set(CMAKE_CXX_STANDARD 17) - -ADD_COMPILE_DEFINITIONS(_EULE_NO_INTRINSICS_) -INCLUDE_DIRECTORIES(./Eule/) -FILE(GLOB Eule ./Eule/Eule/*.cpp) - -add_library(BmpPP - ${Eule} - - BMP.cpp - BmpWriter.cpp - BmpReader.cpp - BmpHeader.cpp -) diff --git a/Test/CMakeLists.txt b/Test/CMakeLists.txt deleted file mode 100644 index 285fd40..0000000 --- a/Test/CMakeLists.txt +++ /dev/null @@ -1,41 +0,0 @@ -cmake_minimum_required(VERSION 3.16) -project(Test) - -set(CMAKE_CXX_STANDARD 17) - -ADD_COMPILE_DEFINITIONS(_EULE_NO_INTRINSICS_) - -INCLUDE_DIRECTORIES(../Src/Eule/) -INCLUDE_DIRECTORIES(../Src/) - -FILE(GLOB Eule ../Src/Eule/Eule/*.cpp) -FILE(GLOB BmpPP ../Src/*.cpp) - -add_executable(Test - ${Eule} - ${BmpPP} - - Catch2.h - main.cpp - - BmpHeader.cpp - ReInitialize.cpp - Uninitialized.cpp - Read.cpp - Write.cpp - OperatorEquals.cpp - FillChannel.cpp - MirrorHorizontally.cpp - MirrorVertically.cpp - SwapChannels.cpp - Rotate.cpp - ConvertColormode.cpp - Crop.cpp -) - -# Move test images to build dir -ADD_CUSTOM_COMMAND( - TARGET ${PROJECT_NAME} POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy_directory - ${CMAKE_SOURCE_DIR}/TestAssets/ $ -) diff --git a/configure.sh b/configure.sh deleted file mode 100644 index 7aa2aa5..0000000 --- a/configure.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -# Replace {PROJECT_NAME} with first parameter given in all files -find . -type f -not \( -path '*.git/*' -or -path '*configure.sh*' -or -name 'Catch2.h' \) -exec sed -i "s/{PROJECT_NAME}/$1/g" {} \; -