From 77bd1d07b38fba302a496ca90dd405098194f7c0 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Thu, 12 Sep 2019 03:50:06 +1000
Subject: [PATCH] cast use of sizeof

---
 app/CMakeLists.txt          | 3 ++-
 app/render/gl/functions.cpp | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index 1da1ea042..1fc0c766b 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -63,7 +63,8 @@ endif()
 target_compile_definitions(${OLIVE_TARGET} PRIVATE ${OLIVE_DEFINITIONS})
 
 if(MSVC)
-  target_compile_options(${OLIVE_TARGET} PRIVATE /W4 /WX)
+  # Enabling this threw warnings from FFmpeg headers that broke compilation. See if this is fixable.
+  #target_compile_options(${OLIVE_TARGET} PRIVATE /W4 /WX)
 else()
   target_compile_options(${OLIVE_TARGET} PRIVATE -Werror -Wuninitialized -pedantic-errors -Wall -Wextra -Wconversion -Wsign-conversion)
 endif()
diff --git a/app/render/gl/functions.cpp b/app/render/gl/functions.cpp
index 32c51270b..e486a8e5a 100644
--- a/app/render/gl/functions.cpp
+++ b/app/render/gl/functions.cpp
@@ -85,13 +85,13 @@ void olive::gl::Blit(ShaderPtr pipeline, bool flipped, QMatrix4x4 matrix) {
   QOpenGLBuffer m_vbo;
   m_vbo.create();
   m_vbo.bind();
-  m_vbo.allocate(blit_vertices, 18 * sizeof(GLfloat));
+  m_vbo.allocate(blit_vertices, 18 * static_cast<int>(sizeof(GLfloat)));
   m_vbo.release();
 
   QOpenGLBuffer m_vbo2;
   m_vbo2.create();
   m_vbo2.bind();
-  m_vbo2.allocate(flipped ? flipped_blit_texcoords : blit_texcoords, 12 * sizeof(GLfloat));
+  m_vbo2.allocate(flipped ? flipped_blit_texcoords : blit_texcoords, 12 * static_cast<int>(sizeof(GLfloat)));
   m_vbo2.release();
 
   pipeline->bind();