Skip to content

Commit 4f0ce8c

Browse files
committed
resolve compiler warnings
1 parent 9034759 commit 4f0ce8c

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

examples/heif_view.cc

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@ int main(int argc, char** argv)
358358
uint64_t now_time = SDL_GetTicks64();
359359
uint64_t elapsed_time = (now_time - start_time);
360360
if (elapsed_time < next_frame_pts) {
361-
SDL_Delay(next_frame_pts - elapsed_time);
361+
SDL_Delay((Uint32)(next_frame_pts - elapsed_time));
362362
}
363363

364364
next_frame_pts += static_cast<uint64_t>(static_cast<double>(duration_ms) / option_speedup);
@@ -371,7 +371,7 @@ int main(int argc, char** argv)
371371
const uint8_t* p_Cb = heif_image_get_plane_readonly2(out_image, heif_channel_Cb, &stride_Cb);
372372
const uint8_t* p_Cr = heif_image_get_plane_readonly2(out_image, heif_channel_Cr, &stride_Cr);
373373

374-
sdlWindow.display(p_Y, p_Cb, p_Cr, stride_Y, stride_Cb);
374+
sdlWindow.display(p_Y, p_Cb, p_Cr, static_cast<int>(stride_Y), static_cast<int>(stride_Cb));
375375

376376
if (show_frame_number) {
377377
std::cout << "--- frame " << frameNr << "\n";
@@ -411,11 +411,11 @@ int main(int argc, char** argv)
411411

412412
// --- show metadata
413413

414-
while (metadata_sample && metadata_sample_display_time / option_speedup <= elapsed_time) {
414+
while (metadata_sample && static_cast<uint64_t>((double)metadata_sample_display_time / option_speedup) <= elapsed_time) {
415415
size_t size;
416416
const uint8_t* data = heif_raw_sequence_sample_get_data(metadata_sample, &size);
417417

418-
std::cout << "timestamp: " << metadata_sample_display_time/1000.0f << "sec\n";
418+
std::cout << "timestamp: " << ((double)metadata_sample_display_time)/1000.0f << "sec\n";
419419

420420
if (option_metadata_output == metadata_output_text) {
421421
std::cout << ((const char*) data) << "\n";
@@ -425,9 +425,9 @@ int main(int argc, char** argv)
425425
std::cout << '\n';
426426
}
427427

428-
uint64_t timescale = heif_track_get_timescale(metadata_track);
429-
uint32_t duration = heif_raw_sequence_sample_get_duration(metadata_sample);
430-
metadata_sample_display_time += duration * 1000 / timescale;
428+
uint64_t metadata_timescale = heif_track_get_timescale(metadata_track);
429+
uint32_t metadata_duration = heif_raw_sequence_sample_get_duration(metadata_sample);
430+
metadata_sample_display_time += metadata_duration * 1000 / metadata_timescale;
431431

432432
heif_raw_sequence_sample_release(metadata_sample);
433433
metadata_sample = nullptr;

examples/sdl.cc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -250,14 +250,14 @@ void SDL_YUV_Display::display444as420(const unsigned char *Y,
250250
uint8_t *startU = startV + (rect.h*mStride/2);
251251
for (int y=0;y<rect.h;y+=2)
252252
{
253-
unsigned char* u = startU + y/2*mStride/2;
254-
unsigned char* v = startV + y/2*mStride/2;
253+
uint8_t* u = startU + y/2*mStride/2;
254+
uint8_t* v = startV + y/2*mStride/2;
255255

256256
for (int x=0;x<rect.w;x+=2) {
257-
u[x/2] = (U[ y *chroma_stride + x] + U[ y *chroma_stride + x +1] +
258-
U[(y+1)*chroma_stride + x] + U[(y+1)*chroma_stride + x +1])/4;
259-
v[x/2] = (V[ y *chroma_stride + x] + V[ y *chroma_stride + x +1] +
260-
V[(y+1)*chroma_stride + x] + V[(y+1)*chroma_stride + x +1])/4;
257+
u[x / 2] = static_cast<uint8_t>((U[(y + 0) * chroma_stride + x] + U[(y + 0) * chroma_stride + x + 1] +
258+
U[(y + 1) * chroma_stride + x] + U[(y + 1) * chroma_stride + x + 1]) / 4);
259+
v[x / 2] = static_cast<uint8_t>((V[(y + 0) * chroma_stride + x] + V[(y + 0) * chroma_stride + x + 1] +
260+
V[(y + 1) * chroma_stride + x] + V[(y + 1) * chroma_stride + x + 1]) / 4);
261261

262262
//u[x/2] = U[y*chroma_stride + x];
263263
//v[x/2] = V[y*chroma_stride + x];

0 commit comments

Comments
 (0)