Skip to content
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

Sync to main #159

Merged
merged 3 commits into from
Dec 22, 2023
+11 −4
Merged

Sync to main #159

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
a7890ea
Fix compilation error on aarch64 with gcc
osamu620 Nov 27, 2023
68aff5f
Update CHANGELOG and open_htj2k_version.hpp
osamu620 Nov 27, 2023
354bd66
Update CHANGELOG
osamu620 Nov 27, 2023
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
4 changes: 4 additions & 0 deletions CHANGELOG
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# [0.2.2] - 2023-11-27

* Fix compilation errors in aarch64 and gcc 9 or earlier

# [0.2.1] - 2023-11-13

* Add installation part to CMakeLists.txt
Expand Down
2 changes: 1 addition & 1 deletion source/core/common/open_htj2k_version.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@

#define OPENHTJ2K_VERSION_MAJOR 0
#define OPENHTJ2K_VERSION_MINOR 2
#define OPENHTJ2K_VERSION_PATCH 1
#define OPENHTJ2K_VERSION_PATCH 2
9 changes: 6 additions & 3 deletions source/core/common/utils.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,11 @@
#include <x86intrin.h>
#endif

#ifndef __clang__
#ifndef __INTEL_COMPILER
#if defined(__GNUC__) && (__GNUC__ < 10)
#if defined(_M_IX86) || defined(_M_X64) || defined(__x86_64__) || defined(_M_X64) || defined(__i386__) \
|| defined(_M_IX86)
#ifndef __clang__
#ifndef __INTEL_COMPILER
#if defined(__GNUC__) && (__GNUC__ < 10)
static inline void _mm256_storeu2_m128i(__m128i_u* __addr_hi, __m128i_u* __addr_lo, __m256i __a) {
__m128i __v128;

Expand All @@ -67,6 +69,7 @@ static inline void _mm256_storeu2_m128i(__m128i_u* __addr_hi, __m128i_u* __addr_
__v128 = _mm256_extractf128_si256(__a, 1);
_mm_storeu_si128(__addr_hi, __v128);
}
#endif
#endif
#endif
#endif
Expand Down
Loading