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

fixed some more GCC warnings

Browse Source
This commit is contained in:
Vadim Pisarevsky 2012-03-19 11:21:01 +00:00
parent c5cc79d4d5
commit 3228599a35
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/core/src/cmdparser.cpp
View File

@ -100,7 +100,7 @@ CommandLineParser::CommandLineParser(int argc, const char* const argv[], const c
std::map<std::string, std::vector<std::string> >::iterator it;
size_t flagPosition;
int currentIndex = 1;
bool isFound = false;
//bool isFound = false;
bool withNoKey = false;
bool hasValueThroughEq = false;
@ -169,7 +169,7 @@ CommandLineParser::CommandLineParser(int argc, const char* const argv[], const c
if (((curName == keysVector[0]) || (curName == keysVector[1])) && hasValueThroughEq)
{
it->second[0] = buffer;
isFound = true;
//isFound = true;
break;
}
@ -180,7 +180,7 @@ CommandLineParser::CommandLineParser(int argc, const char* const argv[], const c
))
{
it->second[0] = "true";
isFound = true;
//isFound = true;
break;
}
@ -188,7 +188,7 @@ CommandLineParser::CommandLineParser(int argc, const char* const argv[], const c
((curName == keysVector[0]) || (curName == keysVector[1])))
{
it->second[0] = argv[++i];
isFound = true;
//isFound = true;
break;
}
@ -200,7 +200,7 @@ CommandLineParser::CommandLineParser(int argc, const char* const argv[], const c
{
it->second[0] = curName;
currentIndex++;
isFound = true;
//isFound = true;
break;
}
}
@ -208,7 +208,7 @@ CommandLineParser::CommandLineParser(int argc, const char* const argv[], const c
withNoKey = false;
hasValueThroughEq = false;
isFound = false;
//isFound = false;
}
}

4
modules/highgui/CMakeLists.txt
View File

@ -259,6 +259,10 @@ set_target_properties(${the_module} PROPERTIES LINK_INTERFACE_LIBRARIES "")
ocv_add_precompiled_headers(${the_module})
if(CMAKE_COMPILER_IS_GNUCXX)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-declarations")
endif()
if(WIN32)
#copy ffmpeg dll to the output folder
if(MSVC64 OR MINGW64)