Merge branch 4.x

modules/highgui/src/window_framebuffer.cpp

@@ -519,7 +519,7 @@ fb_fix_screeninfo &FramebufferBackend::getFixInfo()
     return fixInfo;
 }
 
-int FramebufferBackend::getFramebuffrerID()
+int FramebufferBackend::getFramebufferID()
 {
     return fbID;
 }

modules/highgui/src/window_framebuffer.hpp

@@ -101,7 +101,7 @@ public:
 
     fb_var_screeninfo &getVarInfo();
     fb_fix_screeninfo &getFixInfo();
-    int getFramebuffrerID();
+    int getFramebufferID();
     int getFBWidth();
     int getFBHeight();
     int getFBXOffset();