cpp/charls
1
0
Fork 0
mirror of https://github.com/team-charls/charls synced 2025-03-28 21:03:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename frame_info to prevent GCC warning [-Werror=shadow] (#299)

Browse Source
This commit is contained in:
Victor Derks 2023-12-29 20:52:57 +01:00 committed by GitHub
parent eb8c55e629
commit c9c417c1a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/color_transform.h
View File

@ -7,9 +7,9 @@
namespace charls {
inline bool color_transformation_possible(const frame_info& frame_info) noexcept
inline bool color_transformation_possible(const frame_info& frame) noexcept
{
return frame_info.component_count == 3 && (frame_info.bits_per_sample == 8 || frame_info.bits_per_sample == 16);
return frame.component_count == 3 && (frame.bits_per_sample == 8 || frame.bits_per_sample == 16);
}
// This file defines simple classes that define (lossless) color transforms.

8
src/process_encoded_line.h
View File

@ -154,10 +154,10 @@ void transform_quad_to_line(const quad<PixelType>* source, const size_t pixel_st
{
const quad<PixelType>& color{source[i]};
destination[i] = color.v1 & mask;
destination[i + pixel_stride] = color.v2 & mask;
destination[i + 2 * pixel_stride] = color.v3 & mask;
destination[i + 3 * pixel_stride] = color.v4 & mask;
destination[i] = static_cast<PixelType>(color.v1 & mask);
destination[i + pixel_stride] = static_cast<PixelType>(color.v2 & mask);
destination[i + 2 * pixel_stride] = static_cast<PixelType>(color.v3 & mask);
destination[i + 3 * pixel_stride] = static_cast<PixelType>(color.v4 & mask);
}
}