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

Code cleanup

Browse Source 
Remove redundent #if defs from code
This commit is contained in:
Tony 2013-10-09 20:50:35 +01:00
parent c1cd70e25a
commit d4df373999
1 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -59,9 +59,7 @@ CV_IMPL void cvSetWindowProperty(const char* name, int prop_id, double prop_valu
cvSetModeWindow_QT(name,prop_value); cvSetModeWindow_QT(name,prop_value);
#elif defined(HAVE_WIN32UI) #elif defined(HAVE_WIN32UI)
cvSetModeWindow_W32(name,prop_value); cvSetModeWindow_W32(name,prop_value);
#elif defined (HAVE_GTK) #elif defined (HAVE_GTK) | defined (HAVE_GTK3)
cvSetModeWindow_GTK(name,prop_value);
#elif defined (HAVE_GTK3)
cvSetModeWindow_GTK(name,prop_value); cvSetModeWindow_GTK(name,prop_value);
#elif defined (HAVE_CARBON) #elif defined (HAVE_CARBON)
cvSetModeWindow_CARBON(name,prop_value); cvSetModeWindow_CARBON(name,prop_value);
@ -100,9 +98,7 @@ CV_IMPL double cvGetWindowProperty(const char* name, int prop_id)
return cvGetModeWindow_QT(name); return cvGetModeWindow_QT(name);
#elif defined(HAVE_WIN32UI) #elif defined(HAVE_WIN32UI)
return cvGetModeWindow_W32(name); return cvGetModeWindow_W32(name);
#elif defined (HAVE_GTK) #elif defined (HAVE_GTK) | defined(HAVE_GTK3)
return cvGetModeWindow_GTK(name);
#elif defined (HAVE_GTK3)
return cvGetModeWindow_GTK(name); return cvGetModeWindow_GTK(name);
#elif defined (HAVE_CARBON) #elif defined (HAVE_CARBON)
return cvGetModeWindow_CARBON(name); return cvGetModeWindow_CARBON(name);
@ -119,9 +115,7 @@ CV_IMPL double cvGetWindowProperty(const char* name, int prop_id)
return cvGetPropWindow_QT(name); return cvGetPropWindow_QT(name);
#elif defined(HAVE_WIN32UI) #elif defined(HAVE_WIN32UI)
return cvGetPropWindowAutoSize_W32(name); return cvGetPropWindowAutoSize_W32(name);
#elif defined (HAVE_GTK) #elif defined (HAVE_GTK) | defined(HAVE_GTK3)
return cvGetPropWindowAutoSize_GTK(name);
#elif defined (HAVE_GTK3)
return cvGetPropWindowAutoSize_GTK(name); return cvGetPropWindowAutoSize_GTK(name);
#else #else
return -1; return -1;
@ -134,9 +128,7 @@ CV_IMPL double cvGetWindowProperty(const char* name, int prop_id)
return cvGetRatioWindow_QT(name); return cvGetRatioWindow_QT(name);
#elif defined(HAVE_WIN32UI) #elif defined(HAVE_WIN32UI)
return cvGetRatioWindow_W32(name); return cvGetRatioWindow_W32(name);
#elif defined (HAVE_GTK) #elif defined (HAVE_GTK) | defined(HAVE_GTK3)
return cvGetRatioWindow_GTK(name);
#elif defined (HAVE_GTK3)
return cvGetRatioWindow_GTK(name); return cvGetRatioWindow_GTK(name);
#else #else
return -1; return -1;
@ -149,9 +141,7 @@ CV_IMPL double cvGetWindowProperty(const char* name, int prop_id)
return cvGetOpenGlProp_QT(name); return cvGetOpenGlProp_QT(name);
#elif defined(HAVE_WIN32UI) #elif defined(HAVE_WIN32UI)
return cvGetOpenGlProp_W32(name); return cvGetOpenGlProp_W32(name);
#elif defined (HAVE_GTK) #elif defined (HAVE_GTK) | defined(HAVE_GTK3)
return cvGetOpenGlProp_GTK(name);
#elif defined (HAVE_GTK3)
return cvGetOpenGlProp_GTK(name); return cvGetOpenGlProp_GTK(name);
#else #else
return -1; return -1;