From: Carl Hetherington Date: Mon, 6 May 2013 14:14:12 +0000 (+0100) Subject: Try to fix win32 build. X-Git-Tag: v2.0.48~1337^2~398 X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;ds=sidebyside;h=84be56b8107b812f16b6b244f8184c0983eaed6f;p=dcpomatic.git Try to fix win32 build. --- diff --git a/src/wx/timeline.cc b/src/wx/timeline.cc index 52707e45c..7e0ecf27e 100644 --- a/src/wx/timeline.cc +++ b/src/wx/timeline.cc @@ -42,7 +42,7 @@ Timeline::Timeline (wxWindow* parent, shared_ptr pl) if (pl->audio_from() == Playlist::AUDIO_FFMPEG) { SetMinSize (wxSize (640, _track_height * 2 + 96)); } else { - SetMinSize (wxSize (640, _track_height * (max (1UL, pl->audio().size()) + 1) + 96)); + SetMinSize (wxSize (640, _track_height * (max (size_t (1), pl->audio().size()) + 1) + 96)); } pl->Changed.connect (bind (&Timeline::playlist_changed, this));