Merge branch 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse into master-integration

* 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse: (23 commits)
  Restore patch that got lost in merge
  Fix spelling in comment
  Spelling mistakes in Documentation. There are probably more :)
  Fix spelling mistake in QEGLPlatformcontext
  Restore patch that disappeared in merge
  Make the openKODE use the new eventloopintegration api.
  Make QtOpenGL use shared contextexts on Lighthouse
  Move the Lighthouse specfic api into qpa_qpa.cpp
  Lighthouse: Fix QGLContext::currentContext for systems with limited
  Make EglFS plugin compile after changes to QPlatformEGLContext
  Adding some documentation for Lighthouse
  Lighthouse: move the currentContext functionality to QPlatformGLContext
  Remove QWidget::paintEngine() codepath for Lighthouse
  Fix transformIsSimple in QGraphicsScene
  Lighthouse: Make sure that we call QPlatformWindow::setVisible
  Lighthouse: using QFont enums when possible in QPlatformFontdatabase
  No more windowsurface for QGLWidget in Lighthouse
  Add workaround_brokenFBOReadback=true for mali
  Fix cross-compilation for Lighthouse after 3d86d2a8e5e3c68f9e0022e67629
  Compile fix for  c1148ee9a60a6fae8.
  ...

2 files changed, 21 insertions, 0 deletions

diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp
index 747dd2f..bb94788c 100644
--- a/src/gui/image/qimage.cpp
+++ b/src/gui/image/qimage.cpp
@@ -3833,6 +3833,26 @@ void qInitImageConversions()
 #endif
 }
 
+void qGamma_correct_back_to_linear_cs(QImage *image)
+{
+    extern uchar qt_pow_rgb_gamma[256];
+
+    // gamma correct the pixels back to linear color space...
+    int h = image->height();
+    int w = image->width();
+
+    for (int y=0; y<h; ++y) {
+        uint *pixels = (uint *) image->scanLine(y);
+        for (int x=0; x<w; ++x) {
+            uint p = pixels[x];
+            uint r = qt_pow_rgb_gamma[qRed(p)];
+            uint g = qt_pow_rgb_gamma[qGreen(p)];
+            uint b = qt_pow_rgb_gamma[qBlue(p)];
+            pixels[x] = (r << 16) | (g << 8) | b | 0xff000000;
+        }
+    }
+}
+
 /*!
     Returns a copy of the image in the given \a format.
 
diff --git a/src/gui/image/qimage_p.h b/src/gui/image/qimage_p.h
index e054814..64af0a6 100644
--- a/src/gui/image/qimage_p.h
+++ b/src/gui/image/qimage_p.h
@@ -111,6 +111,7 @@ struct Q_GUI_EXPORT QImageData {        // internal image data
 };
 
 void qInitImageConversions();
+Q_GUI_EXPORT void qGamma_correct_back_to_linear_cs(QImage *image);
 
 inline int qt_depthForFormat(QImage::Format format)
 {