frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2025-03-01 10:33:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix "if" statement in XShmGetImage check and other things (#192)

Browse Source 
* Fix "if" statement

Nach dem testen des Codes, leider übersehen und nicht rückgängig gemacht.
Entschuldigung.

* Move XRenderSetPictureFilter from "grab" to "setupResources" part

* Resize destination image to target screen dimension once

* Fix coding style and add check for image resize
This commit is contained in:
Paulchen-Panther
2016-08-23 07:04:57 +02:00
committed by redPanther
parent 6acf68c87e
commit 62a24348f9
2 changed files with 62 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libsrc/grabber/x11/X11Grabber.cpp
View File

@@ -92,6 +92,7 @@ void X11Grabber::setupResources()
_dstFormat = XRenderFindVisualFormat(_x11Display, _windowAttr.visual);
_srcPicture = XRenderCreatePicture(_x11Display, _window, _srcFormat, CPRepeat, &_pictAttr);
_dstPicture = XRenderCreatePicture(_x11Display, _pixmap, _dstFormat, CPRepeat, &_pictAttr);
XRenderSetPictureFilter(_x11Display, _srcPicture, FilterBilinear, NULL, 0);
}
}
@@ -160,7 +161,6 @@ Image<ColorRgb> & X11Grabber::grab()
};
XRenderSetPictureTransform (_x11Display, _srcPicture, &_transform);
XRenderSetPictureFilter(_x11Display, _srcPicture, FilterBilinear, NULL, 0);
XRenderComposite( _x11Display, // dpy
PictOpSrc, // op
@@ -178,7 +178,7 @@ Image<ColorRgb> & X11Grabber::grab()
XSync(_x11Display, False);
if (!_XShmAvailable)
if (_XShmAvailable)
{
XShmGetImage(_x11Display, _pixmap, _xImage, 0, 0, AllPlanes);
}
@@ -239,7 +239,6 @@ int X11Grabber::grabFrame(Image<ColorRgb> & image)
};
XRenderSetPictureTransform (_x11Display, _srcPicture, &_transform);
XRenderSetPictureFilter(_x11Display, _srcPicture, FilterBilinear, NULL, 0);
XRenderComposite( _x11Display, // dpy
PictOpSrc, // op
@@ -257,7 +256,7 @@ int X11Grabber::grabFrame(Image<ColorRgb> & image)
XSync(_x11Display, False);
if (!_XShmAvailable)
if (_XShmAvailable)
{
XShmGetImage(_x11Display, _pixmap, _xImage, 0, 0, AllPlanes);
}
@@ -338,6 +337,7 @@ int X11Grabber::updateScreenDimensions()
Info(_log, "Using XGetImage for grabbing");
}
_image.resize(_croppedWidth, _croppedHeight);
setupResources();
return 1;