@@ -156,8 +156,9 @@ uint32_t compute_minimal_stride(const frame_info& frame_info) noexcept
156
156
void shift_samples (void * buffer, const size_t pixel_count, const uint32_t sample_shift)
157
157
{
158
158
auto * const pixels{static_cast <uint16_t *>(buffer)};
159
- std::transform (pixels, pixels + pixel_count, pixels,
160
- [sample_shift](const uint16_t pixel) -> uint16_t { return pixel << sample_shift; });
159
+ std::transform (pixels, pixels + pixel_count, pixels, [sample_shift](const uint16_t pixel) {
160
+ return static_cast <uint16_t >(pixel << sample_shift);
161
+ });
161
162
}
162
163
163
164
template <typename SizeType>
@@ -195,17 +196,18 @@ void set_resolution(const jpegls_decoder& decoder, IWICBitmap& bitmap)
195
196
{
196
197
switch (spiff_header.resolution_units )
197
198
{
198
- case spiff_resolution_units::aspect_ratio:
199
+ using enum spiff_resolution_units;
200
+ case aspect_ratio:
199
201
break ;
200
202
201
- case spiff_resolution_units:: dots_per_centimeter: {
203
+ case dots_per_centimeter: {
202
204
constexpr double dpc_to_dpi{2.54 };
203
205
check_hresult (bitmap.SetResolution (std::round (spiff_header.horizontal_resolution * dpc_to_dpi),
204
206
std::round (spiff_header.vertical_resolution * dpc_to_dpi)));
205
207
return ;
206
208
}
207
209
208
- case spiff_resolution_units:: dots_per_inch:
210
+ case dots_per_inch:
209
211
check_hresult (bitmap.SetResolution (spiff_header.horizontal_resolution , spiff_header.vertical_resolution ));
210
212
return ;
211
213
}
0 commit comments