Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package openjph for openSUSE:Factory checked
in at 2025-06-02 22:00:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/openjph (Old)
and /work/SRC/openSUSE:Factory/.openjph.new.16005 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openjph"
Mon Jun 2 22:00:02 2025 rev:3 rq:1281735 version:0.21.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/openjph/openjph.changes 2025-03-07
16:48:42.093835457 +0100
+++ /work/SRC/openSUSE:Factory/.openjph.new.16005/openjph.changes
2025-06-02 22:00:23.440798405 +0200
@@ -1,0 +2,9 @@
+Mon Jun 2 05:45:59 UTC 2025 - Michael Vetter <mvet...@suse.com>
+
+- Update to 0.21.3:
+ * This adds support for macOS multi-generation which can be invoked with
+ -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64". #185 #185
+ * This also adds the -fPIC flag to the library to generate position
+ independent code.
+
+-------------------------------------------------------------------
Old:
----
0.21.2.tar.gz
New:
----
0.21.3.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openjph.spec ++++++
--- /var/tmp/diff_new_pack.XXg0bQ/_old 2025-06-02 22:00:23.924818479 +0200
+++ /var/tmp/diff_new_pack.XXg0bQ/_new 2025-06-02 22:00:23.928818645 +0200
@@ -17,7 +17,7 @@
Name: openjph
-Version: 0.21.2
+Version: 0.21.3
Release: 0
Summary: An implementation of JPEG2000 Part-15
License: BSD-2-Clause
++++++ 0.21.2.tar.gz -> 0.21.3.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/OpenJPH-0.21.2/.github/workflows/ccp-workflow.yml
new/OpenJPH-0.21.3/.github/workflows/ccp-workflow.yml
--- old/OpenJPH-0.21.2/.github/workflows/ccp-workflow.yml 2025-03-06
06:04:52.000000000 +0100
+++ new/OpenJPH-0.21.3/.github/workflows/ccp-workflow.yml 2025-05-29
05:04:12.000000000 +0200
@@ -14,7 +14,7 @@
matrix:
include: [
{ system: MacOS, runner: macos-latest },
- { system: Ubuntu-20, runner: ubuntu-20.04 },
+ { system: Ubuntu-22, runner: ubuntu-22.04 },
{ system: Ubuntu-latest, runner: ubuntu-latest },
]
name: ${{ matrix.system }} Build
@@ -26,6 +26,24 @@
working-directory: build
- name: build
run: make
+ working-directory: build
+
+ build_mac:
+ strategy:
+ fail-fast: false
+ matrix:
+ include: [
+ { system: MacOS, runner: macos-latest },
+ ]
+ name: ${{ matrix.system }} Build
+ runs-on: ${{ matrix.runner }}
+ steps:
+ - uses: actions/checkout@v4
+ - name: cmake
+ run: cmake -DOJPH_BUILD_STREAM_EXPAND=ON
-DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" -DOJPH_ENABLE_TIFF_SUPPORT=OFF ..
+ working-directory: build
+ - name: build
+ run: make
working-directory: build
build_windows:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/OpenJPH-0.21.2/CMakeLists.txt
new/OpenJPH-0.21.3/CMakeLists.txt
--- old/OpenJPH-0.21.2/CMakeLists.txt 2025-03-06 06:04:52.000000000 +0100
+++ new/OpenJPH-0.21.3/CMakeLists.txt 2025-05-29 05:04:12.000000000 +0200
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.11.0)
+cmake_minimum_required(VERSION 3.12.0)
## Library name/version
include(ojph_version.cmake)
@@ -19,6 +19,22 @@
target_architecture(OJPH_TARGET_ARCH)
message(STATUS "CPU Architecture is ${OJPH_TARGET_ARCH}")
+## Building for multi-generation
+# This is useful for when we are building a multi-architecture build, such as
when using
+# the -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" build configuration
+if (CMAKE_OSX_ARCHITECTURES)
+ list(FIND CMAKE_OSX_ARCHITECTURES "x86_64" x86_64_index)
+ if (${x86_64_index} GREATER -1)
+ set(MULTI_GEN_X86_64 TRUE)
+ endif()
+ unset(x86_64_index)
+ list(FIND CMAKE_OSX_ARCHITECTURES "arm64" arm64_index)
+ if (${arm64_index} GREATER -1)
+ set(MULTI_GEN_ARM64 TRUE)
+ endif()
+ unset(arm64_index)
+endif()
+
## options
option(BUILD_SHARED_LIBS "Shared Libraries" ON)
option(OJPH_ENABLE_TIFF_SUPPORT "Enables input and output support for TIFF
files" ON)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/OpenJPH-0.21.2/src/apps/ojph_compress/CMakeLists.txt
new/OpenJPH-0.21.3/src/apps/ojph_compress/CMakeLists.txt
--- old/OpenJPH-0.21.2/src/apps/ojph_compress/CMakeLists.txt 2025-03-06
06:04:52.000000000 +0100
+++ new/OpenJPH-0.21.3/src/apps/ojph_compress/CMakeLists.txt 2025-05-29
05:04:12.000000000 +0200
@@ -21,7 +21,10 @@
endif()
else()
if (NOT OJPH_DISABLE_SIMD)
- if (("${OJPH_TARGET_ARCH}" MATCHES "OJPH_ARCH_X86_64") OR
("${OJPH_TARGET_ARCH}" MATCHES "OJPH_ARCH_I386"))
+ if (("${OJPH_TARGET_ARCH}" MATCHES "OJPH_ARCH_X86_64")
+ OR ("${OJPH_TARGET_ARCH}" MATCHES "OJPH_ARCH_I386")
+ OR MULTI_GEN_X86_64)
+
if (NOT OJPH_DISABLE_SSE4)
list(APPEND SOURCES ${OJPH_IMG_IO_SSE4})
source_group("others" FILES ${OJPH_IMG_IO_SSE4})
@@ -38,7 +41,9 @@
set_source_files_properties(${OJPH_IMG_IO_SSE4} PROPERTIES
COMPILE_FLAGS -msse4.1)
set_source_files_properties(${OJPH_IMG_IO_AVX2} PROPERTIES
COMPILE_FLAGS -mavx2)
endif()
- elseif ("${OJPH_TARGET_ARCH}" MATCHES "OJPH_ARCH_ARM")
+ endif()
+
+ if (("${OJPH_TARGET_ARCH}" MATCHES "OJPH_ARCH_ARM") OR MULTI_GEN_ARM64)
endif()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/OpenJPH-0.21.2/src/apps/ojph_expand/CMakeLists.txt
new/OpenJPH-0.21.3/src/apps/ojph_expand/CMakeLists.txt
--- old/OpenJPH-0.21.2/src/apps/ojph_expand/CMakeLists.txt 2025-03-06
06:04:52.000000000 +0100
+++ new/OpenJPH-0.21.3/src/apps/ojph_expand/CMakeLists.txt 2025-05-29
05:04:12.000000000 +0200
@@ -21,7 +21,10 @@
endif()
else()
if (NOT OJPH_DISABLE_SIMD)
- if (("${OJPH_TARGET_ARCH}" MATCHES "OJPH_ARCH_X86_64") OR
("${OJPH_TARGET_ARCH}" MATCHES "OJPH_ARCH_I386"))
+ if (("${OJPH_TARGET_ARCH}" MATCHES "OJPH_ARCH_X86_64")
+ OR ("${OJPH_TARGET_ARCH}" MATCHES "OJPH_ARCH_I386")
+ OR MULTI_GEN_X86_64)
+
if (NOT OJPH_DISABLE_SSE4)
list(APPEND SOURCES ${OJPH_IMG_IO_SSE4})
source_group("others" FILES ${OJPH_IMG_IO_SSE4})
@@ -38,7 +41,9 @@
set_source_files_properties(${OJPH_IMG_IO_SSE4} PROPERTIES
COMPILE_FLAGS -msse4.1)
set_source_files_properties(${OJPH_IMG_IO_AVX2} PROPERTIES
COMPILE_FLAGS -mavx2)
endif()
- elseif ("${OJPH_TARGET_ARCH}" MATCHES "OJPH_ARCH_ARM")
+ endif()
+
+ if (("${OJPH_TARGET_ARCH}" MATCHES "OJPH_ARCH_ARM") OR MULTI_GEN_ARM64)
endif()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/OpenJPH-0.21.2/src/apps/others/ojph_img_io_avx2.cpp
new/OpenJPH-0.21.3/src/apps/others/ojph_img_io_avx2.cpp
--- old/OpenJPH-0.21.2/src/apps/others/ojph_img_io_avx2.cpp 2025-03-06
06:04:52.000000000 +0100
+++ new/OpenJPH-0.21.3/src/apps/others/ojph_img_io_avx2.cpp 2025-05-29
05:04:12.000000000 +0200
@@ -35,6 +35,8 @@
// Date: 23 May 2022
//***************************************************************************/
+#include "ojph_arch.h"
+#if defined(OJPH_ARCH_I386) || defined(OJPH_ARCH_X86_64)
#include <cstdlib>
#include <cstring>
@@ -352,3 +354,5 @@
}
}
}
+
+#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/OpenJPH-0.21.2/src/apps/others/ojph_img_io_sse41.cpp
new/OpenJPH-0.21.3/src/apps/others/ojph_img_io_sse41.cpp
--- old/OpenJPH-0.21.2/src/apps/others/ojph_img_io_sse41.cpp 2025-03-06
06:04:52.000000000 +0100
+++ new/OpenJPH-0.21.3/src/apps/others/ojph_img_io_sse41.cpp 2025-05-29
05:04:12.000000000 +0200
@@ -35,6 +35,10 @@
// Date: 23 May 2022
//***************************************************************************/
+#include "ojph_arch.h"
+#if defined(OJPH_ARCH_I386) \
+ || defined(OJPH_ARCH_X86_64) \
+ || defined(OJPH_ENABLE_WASM_SIMD)
#include <cstdlib>
#include <cstring>
@@ -505,3 +509,5 @@
}
}
}
+
+#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/OpenJPH-0.21.2/src/core/CMakeLists.txt
new/OpenJPH-0.21.3/src/core/CMakeLists.txt
--- old/OpenJPH-0.21.2/src/core/CMakeLists.txt 2025-03-06 06:04:52.000000000
+0100
+++ new/OpenJPH-0.21.3/src/core/CMakeLists.txt 2025-05-29 05:04:12.000000000
+0200
@@ -40,7 +40,9 @@
endif()
else()
if (NOT OJPH_DISABLE_SIMD)
- if (("${OJPH_TARGET_ARCH}" MATCHES "OJPH_ARCH_X86_64") OR
("${OJPH_TARGET_ARCH}" MATCHES "OJPH_ARCH_I386"))
+ if (("${OJPH_TARGET_ARCH}" MATCHES "OJPH_ARCH_X86_64")
+ OR ("${OJPH_TARGET_ARCH}" MATCHES "OJPH_ARCH_I386")
+ OR MULTI_GEN_X86_64)
if (NOT OJPH_DISABLE_SSE)
list(APPEND SOURCES ${CODESTREAM_SSE} ${TRANSFORM_SSE})
@@ -67,7 +69,7 @@
source_group("transform" FILES ${TRANSFORM_AVX2})
source_group("coding" FILES ${CODING_AVX2})
endif()
- if ((NOT OJPH_DISABLE_AVX512) AND ("${OJPH_TARGET_ARCH}" MATCHES
"OJPH_ARCH_X86_64"))
+ if (NOT OJPH_DISABLE_AVX512)
list(APPEND SOURCES ${CODING_AVX512} ${TRANSFORM_AVX512})
source_group("coding" FILES ${CODING_AVX512})
source_group("transform" FILES ${TRANSFORM_AVX512})
@@ -104,14 +106,14 @@
set_source_files_properties(transform/ojph_transform_avx2.cpp
PROPERTIES COMPILE_FLAGS -mavx2)
set_source_files_properties(transform/ojph_transform_avx512.cpp
PROPERTIES COMPILE_FLAGS -mavx512f)
endif()
+ endif()
- elseif ("${OJPH_TARGET_ARCH}" MATCHES "OJPH_ARCH_ARM")
+ if (("${OJPH_TARGET_ARCH}" MATCHES "OJPH_ARCH_ARM") OR MULTI_GEN_ARM64)
endif()
endif()
-
endif()
add_library(openjph ${SOURCES})
@@ -122,6 +124,9 @@
endif()
## include library version/name
+if (NOT MSVC)
+ target_compile_options(openjph PRIVATE -fPIC)
+endif()
target_compile_definitions(openjph PUBLIC _FILE_OFFSET_BITS=64)
target_include_directories(openjph PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/common>
$<INSTALL_INTERFACE:include/openjph>)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/OpenJPH-0.21.2/src/core/codestream/ojph_codestream_avx.cpp
new/OpenJPH-0.21.3/src/core/codestream/ojph_codestream_avx.cpp
--- old/OpenJPH-0.21.2/src/core/codestream/ojph_codestream_avx.cpp
2025-03-06 06:04:52.000000000 +0100
+++ new/OpenJPH-0.21.3/src/core/codestream/ojph_codestream_avx.cpp
2025-05-29 05:04:12.000000000 +0200
@@ -35,6 +35,8 @@
// Date: 15 May 2022
//***************************************************************************/
+#include "ojph_arch.h"
+#if defined(OJPH_ARCH_I386) || defined(OJPH_ARCH_X86_64)
#include <immintrin.h>
#include "ojph_defs.h"
@@ -51,4 +53,6 @@
}
}
-}
\ No newline at end of file
+}
+
+#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/OpenJPH-0.21.2/src/core/codestream/ojph_codestream_avx2.cpp
new/OpenJPH-0.21.3/src/core/codestream/ojph_codestream_avx2.cpp
--- old/OpenJPH-0.21.2/src/core/codestream/ojph_codestream_avx2.cpp
2025-03-06 06:04:52.000000000 +0100
+++ new/OpenJPH-0.21.3/src/core/codestream/ojph_codestream_avx2.cpp
2025-05-29 05:04:12.000000000 +0200
@@ -35,6 +35,9 @@
// Date: 15 May 2022
//***************************************************************************/
+#include "ojph_arch.h"
+#if defined(OJPH_ARCH_I386) || defined(OJPH_ARCH_X86_64)
+
#include <climits>
#include <immintrin.h>
#include "ojph_defs.h"
@@ -271,3 +274,5 @@
}
}
}
+
+#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/OpenJPH-0.21.2/src/core/codestream/ojph_codestream_sse.cpp
new/OpenJPH-0.21.3/src/core/codestream/ojph_codestream_sse.cpp
--- old/OpenJPH-0.21.2/src/core/codestream/ojph_codestream_sse.cpp
2025-03-06 06:04:52.000000000 +0100
+++ new/OpenJPH-0.21.3/src/core/codestream/ojph_codestream_sse.cpp
2025-05-29 05:04:12.000000000 +0200
@@ -35,6 +35,9 @@
// Date: 15 May 2022
//***************************************************************************/
+#include "ojph_arch.h"
+#if defined(OJPH_ARCH_I386) || defined(OJPH_ARCH_X86_64)
+
#include <immintrin.h>
#include "ojph_defs.h"
@@ -50,4 +53,6 @@
_mm_storeu_ps(p, zero);
}
}
-}
\ No newline at end of file
+}
+
+#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/OpenJPH-0.21.2/src/core/codestream/ojph_codestream_sse2.cpp
new/OpenJPH-0.21.3/src/core/codestream/ojph_codestream_sse2.cpp
--- old/OpenJPH-0.21.2/src/core/codestream/ojph_codestream_sse2.cpp
2025-03-06 06:04:52.000000000 +0100
+++ new/OpenJPH-0.21.3/src/core/codestream/ojph_codestream_sse2.cpp
2025-05-29 05:04:12.000000000 +0200
@@ -35,6 +35,9 @@
// Date: 15 May 2022
//***************************************************************************/
+#include "ojph_arch.h"
+#if defined(OJPH_ARCH_I386) || defined(OJPH_ARCH_X86_64)
+
#include <climits>
#include <immintrin.h>
#include "ojph_defs.h"
@@ -287,4 +290,6 @@
}
}
}
-}
\ No newline at end of file
+}
+
+#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/OpenJPH-0.21.2/src/core/coding/ojph_block_decoder_avx2.cpp
new/OpenJPH-0.21.3/src/core/coding/ojph_block_decoder_avx2.cpp
--- old/OpenJPH-0.21.2/src/core/coding/ojph_block_decoder_avx2.cpp
2025-03-06 06:04:52.000000000 +0100
+++ new/OpenJPH-0.21.3/src/core/coding/ojph_block_decoder_avx2.cpp
2025-05-29 05:04:12.000000000 +0200
@@ -39,6 +39,9 @@
* @brief implements a faster HTJ2K block decoder using avx2
*/
+#include "ojph_arch.h"
+#if defined(OJPH_ARCH_I386) || defined(OJPH_ARCH_X86_64)
+
#include <string>
#include <iostream>
@@ -46,7 +49,6 @@
#include <cstring>
#include "ojph_block_common.h"
#include "ojph_block_decoder.h"
-#include "ojph_arch.h"
#include "ojph_message.h"
#include <immintrin.h>
@@ -2038,3 +2040,5 @@
}
}
}
+
+#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/OpenJPH-0.21.2/src/core/coding/ojph_block_decoder_ssse3.cpp
new/OpenJPH-0.21.3/src/core/coding/ojph_block_decoder_ssse3.cpp
--- old/OpenJPH-0.21.2/src/core/coding/ojph_block_decoder_ssse3.cpp
2025-03-06 06:04:52.000000000 +0100
+++ new/OpenJPH-0.21.3/src/core/coding/ojph_block_decoder_ssse3.cpp
2025-05-29 05:04:12.000000000 +0200
@@ -40,6 +40,9 @@
* @brief implements a faster HTJ2K block decoder using ssse3
*/
+#include "ojph_arch.h"
+#if defined(OJPH_ARCH_I386) || defined(OJPH_ARCH_X86_64)
+
#include <string>
#include <iostream>
@@ -47,7 +50,6 @@
#include <cstring>
#include "ojph_block_common.h"
#include "ojph_block_decoder.h"
-#include "ojph_arch.h"
#include "ojph_message.h"
#include <immintrin.h>
@@ -2064,3 +2066,5 @@
}
}
}
+
+#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/OpenJPH-0.21.2/src/core/coding/ojph_block_encoder_avx2.cpp
new/OpenJPH-0.21.3/src/core/coding/ojph_block_encoder_avx2.cpp
--- old/OpenJPH-0.21.2/src/core/coding/ojph_block_encoder_avx2.cpp
2025-03-06 06:04:52.000000000 +0100
+++ new/OpenJPH-0.21.3/src/core/coding/ojph_block_encoder_avx2.cpp
2025-05-29 05:04:12.000000000 +0200
@@ -34,6 +34,9 @@
// File: ojph_block_encoder_avx2.cpp
//***************************************************************************/
+#include "ojph_arch.h"
+#if defined(OJPH_ARCH_I386) || defined(OJPH_ARCH_X86_64)
+
#include <cassert>
#include <cstring>
#include <cstdint>
@@ -1222,3 +1225,5 @@
} /* namespace local */
} /* namespace ojph */
+
+#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/OpenJPH-0.21.2/src/core/coding/ojph_block_encoder_avx512.cpp
new/OpenJPH-0.21.3/src/core/coding/ojph_block_encoder_avx512.cpp
--- old/OpenJPH-0.21.2/src/core/coding/ojph_block_encoder_avx512.cpp
2025-03-06 06:04:52.000000000 +0100
+++ new/OpenJPH-0.21.3/src/core/coding/ojph_block_encoder_avx512.cpp
2025-05-29 05:04:12.000000000 +0200
@@ -34,6 +34,9 @@
// File: ojph_block_encoder_avx512.cpp
//***************************************************************************/
+#include "ojph_arch.h"
+#if defined(OJPH_ARCH_X86_64)
+
#include <cassert>
#include <cstring>
#include <cstdint>
@@ -41,7 +44,6 @@
#include <immintrin.h>
#include "ojph_mem.h"
-#include "ojph_arch.h"
#include "ojph_block_encoder.h"
#include "ojph_message.h"
@@ -1213,3 +1215,4 @@
} /* namespace local */
} /* namespace ojph */
+#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/OpenJPH-0.21.2/src/core/common/ojph_version.h
new/OpenJPH-0.21.3/src/core/common/ojph_version.h
--- old/OpenJPH-0.21.2/src/core/common/ojph_version.h 2025-03-06
06:04:52.000000000 +0100
+++ new/OpenJPH-0.21.3/src/core/common/ojph_version.h 2025-05-29
05:04:12.000000000 +0200
@@ -35,4 +35,4 @@
#define OPENJPH_VERSION_MAJOR 0
#define OPENJPH_VERSION_MINOR 21
-#define OPENJPH_VERSION_PATCH 2
+#define OPENJPH_VERSION_PATCH 3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/OpenJPH-0.21.2/src/core/transform/ojph_colour_avx.cpp
new/OpenJPH-0.21.3/src/core/transform/ojph_colour_avx.cpp
--- old/OpenJPH-0.21.2/src/core/transform/ojph_colour_avx.cpp 2025-03-06
06:04:52.000000000 +0100
+++ new/OpenJPH-0.21.3/src/core/transform/ojph_colour_avx.cpp 2025-05-29
05:04:12.000000000 +0200
@@ -35,10 +35,12 @@
// Date: 11 October 2019
//***************************************************************************/
+#include "ojph_arch.h"
+#if defined(OJPH_ARCH_I386) || defined(OJPH_ARCH_X86_64)
+
#include <cmath>
#include "ojph_defs.h"
-#include "ojph_arch.h"
#include "ojph_colour.h"
#include "ojph_colour_local.h"
@@ -97,3 +99,5 @@
}
}
+
+#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/OpenJPH-0.21.2/src/core/transform/ojph_colour_avx2.cpp
new/OpenJPH-0.21.3/src/core/transform/ojph_colour_avx2.cpp
--- old/OpenJPH-0.21.2/src/core/transform/ojph_colour_avx2.cpp 2025-03-06
06:04:52.000000000 +0100
+++ new/OpenJPH-0.21.3/src/core/transform/ojph_colour_avx2.cpp 2025-05-29
05:04:12.000000000 +0200
@@ -35,11 +35,13 @@
// Date: 11 October 2019
//***************************************************************************/
+#include "ojph_arch.h"
+#if defined(OJPH_ARCH_I386) || defined(OJPH_ARCH_X86_64)
+
#include <climits>
#include <cmath>
#include "ojph_defs.h"
-#include "ojph_arch.h"
#include "ojph_mem.h"
#include "ojph_colour.h"
@@ -617,3 +619,5 @@
}
}
+
+#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/OpenJPH-0.21.2/src/core/transform/ojph_colour_sse.cpp
new/OpenJPH-0.21.3/src/core/transform/ojph_colour_sse.cpp
--- old/OpenJPH-0.21.2/src/core/transform/ojph_colour_sse.cpp 2025-03-06
06:04:52.000000000 +0100
+++ new/OpenJPH-0.21.3/src/core/transform/ojph_colour_sse.cpp 2025-05-29
05:04:12.000000000 +0200
@@ -35,10 +35,12 @@
// Date: 11 October 2019
//***************************************************************************/
+#include "ojph_arch.h"
+#if defined(OJPH_ARCH_I386) || defined(OJPH_ARCH_X86_64)
+
#include <cmath>
#include "ojph_defs.h"
-#include "ojph_arch.h"
#include "ojph_colour.h"
#include "ojph_colour_local.h"
@@ -96,3 +98,5 @@
}
}
}
+
+#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/OpenJPH-0.21.2/src/core/transform/ojph_colour_sse2.cpp
new/OpenJPH-0.21.3/src/core/transform/ojph_colour_sse2.cpp
--- old/OpenJPH-0.21.2/src/core/transform/ojph_colour_sse2.cpp 2025-03-06
06:04:52.000000000 +0100
+++ new/OpenJPH-0.21.3/src/core/transform/ojph_colour_sse2.cpp 2025-05-29
05:04:12.000000000 +0200
@@ -35,11 +35,13 @@
// Date: 11 October 2019
//***************************************************************************/
+#include "ojph_arch.h"
+#if defined(OJPH_ARCH_I386) || defined(OJPH_ARCH_X86_64)
+
#include <climits>
#include <cmath>
#include "ojph_defs.h"
-#include "ojph_arch.h"
#include "ojph_mem.h"
#include "ojph_colour.h"
@@ -656,3 +658,5 @@
}
}
}
+
+#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/OpenJPH-0.21.2/src/core/transform/ojph_transform_avx.cpp
new/OpenJPH-0.21.3/src/core/transform/ojph_transform_avx.cpp
--- old/OpenJPH-0.21.2/src/core/transform/ojph_transform_avx.cpp
2025-03-06 06:04:52.000000000 +0100
+++ new/OpenJPH-0.21.3/src/core/transform/ojph_transform_avx.cpp
2025-05-29 05:04:12.000000000 +0200
@@ -35,11 +35,13 @@
// Date: 28 August 2019
//***************************************************************************/
+#include "ojph_arch.h"
+#if defined(OJPH_ARCH_I386) || defined(OJPH_ARCH_X86_64)
+
#include <cstdio>
#include <immintrin.h>
#include "ojph_defs.h"
-#include "ojph_arch.h"
#include "ojph_mem.h"
#include "ojph_params.h"
#include "../codestream/ojph_params_local.h"
@@ -285,3 +287,5 @@
} // !local
} // !ojph
+
+#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/OpenJPH-0.21.2/src/core/transform/ojph_transform_avx2.cpp
new/OpenJPH-0.21.3/src/core/transform/ojph_transform_avx2.cpp
--- old/OpenJPH-0.21.2/src/core/transform/ojph_transform_avx2.cpp
2025-03-06 06:04:52.000000000 +0100
+++ new/OpenJPH-0.21.3/src/core/transform/ojph_transform_avx2.cpp
2025-05-29 05:04:12.000000000 +0200
@@ -35,11 +35,13 @@
// Date: 28 August 2019
//***************************************************************************/
+#include "ojph_arch.h"
+#if defined(OJPH_ARCH_I386) || defined(OJPH_ARCH_X86_64)
+
#include <climits>
#include <cstdio>
#include "ojph_defs.h"
-#include "ojph_arch.h"
#include "ojph_mem.h"
#include "ojph_params.h"
#include "../codestream/ojph_params_local.h"
@@ -1073,3 +1075,5 @@
} // !local
} // !ojph
+
+#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/OpenJPH-0.21.2/src/core/transform/ojph_transform_avx512.cpp
new/OpenJPH-0.21.3/src/core/transform/ojph_transform_avx512.cpp
--- old/OpenJPH-0.21.2/src/core/transform/ojph_transform_avx512.cpp
2025-03-06 06:04:52.000000000 +0100
+++ new/OpenJPH-0.21.3/src/core/transform/ojph_transform_avx512.cpp
2025-05-29 05:04:12.000000000 +0200
@@ -35,10 +35,12 @@
// Date: 13 April 2024
//***************************************************************************/
+#include "ojph_arch.h"
+#if defined(OJPH_ARCH_X86_64)
+
#include <cstdio>
#include "ojph_defs.h"
-#include "ojph_arch.h"
#include "ojph_mem.h"
#include "ojph_params.h"
#include "../codestream/ojph_params_local.h"
@@ -1423,3 +1425,5 @@
} // !local
} // !ojph
+
+#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/OpenJPH-0.21.2/src/core/transform/ojph_transform_sse.cpp
new/OpenJPH-0.21.3/src/core/transform/ojph_transform_sse.cpp
--- old/OpenJPH-0.21.2/src/core/transform/ojph_transform_sse.cpp
2025-03-06 06:04:52.000000000 +0100
+++ new/OpenJPH-0.21.3/src/core/transform/ojph_transform_sse.cpp
2025-05-29 05:04:12.000000000 +0200
@@ -35,11 +35,13 @@
// Date: 28 August 2019
//***************************************************************************/
+#include "ojph_arch.h"
+#if defined(OJPH_ARCH_I386) || defined(OJPH_ARCH_X86_64)
+
#include <cstdio>
#include <xmmintrin.h>
#include "ojph_defs.h"
-#include "ojph_arch.h"
#include "ojph_mem.h"
#include "ojph_params.h"
#include "../codestream/ojph_params_local.h"
@@ -281,3 +283,5 @@
} // !local
} // !ojph
+
+#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/OpenJPH-0.21.2/src/core/transform/ojph_transform_sse2.cpp
new/OpenJPH-0.21.3/src/core/transform/ojph_transform_sse2.cpp
--- old/OpenJPH-0.21.2/src/core/transform/ojph_transform_sse2.cpp
2025-03-06 06:04:52.000000000 +0100
+++ new/OpenJPH-0.21.3/src/core/transform/ojph_transform_sse2.cpp
2025-05-29 05:04:12.000000000 +0200
@@ -35,11 +35,13 @@
// Date: 28 August 2019
//***************************************************************************/
+#include "ojph_arch.h"
+#if defined(OJPH_ARCH_I386) || defined(OJPH_ARCH_X86_64)
+
#include <climits>
#include <cstdio>
#include "ojph_defs.h"
-#include "ojph_arch.h"
#include "ojph_mem.h"
#include "ojph_params.h"
#include "../codestream/ojph_params_local.h"
@@ -1000,3 +1002,5 @@
} // !local
} // !ojph
+
+#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/OpenJPH-0.21.2/tests/mse_pae.cmake
new/OpenJPH-0.21.3/tests/mse_pae.cmake
--- old/OpenJPH-0.21.2/tests/mse_pae.cmake 2025-03-06 06:04:52.000000000
+0100
+++ new/OpenJPH-0.21.3/tests/mse_pae.cmake 2025-05-29 05:04:12.000000000
+0200
@@ -15,7 +15,10 @@
# if SIMD are not disabled
if (NOT OJPH_DISABLE_SIMD)
- if (("${OJPH_TARGET_ARCH}" MATCHES "OJPH_ARCH_X86_64") OR
("${OJPH_TARGET_ARCH}" MATCHES "OJPH_ARCH_I386"))
+ if (("${OJPH_TARGET_ARCH}" MATCHES "OJPH_ARCH_X86_64")
+ OR ("${OJPH_TARGET_ARCH}" MATCHES "OJPH_ARCH_I386")
+ OR MULTI_GEN_X86_64)
+
if (NOT OJPH_DISABLE_SSE4)
list(APPEND SOURCES ${OJPH_IMG_IO_SSE41})
endif()
@@ -30,7 +33,9 @@
set_source_files_properties(../src/apps/others/ojph_img_io_sse41.cpp
PROPERTIES COMPILE_FLAGS -msse4.1)
set_source_files_properties(../src/apps/others/ojph_img_io_avx2.cpp
PROPERTIES COMPILE_FLAGS -mavx2)
endif()
- elseif("${OJPH_TARGET_ARCH}" MATCHES "OJPH_ARCH_ARM")
+ endif()
+
+ if (("${OJPH_TARGET_ARCH}" MATCHES "OJPH_ARCH_ARM") OR MULTI_GEN_ARM64)
endif()
