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

Improve non simd decoder #170

Merged
merged 4 commits into from
Jun 13, 2024
Merged

Improve non simd decoder #170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4ffa7c8
Refactor non-SIMD HT decoder
osamu620 Jun 13, 2024
35307b1
Update CHANGELOG and bump up version number
osamu620 Jun 13, 2024
f68679a
Fix CMakeLists.txt and image_class.hpp
osamu620 Jun 13, 2024
4196765
Put windows-latest back
osamu620 Jun 13, 2024
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
18 changes: 9 additions & 9 deletions .github/workflows/cmake.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@ jobs:
#
# To add more build types (Release, Debug, RelWithDebInfo, etc.) customize the build_type list.
matrix:
#os: [ubuntu-latest, windows-latest, macos-latest]
os: [ubuntu-latest, macos-latest]
os: [ubuntu-latest, windows-latest, macos-latest]
# os: [ubuntu-latest, macos-latest]
build_type: [Release]
c_compiler: [gcc, clang, cl]
include:
# - os: windows-latest
# c_compiler: cl
# cpp_compiler: cl
- os: windows-latest
c_compiler: cl
cpp_compiler: cl
- os: ubuntu-latest
c_compiler: gcc
cpp_compiler: g++
Expand All @@ -42,10 +42,10 @@ jobs:
c_compiler: clang
cpp_compiler: clang++
exclude:
# - os: windows-latest
# c_compiler: gcc
# - os: windows-latest
# c_compiler: clang
- os: windows-latest
c_compiler: gcc
- os: windows-latest
c_compiler: clang
- os: ubuntu-latest
c_compiler: cl
- os: macos-latest
Expand Down
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.7] - 2024-06-13

* Refactor non-SIMD HT cleanup decoding

# [0.2.6] - 2024-06-12

* Fix unnecessary assignment of `pass_length` in packet header parsing
Expand Down
6 changes: 3 additions & 3 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ else()
endif()
enable_language(CXX)

set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)

############################################################
# Parse version file
# credit: https://stackoverflow.com/a/47084079 and OpenJPH project https://github.com/aous72/OpenJPH
Expand Down Expand Up @@ -185,9 +188,6 @@ endif()
# add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/source/thirdparty/highway
# EXCLUDE_FROM_ALL)

set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)

# INSTALL related settings
set(CMAKE_SKIP_BUILD_RPATH FALSE)
set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
Expand Down
3 changes: 2 additions & 1 deletion source/apps/imgcmp/image_class.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ class image {
int read_pnmpgx(const char *name) {
constexpr char SP = ' ';
constexpr char LF = '\n';
constexpr char CR = 13;

FILE *fp = fopen(name, "rb");
if (fp == nullptr) {
Expand Down Expand Up @@ -222,7 +223,7 @@ class image {
}
}
// read numerical value
while (c != SP && c != LF) {
while (c != SP && c != LF && c != CR) {
val *= 10;
val += c - '0';
c = fgetc(fp);
Expand Down
Loading