generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merged recent changes from trunk - 8833,8848,8850

Browse Source
This commit is contained in:
Andrey Kamaev
2012-06-29 07:52:34 +00:00
parent 57fb5f0981
commit 17fd1c7c61
9 changed files with 84 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/highgui/CMakeLists.txt
View File

@@ -160,7 +160,7 @@ if(HAVE_FFMPEG)
list(APPEND HIGHGUI_LIBRARIES ${BZIP2_LIBRARIES})
endif()
if(APPLE)
list(APPEND HIGHGUI_LIBRARIES "-framework VideoDecodeAcceleration")
list(APPEND HIGHGUI_LIBRARIES "-framework VideoDecodeAcceleration" bz2)
endif()
endif(HAVE_FFMPEG)

8
modules/highgui/src/cap_avfoundation.mm
View File

@@ -720,7 +720,7 @@ fromConnection:(AVCaptureConnection *)connection{
image->height = height;
image->nChannels = 4;
image->depth = IPL_DEPTH_8U;
image->widthStep = rowBytes;
image->widthStep = (int)rowBytes;
image->imageData = imagedata;
image->imageSize = currSize;
@@ -731,7 +731,7 @@ fromConnection:(AVCaptureConnection *)connection{
bgr_image->height = height;
bgr_image->nChannels = 3;
bgr_image->depth = IPL_DEPTH_8U;
bgr_image->widthStep = rowBytes;
bgr_image->widthStep = (int)rowBytes;
bgr_image->imageData = bgr_imagedata;
bgr_image->imageSize = currSize;
@@ -949,7 +949,7 @@ IplImage* CvCaptureFile::retrieveFramePixelBuffer() {
image->height = height;
image->nChannels = 4;
image->depth = IPL_DEPTH_8U;
image->widthStep = width*4;
image->widthStep = rowBytes;
image->imageData = imagedata;
image->imageSize = currSize;
@@ -962,7 +962,7 @@ IplImage* CvCaptureFile::retrieveFramePixelBuffer() {
bgr_image->height = height;
bgr_image->nChannels = 3;
bgr_image->depth = IPL_DEPTH_8U;
bgr_image->widthStep = width*4;
bgr_image->widthStep = rowBytes;
bgr_image->imageData = bgr_imagedata;
bgr_image->imageSize = currSize;

2
modules/highgui/src/window.cpp
View File

@@ -521,7 +521,7 @@ void icvSetOpenGlCleanCallback(const char*, CvOpenGlCleanCallback, void*)
#if defined (HAVE_QT)
CvFont cv::fontQt(const string& nameFont, int pointSize, Scalar color, int weight, int style, int spacing)
CvFont cv::fontQt(const string& nameFont, int pointSize, Scalar color, int weight, int style, int /*spacing*/)
{
return cvFontQt(nameFont.c_str(), pointSize,color,weight, style);
}

18
modules/highgui/src/window_QT.cpp
View File

@@ -2414,13 +2414,13 @@ void DefaultViewPort::startDisplayInfo(QString text, int delayms)
}
void DefaultViewPort::setOpenGlDrawCallback(CvOpenGlDrawCallback callback, void* userdata)
void DefaultViewPort::setOpenGlDrawCallback(CvOpenGlDrawCallback /*callback*/, void* /*userdata*/)
{
CV_Error(CV_OpenGlNotSupported, "Window doesn't support OpenGL");
}
void DefaultViewPort::setOpenGlCleanCallback(CvOpenGlCleanCallback callback, void* userdata)
void DefaultViewPort::setOpenGlCleanCallback(CvOpenGlCleanCallback /*callback*/, void* /*userdata*/)
{
CV_Error(CV_OpenGlNotSupported, "Window doesn't support OpenGL");
}
@@ -3058,7 +3058,7 @@ void DefaultViewPort::drawInstructions(QPainter *painter)
}
void DefaultViewPort::setSize(QSize size_)
void DefaultViewPort::setSize(QSize /*size_*/)
{
}
@@ -3101,11 +3101,11 @@ void OpenGlViewPort::setMouseCallBack(CvMouseCallback callback, void* param)
mouseData = param;
}
void OpenGlViewPort::writeSettings(QSettings& settings)
void OpenGlViewPort::writeSettings(QSettings& /*settings*/)
{
}
void OpenGlViewPort::readSettings(QSettings& settings)
void OpenGlViewPort::readSettings(QSettings& /*settings*/)
{
}
@@ -3114,15 +3114,15 @@ double OpenGlViewPort::getRatio()
return (double)width() / height();
}
void OpenGlViewPort::setRatio(int flags)
void OpenGlViewPort::setRatio(int /*flags*/)
{
}
void OpenGlViewPort::updateImage(const CvArr* arr)
void OpenGlViewPort::updateImage(const CvArr* /*arr*/)
{
}
void OpenGlViewPort::startDisplayInfo(QString text, int delayms)
void OpenGlViewPort::startDisplayInfo(QString /*text*/, int /*delayms*/)
{
}
@@ -3350,7 +3350,7 @@ void GlFuncTab_QT::unmapBuffer(unsigned int target) const
__END__;
}
void GlFuncTab_QT::generateBitmapFont(const std::string& family, int height, int weight, bool italic, bool underline, int start, int count, int base) const
void GlFuncTab_QT::generateBitmapFont(const std::string& family, int height, int weight, bool italic, bool /*underline*/, int start, int count, int base) const
{
//CV_FUNCNAME( "GlFuncTab_QT::generateBitmapFont" );