diff --git a/modules/matlab/compile.cmake b/modules/matlab/compile.cmake
index 95c8534808..ae4faf3770 100644
--- a/modules/matlab/compile.cmake
+++ b/modules/matlab/compile.cmake
@@ -3,14 +3,15 @@ macro(listify OUT_LIST IN_STRING)
 endmacro()
 
 listify(MEX_INCLUDE_DIRS_LIST ${MEX_INCLUDE_DIRS})
+set(MEX_CXXFLAGS "CXXFLAGS=\$CXXFLAGS -pedantic -Wall -Wextra -Weffc++ -Wno-unused -Wold-style-cast -Wshadow -Wmissing-declarations -Wmissing-include-dirs -Wnon-virtual-dtor")
 file(GLOB SOURCE_FILES "${CMAKE_CURRENT_BINARY_DIR}/src/*.cpp")
 foreach(SOURCE_FILE ${SOURCE_FILES})
     # strip out the filename
     get_filename_component(FILENAME ${SOURCE_FILE} NAME_WE)
-    # compile the source file using mex
+    # compie the source file using mex
     if (NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/+cv/${FILENAME}.${MATLAB_MEXEXT})
         execute_process(
-            COMMAND ${MATLAB_MEX_SCRIPT} ${MEX_OPTS} ${MEX_INCLUDE_DIRS_LIST} 
+            COMMAND ${MATLAB_MEX_SCRIPT} "${MEX_CXXFLAGS}" ${MEX_INCLUDE_DIRS_LIST} 
                     ${MEX_LIB_DIR} ${MEX_LIBS} ${SOURCE_FILE}
             WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/+cv
             ERROR_VARIABLE FAILED
diff --git a/modules/matlab/include/bridge.hpp b/modules/matlab/include/bridge.hpp
index 05e32ed8e3..127b60e343 100644
--- a/modules/matlab/include/bridge.hpp
+++ b/modules/matlab/include/bridge.hpp
@@ -282,7 +282,7 @@ public:
 
   template <typename Scalar>
   explicit MxArray(size_t m, size_t n, size_t k=1) : owns_(true) {
-    mwSize dims[] = {m, n, k};
+    mwSize dims[] = { static_cast<mwSize>(m), static_cast<mwSize>(n), static_cast<mwSize>(k) };
     ptr_ = mxCreateNumericArray(3, dims, Matlab::Traits<Scalar>::ScalarType, Matlab::Traits<>::Real);
   }