Skip to content

Commit 489c31c

Browse files
author
Andrey Arutiunian
committed
move from lib folder and clangd config
1 parent c636844 commit 489c31c

42 files changed

Lines changed: 77 additions & 20 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.clangd‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
CompileFlags:
2+
CompilationDatabase: build/Debug

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@ build/
22
.venv/
33
CMakeUserPresets.json
44
.DS_Store
5-
cmake
5+
cmake
6+
.cache/

‎CMakeLists.txt‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -18,26 +18,26 @@ message(CMAKE_CXX_COMPILER="${CMAKE_CXX_COMPILER}")
1818

1919
# liblena
2020
add_library(liblena
21-
${CMAKE_CURRENT_SOURCE_DIR}/lib/src/YCbCrConverter.cpp
22-
${CMAKE_CURRENT_SOURCE_DIR}/lib/src/DCT.cpp
23-
${CMAKE_CURRENT_SOURCE_DIR}/lib/src/Quantizator.cpp
24-
${CMAKE_CURRENT_SOURCE_DIR}/lib/src/HuffmanEncoder.cpp
21+
${CMAKE_CURRENT_SOURCE_DIR}/src/YCbCrConverter.cpp
22+
${CMAKE_CURRENT_SOURCE_DIR}/src/DCT.cpp
23+
${CMAKE_CURRENT_SOURCE_DIR}/src/Quantizator.cpp
24+
${CMAKE_CURRENT_SOURCE_DIR}/src/HuffmanEncoder.cpp
2525

26-
${CMAKE_CURRENT_SOURCE_DIR}/lib/include/zigzag.h
27-
${CMAKE_CURRENT_SOURCE_DIR}/lib/include/DPCM.h
28-
${CMAKE_CURRENT_SOURCE_DIR}/lib/include/RLC.h
29-
${CMAKE_CURRENT_SOURCE_DIR}/lib/include/HuffmanTable.h
30-
${CMAKE_CURRENT_SOURCE_DIR}/lib/include/PPM.h
31-
${CMAKE_CURRENT_SOURCE_DIR}/lib/src/QuantizationTable.cpp
26+
${CMAKE_CURRENT_SOURCE_DIR}/include/libjpeg/Zigzag.h
27+
${CMAKE_CURRENT_SOURCE_DIR}/include/libjpeg/DPCM.h
28+
${CMAKE_CURRENT_SOURCE_DIR}/include/libjpeg/RLC.h
29+
${CMAKE_CURRENT_SOURCE_DIR}/include/libjpeg/HuffmanTable.h
30+
${CMAKE_CURRENT_SOURCE_DIR}/include/libjpeg/PPM.h
31+
${CMAKE_CURRENT_SOURCE_DIR}/src/QuantizationTable.cpp
3232

3333

3434
# types
35-
${CMAKE_CURRENT_SOURCE_DIR}/lib/src/ImageCh.cpp
36-
${CMAKE_CURRENT_SOURCE_DIR}/lib/src/Image.cpp
35+
${CMAKE_CURRENT_SOURCE_DIR}/src/ImageCh.cpp
36+
${CMAKE_CURRENT_SOURCE_DIR}/src/Image.cpp
3737
)
3838
target_compile_features(liblena PRIVATE cxx_std_20)
3939
target_include_directories(liblena PRIVATE
40-
${CMAKE_CURRENT_SOURCE_DIR}/lib/include/
40+
${CMAKE_CURRENT_SOURCE_DIR}/include/libjpeg
4141
)
4242

4343
target_link_libraries(liblena PRIVATE
@@ -69,7 +69,7 @@ add_executable(liblena_tests
6969
# ${CMAKE_CURRENT_SOURCE_DIR}/Tests/JPEG.cpp
7070
)
7171
target_include_directories(liblena_tests PRIVATE
72-
${CMAKE_CURRENT_SOURCE_DIR}/lib/include/
72+
${CMAKE_CURRENT_SOURCE_DIR}/include/libjpeg/
7373
)
7474

7575
target_link_libraries(liblena_tests

‎Tests/test_PPMReader.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#include <gtest/gtest.h>
2+
#include <filesystem>
23

34
#include "PPMReader.h"
45

lib/include/BitStream.hpp renamed to include/libjpeg/BitStream.hpp

File renamed without changes.

lib/include/Compressor.h renamed to include/libjpeg/Compressor.h

File renamed without changes.

lib/include/DCT.h renamed to include/libjpeg/DCT.h

File renamed without changes.

lib/include/DPCM.h renamed to include/libjpeg/DPCM.h

File renamed without changes.

lib/include/Downsampling.hpp renamed to include/libjpeg/Downsampling.hpp

File renamed without changes.

lib/include/Globals.hpp renamed to include/libjpeg/Globals.hpp

File renamed without changes.

0 commit comments

Comments
 (0)