Skip to content

Merges PR #236, and another two smaller issues. #237

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aous72 merged 3 commits into from
Dec 24, 2025
Merged

Merges PR #236, and another two smaller issues. #237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2863b7d
Rename src/core/common to src/core/openjph
cary-ilm Dec 18, 2025
6cfd213
This fixes PR compilation
aous72 Dec 24, 2025
b90e43f
Merge branch 'master' into common2openjph
aous72 Dec 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ojph_version.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# Parse version file
# credit: https://stackoverflow.com/a/47084079

file(READ "${CMAKE_CURRENT_SOURCE_DIR}/src/core/common/ojph_version.h" VERFILE)
file(READ "${CMAKE_CURRENT_SOURCE_DIR}/src/core/openjph/ojph_version.h" VERFILE)
if (NOT VERFILE)
message(FATAL_ERROR "Failed to parse ojph_version.h!")
endif()
Expand Down
2 changes: 1 addition & 1 deletion src/apps/ojph_expand/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ if(EMSCRIPTEN)
endif()
else()
if (NOT OJPH_DISABLE_SIMD)
if (("${OJPH_TARGET_ARCH}" MATCHES "OJPH_ARCH_X86_64")
if (("${OJPH_TARGET_ARCH}" MATCHES "OJPH_ARCH_X86_64")
OR ("${OJPH_TARGET_ARCH}" MATCHES "OJPH_ARCH_I386")
OR MULTI_GEN_X86_64)

Expand Down
6 changes: 3 additions & 3 deletions src/core/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ file(GLOB CODING_SSSE3 "coding/*_ssse3.cpp")
file(GLOB CODING_WASM "coding/*_wasm.cpp")
file(GLOB CODING_AVX2 "coding/*_avx2.cpp")
file(GLOB CODING_AVX512 "coding/*_avx512.cpp")
file(GLOB COMMON "common/*.h")
file(GLOB COMMON "openjph/*.h")
file(GLOB OTHERS "others/*.cpp" "others/*.c")
file(GLOB TRANSFORM "transform/*.cpp" "transform/*.h")
file(GLOB TRANSFORM_SSE "transform/*_sse.cpp")
Expand Down Expand Up @@ -137,7 +137,7 @@ endif()
## include library version/name
set_target_properties(openjph PROPERTIES POSITION_INDEPENDENT_CODE ON)
target_compile_definitions(openjph PUBLIC _FILE_OFFSET_BITS=64)
target_include_directories(openjph PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/common> $<INSTALL_INTERFACE:include>)
target_include_directories(openjph PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/openjph> $<INSTALL_INTERFACE:include>)

## This is to check if aligned_alloc or posix_memalign is available
# We want the code to compile for C11 and C++11.
Expand Down Expand Up @@ -173,7 +173,7 @@ install(TARGETS openjph
EXPORT openjph-targets
)

install(DIRECTORY common/
install(DIRECTORY openjph/
DESTINATION include/openjph
FILES_MATCHING
PATTERN "*.h"
Expand Down
0 src/core/common/ojph_arch.h → src/core/openjph/ojph_arch.h
View file
Open in desktop
File renamed without changes.
0 src/core/common/ojph_arg.h → src/core/openjph/ojph_arg.h
View file
Open in desktop
File renamed without changes.
0 src/core/common/ojph_base.h → src/core/openjph/ojph_base.h
View file
Open in desktop
File renamed without changes.
0 src/core/common/ojph_codestream.h → src/core/openjph/ojph_codestream.h
View file
Open in desktop
File renamed without changes.
0 src/core/common/ojph_defs.h → src/core/openjph/ojph_defs.h
View file
Open in desktop
File renamed without changes.
0 src/core/common/ojph_file.h → src/core/openjph/ojph_file.h
View file
Open in desktop
File renamed without changes.
0 src/core/common/ojph_mem.h → src/core/openjph/ojph_mem.h
View file
Open in desktop
File renamed without changes.
0 src/core/common/ojph_message.h → src/core/openjph/ojph_message.h
View file
Open in desktop
File renamed without changes.
0 src/core/common/ojph_params.h → src/core/openjph/ojph_params.h
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions src/core/common/ojph_version.h → src/core/openjph/ojph_version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,5 @@
//***************************************************************************/

#define OPENJPH_VERSION_MAJOR 0
#define OPENJPH_VERSION_MINOR 25
#define OPENJPH_VERSION_PATCH 3
#define OPENJPH_VERSION_MINOR 26
#define OPENJPH_VERSION_PATCH 0
2 changes: 1 addition & 1 deletion tests/mse_pae.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ project (mse_pae DESCRIPTION "A program to find MSE and peak absolute error betw
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})

include_directories(../src/apps/common)
include_directories(../src/core/common)
include_directories(../src/core/openjph)

# Configure source files
set(SOURCES mse_pae.cpp "../src/apps/others/ojph_img_io.cpp" "../src/core/others/ojph_message.cpp" "../src/core/others/ojph_file.cpp" "../src/core/others/ojph_mem.cpp" "../src/core/others/ojph_mem.c" "../src/core/others/ojph_arch.cpp")
Expand Down
Loading