Commit 7c585a7f authored by jehan's avatar jehan

remove various compilation issue on OSX

parent c1906e6c
......@@ -84,7 +84,6 @@ AC_DEFUN([MS_CHECK_VIDEO],[
enable_sdl_default=false
enable_x11_default=false
enable_glx_default=false
OBJCFLAGS="$OBJCFLAGS -framework QTKit"
LIBS="$LIBS -framework QTKit -framework CoreVideo "
dnl the following check is necessary but due to automake bug it forces every platform to have an objC compiler !
dnl AC_LANG_PUSH([Objective C])
......
......@@ -98,6 +98,8 @@ if test "$GCC" != "yes" ; then
esac
else
CFLAGS="$CFLAGS -Wall -fdiagnostics-show-option"
OBJCFLAGS="$OBJCFLAGS -Wall"
CXXFLAGS="$CXXFLAGS -Wall"
fi
AC_ARG_ENABLE([debug],
......@@ -141,6 +143,7 @@ fi
if test $GCC = yes && test $wall_werror = yes; then
CFLAGS="$CFLAGS -Werror -Wno-error=deprecated-declarations"
OBJCFLAGS="$OBJCFLAGS -Werror"
fi
macosx_found=no
......
......@@ -97,8 +97,7 @@ static MSPixFmt ostype_to_pix_fmt(OSType pixelFormat, bool printFmtName){
{
ms_mutex_lock(&mutex);
OSType pixelFormat = CVPixelBufferGetPixelFormatType(frame);
MSPixFmt msfmt = ostype_to_pix_fmt(pixelFormat, false);
//OSType pixelFormat = CVPixelBufferGetPixelFormatType(frame);
if (CVPixelBufferIsPlanar(frame)) {
size_t numberOfPlanes = CVPixelBufferGetPlaneCount(frame);
......@@ -272,7 +271,7 @@ static MSPixFmt ostype_to_pix_fmt(OSType pixelFormat, bool printFmtName){
- (void)setSize:(MSVideoSize)size {
NSDictionary *dic;
if (forcedPixelFormat != 0) {
ms_message("QTCapture set size w=%i, h=%i fmt=%i", size.width, size.height, forcedPixelFormat);
ms_message("QTCapture set size w=%i, h=%i fmt=%i", size.width, size.height, (unsigned int)forcedPixelFormat);
dic = [NSDictionary dictionaryWithObjectsAndKeys:
[NSNumber numberWithInteger:size.width], (id)kCVPixelBufferWidthKey,
[NSNumber numberWithInteger:size.height],(id)kCVPixelBufferHeightKey,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment