Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ repos:
- id: end-of-file-fixer
- id: trailing-whitespace
- repo: https://github.com/pre-commit/mirrors-clang-format
rev: v22.1.2
rev: v22.1.4
hooks:
- id: clang-format
- repo: https://github.com/cheshirekow/cmake-format-precommit
Expand All @@ -33,15 +33,15 @@ repos:
additional_dependencies: ["cmakelang"]
exclude: "cmake/.*"
- repo: https://github.com/hukkin/mdformat
rev: 0.7.22
rev: 1.0.0
hooks:
- id: mdformat
- repo: https://github.com/crate-ci/typos
rev: v1.39.0
rev: v1
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
rev: v1
rev: v1.46.1

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking at https://github.com/crate-ci/typos/tree/v1, I got the impression that @epage uses v1 as kind of rolling release that always matches the latest tag. v1 found new typos in this PR, so I might be right. If you don't have evidence for this being different, I'll try v1 and see if my theory is true.

This of course somewhat defeats the purpose of pinning a version to have things under control. Still, I don't see this as a problem (especially in this repo).

hooks:
- id: typos
- repo: https://github.com/hofbi/dev-tools
rev: 1.8.0
rev: 1.11.0
hooks:
- id: check-max-one-sentence-per-line
- id: check-snake-case
Expand Down
5 changes: 0 additions & 5 deletions src/receiver/video_player.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -211,22 +211,17 @@ int main(int argc, char* argv[])
SDL_LockTexture(tex, nullptr, reinterpret_cast<void**>(pixels), test.data());

// Copy decoded image into retrieved pointer from locking
// m_start_time = std::chrono::high_resolution_clock::now();
if (video)
{
memcpy(*pixels, *argbSrc, static_cast<size_t>(targetWidth) * targetHeight * 4 * sizeof(uint8_t));
}
// m_end_time = std::chrono::high_resolution_clock::now();

SDL_UnlockTexture(tex);
SDL_RenderClear(ren);
SDL_RenderCopy(ren, tex, nullptr, nullptr);
SDL_RenderPresent(ren);

// Reset the newImage flag
newImage = false;
// std::cout << "t_cpy=" <<
// std::chrono::duration_cast<std::chrono::microseconds>(m_end_time - m_start_time).count() << "\n";
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/sender/xi_api_plus_ocv.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3854,7 +3854,7 @@ float xiAPIplus_Camera::GetTemperatureSensor_Increment()
return val;
}

// Camera housing tepmerature (XI_PRM_HOUS_TEMP)
// Camera housing temperature (XI_PRM_HOUS_TEMP)
float xiAPIplus_Camera::GetTemperatureHousing()
{
float val = 0;
Expand Down Expand Up @@ -3911,7 +3911,7 @@ float xiAPIplus_Camera::GetTemperatureHousing_Increment()
return val;
}

// Camera housing back side tepmerature (XI_PRM_HOUS_BACK_SIDE_TEMP)
// Camera housing back side temperature (XI_PRM_HOUS_BACK_SIDE_TEMP)
float xiAPIplus_Camera::GetTemperatureHousingBackSide()
{
float val = 0;
Expand Down
4 changes: 2 additions & 2 deletions src/sender/xi_api_plus_ocv.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -893,14 +893,14 @@ class xiAPIplus_Camera
float GetTemperatureSensor_Minimum();
float GetTemperatureSensor_Increment();

// Camera housing tepmerature (XI_PRM_HOUS_TEMP)
// Camera housing temperature (XI_PRM_HOUS_TEMP)

float GetTemperatureHousing();
float GetTemperatureHousing_Maximum();
float GetTemperatureHousing_Minimum();
float GetTemperatureHousing_Increment();

// Camera housing back side tepmerature (XI_PRM_HOUS_BACK_SIDE_TEMP)
// Camera housing back side temperature (XI_PRM_HOUS_BACK_SIDE_TEMP)

float GetTemperatureHousingBackSide();
float GetTemperatureHousingBackSide_Maximum();
Expand Down
Loading