summaryrefslogtreecommitdiff
path: root/canvas
AgeCommit message (Collapse)AuthorFilesLines
2015-11-26tdf#92272: We need to twiddle the bytes from BGR to RGBTor Lillqvist1-1/+26
As far as I see, the surfaces created in the DX canvas are of D3DFMT_A8R8G8B8 or D3DFMT_X8R8G8B8 format, which means that the bytes (in memory order, on little-endian Windows) are B,G,R,A/X. So if the desired destination wants R,G,B,A, we need to swap the blue and red bytes. Let's hope this doesn't break anything else... Change-Id: I1b90d2cf95418f6557cac633ec6fce27599e8a61 Reviewed-on: https://gerrit.libreoffice.org/20161 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-09-08tdf#94006 - need an explicit dispose for GLContext's SystemChildWindow.Michael Meeks1-1/+1
Previously we would get an explicit ~OpenGLContext - and potentially leave FMR's around for other OGC users, now we treat the other users properly - we need an explicit dispose() to get Window::dispose ordering right. Reviewed-on: https://gerrit.libreoffice.org/18412 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Conflicts: vcl/source/window/openglwin.cxx Change-Id: I5edcbd73399b6db3dbcfb391570f364f9ab0c70d Reviewed-on: https://gerrit.libreoffice.org/18414 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2015-09-08tdf#94006 - re-factor and fix OpenGLContext mis-use.Michael Meeks2-17/+18
Squashes two related patches from master: Don't use rtl::Reference for the global / list state, so the ref-count reflects the number of real users. Hold a reference during ~OpenGLContext. Fix mis-use in: gltf rendering, OpenGL canvas, GL transitions & GL capable (charts) Avoid GLX operations on un-initialized contexts. Signed-off-by: Miklos Vajna <vmiklos@collabora.co.uk> Conflicts: vcl/source/opengl/OpenGLContext.cxx vcl/workben/vcldemo.cxx canvas/source/opengl/ogl_spritedevicehelper.hxx Change-Id: I7ea29b544d53bb80b25fa6663d39f345bf8f4e64
2015-09-03tdf#93870 - GL accel. via VCL canvas for presentations when GL enabled.Michael Meeks4-0/+14
Change-Id: Ia31a88cb3d9e6baa987b22f77f407a3f592031f1 Reviewed-on: https://gerrit.libreoffice.org/18285 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com> Reviewed-by: Jan Holesovsky <kendy@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/18295
2015-07-22tdf#91574 - ensure we get paint events to render directx presenter console.Michael Meeks1-1/+0
This is an odd-one; lots of details in the bug. Change-Id: I287945eba965cc637642e9226c7fe7f2a0754130 Reviewed-on: https://gerrit.libreoffice.org/17274 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Jan Holesovsky <kendy@collabora.com>
2015-07-06tdf#91574: SLIDESHOW: crash when second monitor connectedJulien Nabet1-1/+1
0 0x00002aaab1f6a803 in VirtualDevice::InnerImplSetOutputSizePixel(Size const&, bool, boost::shared_array<unsigned char> const&, bool) (this=0x0, rNewSize=Size = {...}, bErase=true, pBuffer=..., bTopDown=false) at /home/julien/compile-libreoffice/libreoffice/vcl/source/gdi/virdev.cxx:293 1 0x00002aaab1f6ae54 in VirtualDevice::ImplSetOutputSizePixel(Size const&, bool, boost::shared_array<unsigned char> const&, bool) (this=0x0, rNewSize=Size = {...}, bErase=true, pBuffer=..., bTopDown=false) at /home/julien/compile-libreoffice/libreoffice/vcl/source/gdi/virdev.cxx:396 2 0x00002aaab1f6b1af in VirtualDevice::SetOutputSizePixel(Size const&, bool) (this=0x0, rNewSize=Size = {...}, bErase=true) at /home/julien/compile-libreoffice/libreoffice/vcl/source/gdi/virdev.cxx:444 3 0x00002aaae650e30f in vclcanvas::SpriteCanvasHelper::updateScreen(bool, bool&) (this=0x69daf50, bUpdateAll=true, io_bSurfaceDirty=@0x69dafe0: true) at /home/julien/compile-libreoffice/libreoffice/canvas/source/vcl/spritecanvashelper.cxx:316 So initialize maVDev Change-Id: I4a79ba6e8f13c4a2bed3127742a9a9c928e133cd Reviewed-on: https://gerrit.libreoffice.org/16770 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com> Signed-off-by: Michael Meeks <michael.meeks@collabora.com>
2015-07-03tdf#91574 fix presenter console not displayedChristian Lohmaier1-1/+1
The bool simplification from 3ac5138cfc01c1795ae05963fa4e5a6c7d22f4de accidentally changed the logic of the return statement Change-Id: Id6075356184e340dc970d2e59d1fb1d1a173d0a7 Reviewed-on: https://gerrit.libreoffice.org/16748 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-05-28tdf#91426 - fix DX canvas - missed by VclPtr / Clang plugin.Michael Meeks1-7/+6
Change-Id: I7969746b159051d65ea974b89ba458d0d14f466a
2015-05-20convert ANTIALIASING constants to scoped enumNoel Grandin8-31/+31
Change-Id: I175b8ea4e8bc01c3cdd3dd90506eba01b35e0085
2015-05-20convert DRAWMODE constants to scoped enumNoel Grandin2-5/+5
Change-Id: I36cbe8057d09226f8b302963bdd94dc5600b686f
2015-05-08std::ptr_fun became deprecated since C++11Takeshi Abe1-4/+4
Change-Id: If93609d032c9864e0251230bf9ed76e6b6741a62 Reviewed-on: https://gerrit.libreoffice.org/15672 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-05-07simplify code by replacing std::find_if with std::any_of/std::none_ofTakeshi Abe2-8/+8
Change-Id: Ife6ab3544f73b1de60f5241c68466045161a4d88 Reviewed-on: https://gerrit.libreoffice.org/15615 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-05-06convert BMP_MIRROR constants to scoped enumNoel Grandin1-2/+2
and fix bug in svx/source/xoutdev/_xoutbmp.cxx,XOutBitmap::MirrorGraphic where it was not correctly translating between different flags types. Change-Id: I78b4965544da2aa54b67ec18307fa54c8ffc3aee
2015-05-06convert BMP_SCALE constant to scoped enumNoel Grandin2-2/+2
Change-Id: Ibc9f88d2588c028cd71aa86c26d970a73025ef22
2015-05-06convert CONFIG_MODE constants to scoped enumNoel Grandin1-1/+1
Change-Id: I1b0fb976e7bf8d7de06da0c30012e8bba1320498
2015-04-30Get rid of the initial :: for the vcl namespaceTor Lillqvist13-46/+46
We used it all over the place without leading :: already anyway, even in many files in include. So let's be consistent. In the majority of cases, prefer the easier-on-the-eyes choice, not the "safe" one. In those files in include where *all* existing uses of ::vcl:: indeed used the :: prefix, there let's keep it for consistency. Change-Id: If99cb41d3bf290d38c601d91125c3c8d935e61d0
2015-04-28Merge remote-tracking branch 'origin/feature/vclptr'Michael Meeks21-59/+81
Resolve several thousand lines of conflicts. Conflicts: accessibility/source/extended/accessiblelistbox.cxx accessibility/source/standard/vclxaccessiblecombobox.cxx accessibility/source/standard/vclxaccessibledropdowncombobox.cxx accessibility/source/standard/vclxaccessibledropdownlistbox.cxx accessibility/source/standard/vclxaccessiblelistbox.cxx accessibility/source/standard/vclxaccessibletextfield.cxx basctl/source/basicide/basidesh.cxx cui/source/inc/chardlg.hxx cui/source/tabpages/tpbitmap.cxx dbaccess/source/ui/dlg/UserAdmin.cxx dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx extensions/source/propctrlr/propertyeditor.hxx extensions/source/scanner/sanedlg.cxx filter/source/pdf/impdialog.cxx include/sfx2/mgetempl.hxx include/sfx2/sidebar/SidebarToolBox.hxx include/sfx2/viewsh.hxx include/svtools/brwbox.hxx include/svtools/filectrl.hxx include/svtools/scrwin.hxx include/svx/dlgctrl.hxx include/svx/sidebar/Popup.hxx include/svx/sidebar/PopupContainer.hxx include/svx/sidebar/PopupControl.hxx include/svx/sidebar/SidebarDialControl.hxx include/svx/sidebar/ValueSetWithTextControl.hxx sc/source/ui/condformat/condformatdlgentry.cxx sc/source/ui/navipi/navipi.cxx sc/source/ui/sidebar/CellBorderStyleControl.hxx sd/source/ui/animations/CustomAnimationDialog.cxx sd/source/ui/inc/DrawViewShell.hxx sd/source/ui/inc/Ruler.hxx sd/source/ui/inc/SlideSorter.hxx sd/source/ui/inc/ViewTabBar.hxx sd/source/ui/inc/Window.hxx sd/source/ui/inc/morphdlg.hxx sd/source/ui/inc/sdpreslt.hxx sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx sd/source/ui/sidebar/LayoutMenu.hxx sd/source/ui/sidebar/MasterPagesSelector.hxx sd/source/ui/sidebar/NavigatorWrapper.hxx sd/source/ui/sidebar/PanelBase.hxx sd/source/ui/sidebar/RecentMasterPagesSelector.cxx sd/source/ui/sidebar/RecentMasterPagesSelector.hxx sd/source/ui/slideshow/showwindow.hxx sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx sd/source/ui/slidesorter/view/SlsLayeredDevice.hxx sd/source/ui/view/ViewShellBase.cxx sd/source/ui/view/drviewsa.cxx sfx2/source/appl/fileobj.hxx sfx2/source/appl/opengrf.cxx sfx2/source/control/thumbnailviewacc.hxx sfx2/source/dialog/securitypage.cxx sfx2/source/dialog/templdlg.cxx sfx2/source/doc/docinsert.cxx sfx2/source/doc/guisaveas.cxx sfx2/source/inc/alienwarn.hxx sfx2/source/sidebar/Deck.cxx sfx2/source/sidebar/Deck.hxx sfx2/source/sidebar/DeckTitleBar.cxx sfx2/source/sidebar/DeckTitleBar.hxx sfx2/source/sidebar/MenuButton.cxx sfx2/source/sidebar/MenuButton.hxx sfx2/source/sidebar/Panel.cxx sfx2/source/sidebar/Panel.hxx sfx2/source/sidebar/PanelTitleBar.hxx sfx2/source/sidebar/SidebarDockingWindow.hxx sfx2/source/sidebar/SidebarToolBox.cxx sfx2/source/sidebar/TabBar.hxx sfx2/source/sidebar/TabItem.cxx sfx2/source/sidebar/TabItem.hxx sfx2/source/sidebar/TitleBar.hxx sfx2/source/toolbox/imgmgr.cxx starmath/inc/edit.hxx starmath/inc/smmod.hxx starmath/qa/cppunit/test_starmath.cxx starmath/source/edit.cxx starmath/source/smmod.cxx svtools/source/brwbox/brwbox1.cxx svtools/source/brwbox/datwin.hxx svtools/source/contnr/fileview.cxx svtools/source/contnr/simptabl.cxx svtools/source/control/filectrl.cxx svtools/source/control/valueimp.hxx svx/inc/GalleryControl.hxx svx/source/dialog/dlgctrl.cxx svx/source/dialog/swframeexample.cxx svx/source/fmcomp/fmgridif.cxx svx/source/gallery2/GalleryControl.cxx svx/source/sidebar/EmptyPanel.hxx svx/source/sidebar/area/AreaPropertyPanel.hxx svx/source/sidebar/area/AreaTransparencyGradientControl.hxx svx/source/sidebar/graphic/GraphicPropertyPanel.hxx svx/source/sidebar/insert/InsertPropertyPanel.cxx svx/source/sidebar/insert/InsertPropertyPanel.hxx svx/source/sidebar/line/LinePropertyPanel.hxx svx/source/sidebar/line/LineWidthControl.cxx svx/source/sidebar/line/LineWidthControl.hxx svx/source/sidebar/line/LineWidthValueSet.hxx svx/source/sidebar/paragraph/ParaPropertyPanel.hxx svx/source/sidebar/possize/SidebarDialControl.cxx svx/source/sidebar/text/TextCharacterSpacingPopup.hxx svx/source/sidebar/text/TextPropertyPanel.hxx svx/source/sidebar/tools/PopupContainer.cxx svx/source/sidebar/tools/PopupControl.cxx svx/source/sidebar/tools/ValueSetWithTextControl.cxx svx/source/svdraw/svdfmtf.hxx svx/source/svdraw/svdibrow.cxx svx/source/tbxctrls/colrctrl.cxx svx/source/tbxctrls/tbcontrl.cxx sw/source/ui/dbui/mmaddressblockpage.cxx sw/source/ui/dialog/uiregionsw.cxx sw/source/ui/index/cnttab.cxx sw/source/uibase/inc/drpcps.hxx sw/source/uibase/sidebar/PageColumnControl.hxx sw/source/uibase/sidebar/PageMarginControl.hxx sw/source/uibase/sidebar/PageOrientationControl.hxx sw/source/uibase/sidebar/PagePropertyPanel.hxx sw/source/uibase/sidebar/PageSizeControl.hxx sw/source/uibase/uiview/view2.cxx sw/source/uibase/utlui/navipi.cxx vcl/inc/svdata.hxx vcl/source/control/combobox.cxx vcl/source/control/lstbox.cxx vcl/source/window/dockwin.cxx vcl/source/window/winproc.cxx Change-Id: I056cf3026ff17d65cca0b6e6588bda4a88fa8d95
2015-04-27More loplugin:simplifyboolStephan Bergmann3-4/+4
Change-Id: I445a6edc0fc2c840cde777e8664bac3362c9b6e2
2015-04-24loplugin:simplifyboolStephan Bergmann5-5/+5
Change-Id: I8087e16e50c06534e7d9a08c3bc72ab53de9f126
2015-04-23Improved loplugin:literaltoboolconversion looking into cond. exprs.Stephan Bergmann2-2/+2
...automatic rewriter fixes Change-Id: I6b04ca80f08f8a71ff94e309fd52f44d736751ee
2015-04-22SpriteDeviceHelper::createBuffers unused and does nothingCaolán McNamara4-18/+0
Change-Id: Ief6d775a53e5984e0dc6d9838280fb24bcbcb67f
2015-04-17Windows compilation fix in DX canvas.Michael Meeks2-2/+7
Change-Id: I835b0d073885a452fc1031892ad2e59d8670cfac
2015-04-16formula & canvas: convert new to ::Create to get initial ref-counting right.Michael Meeks3-4/+5
Change-Id: I96e2e59c2f880632cf719f3346e345a5d03cc858
2015-04-14More missing lifecycle pieces.Michael Meeks1-2/+2
Change-Id: I45ea68d75b03389a1ac0cdb74486c3701c1730a8
2015-04-10Automated conversion of VclPtr construction to use Instance template.Michael Meeks5-7/+7
Change-Id: I8be9141b9653e73ebd23a5a3d810f240c376f97e
2015-04-10calling delete on VclPtrNoel Grandin1-2/+1
Change-Id: I25346435d2129086281783636624b1bb430d0096
2015-04-10wrap more stuff in VclPtrNoel Grandin1-1/+1
Change-Id: Ia742c47399231bc5914b6586132ad3daf694fdb0
2015-04-10Convert last vestiges of OutputDevice* and VirtualDevice* members.Michael Meeks1-1/+1
Change-Id: I2353d8e9f2b30bf00cf5229613793d9605854b76
2015-04-10Move OutputDevice members to VclPtr: dbaccess, canvas.Michael Meeks6-8/+10
Change-Id: Iae01ddcb6a0cde3be1bd79200e9177983be2f924
2015-04-10Fix OutputDevice members / stack allocation: chart, canvas, cui.Michael Meeks5-34/+34
Change-Id: Ieb6f58222ffc3e03c1d599752a6f02600e1bee1f
2015-04-10Fix OutputDevice members / stack allocation.Michael Meeks2-3/+3
Change-Id: Ie57434607b61085a882af40b63d6a4b7aac0d4d3
2015-04-10Unwind VCLObject bits for OutputDevice derivatives.Michael Meeks4-4/+19
Change-Id: I1abdf0a6d43029fb29e5cbc6c3f788aa98f55a1f
2015-04-10start wrapping OutputDevice in VclPtrNoel Grandin2-2/+2
Change-Id: If3ecbb0599b50d50ce6b3997ca7892200c332ffe
2015-04-08A UNO Any can't contain an AnyStephan Bergmann1-1/+1
...and css::uno::makeAny<css::uno::Any>() was never meant to be used. Introduce css::uno::toAny for the (template-code) cases that shall return an Any for both Any and non-Any inputs. Change-Id: Ifa977d73f1da71b2fedde7e8140b19497c4a0257
2015-04-02loplugin:staticmethodsNoel Grandin2-2/+2
Change-Id: Ibf0c73ac17ec19ed672f66907db47057920babca
2015-03-28Clean up C-style casts from pointers to voidStephan Bergmann2-2/+2
Change-Id: Ic903d2429672159691fef58d0d7a15433c884250
2015-03-26const_cast: convert some C-style casts and remove some redundant onesStephan Bergmann1-2/+2
Change-Id: Ic87452261d5104e86d22c1b37ea07b05864ca991
2015-03-23More Windows define whack-a-moleStephan Bergmann1-1/+2
Change-Id: I09bf1cfe22a65b8dbbcc7139cd1055f0e829210d
2015-03-23move cairo helpers to vcl and make per-plugCaolán McNamara30-1475/+61
Change-Id: I4de4d5c3a191784598e93a8cf70e45a3f59ae857 Reviewed-on: https://gerrit.libreoffice.org/14907 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-03-19move ucs4toindexCaolán McNamara3-41/+42
Change-Id: I8ae441a68ba74422c607a8830325c3afa954ad92 Reviewed-on: https://gerrit.libreoffice.org/14908 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-03-19reorganize resizing surfaces logicCaolán McNamara8-46/+14
the only case where we don't just create a new surface is the X11 case Change-Id: I98a3c8f227e208ac9db969ed7711e293fb237c2e Reviewed-on: https://gerrit.libreoffice.org/14902 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-03-19loplugin:constantfunction: canvasNoel Grandin19-232/+0
Change-Id: I2fb2c4ec0e9467d7ced05b0e815e0d5bd2ba74c3
2015-03-19move the cairo resize hack into vclCaolán McNamara1-6/+6
Change-Id: I41868da3901d9c3fff69c11da467952176e58f09 Reviewed-on: https://gerrit.libreoffice.org/14897 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-03-18revert work in progressCaolán McNamara3-123/+14
Change-Id: I1387b0ed7b2d8bb9df801c03cf59efc9c0e1cfd3
2015-03-18more thinkingCaolán McNamara2-0/+5
Change-Id: Ie349bd35b1fc92b77cc15f51eb886a1c9c92cbe1
2015-03-18thinkingCaolán McNamara2-8/+112
Change-Id: Ib1a086bed7f70e244db2a0bd32819560c6949d51
2015-03-18move the cairo resize hack into vclCaolán McNamara1-6/+6
Change-Id: Ifd1817a28f4fb7ddcc85447fd3388fd0efd86476
2015-03-18we don't need any xlib things here, but we do need freetype supportCaolán McNamara1-3/+2
Change-Id: I4b3055b7a3582e8dd64599ad33b767302b101dad
2015-03-18move IsCairoWorking to vclplug level and renameCaolán McNamara6-35/+5
Change-Id: Id31de932afa61df6933d61ddba971f5d7060f0c1
2015-03-18OpenOffice.org->LibreOfficeCaolán McNamara3-3/+3
Change-Id: I0ba431b9227b3717b25f99c3ad6da552073bb712