Commit Graph

18 Commits

Author SHA1 Message Date
Thorsten Behrens
deaa9689e2 Add some error handling to bitmap conversion.
Fixup for 7cf2b5809f, makes sure cairo
has all data committed to the surface, and handle random errors.

Change-Id: I39e5b5777968c4563a8ce3870bac3d4182090f3b
2013-06-13 12:48:16 +02:00
Michael Meeks
7cf2b5809f Cairo canvas fixes
+ Move BitmapEx construction from an XBitmapCanvas into BitmapEx
  where (arguably) it will be easier to re-factor later, treat a
  mask fetch failure as if we have no mask
+ Teach the cairo canvas to return a non-pre-multiplied RGB +
  separate Alpha BitmapEx when it can to avoid unpleasantness with
  the underlying X resources.
+ Add tentative code-path to convert 32bit color Bitmaps into
  24bit color, to avoid confusing X

Change-Id: Iaf6998c796aea6d73c57bed2bc03152d9636d5f5
2013-06-11 14:41:50 +01:00
Michael Meeks
056c7b46d4 Revert "pass argb32 pixmaps from vcl to canvas, avoiding costly x11 ...
This reverts commit 22f63477a3.

Conflicts:
	canvas/source/cairo/cairo_canvasbitmap.cxx

Change-Id: Ib266050ebc6eaca4fbd36ed013ac95a1b4b9d316
2013-06-11 14:41:50 +01:00
Thorsten Behrens
96dbf735b2 Fix indent.
Change-Id: Ia02968ccc12df994bc8528794e8f55a5eeda25be
2013-05-12 00:00:23 +02:00
David Ostrovsky
e1430b2387 WaE uninitialized pointer
Change-Id: Ifa10c48f6bbb1e69e83b2f2fe10ac58a225a3b06
2013-03-17 12:49:47 +01:00
Radek Doulik
22f63477a3 pass argb32 pixmaps from vcl to canvas, avoiding costly x11 roundtrips
- fixes also problem with emf+ rendering for slideshow

Change-Id: Icb894d3f37b29f23d3f267c944d827eefbf47fda
2013-03-14 13:21:24 +01:00
Ricardo Montania
50a7098b2e More ::rtl::OUString -> OUString in canvas
Change-Id: If99dfc98ace1bf62cd5ab05c596f4f6ffc5fbd2f
Reviewed-on: https://gerrit.libreoffice.org/1175
Tested-by: Olivier Hallot <olivier.hallot@alta.org.br>
Reviewed-by: Olivier Hallot <olivier.hallot@alta.org.br>
2012-11-27 20:47:07 +00:00
Michael Meeks
60337134e4 re-base on ALv2 code. Includes:
linecap: Reintegrating finished LineCap feature
    Patch contributed by Regina Henschel
    http://svn.apache.org/viewvc?view=revision&revision=1232507

    disable extended linecap API for now.

    gnumake4 work primarily from Mathias Bauer
    http://svn.apache.org/viewvc?view=revision&revision=1394326

    misc. dead code cleanups
    Patch contributed by Ariel Constenla-Haile
    http://svn.apache.org/viewvc?view=revision&revision=1204995
    http://svn.apache.org/viewvc?view=revision&revision=1207270
2012-10-08 11:36:37 +01:00
Szabolcs Dezsi
f770c5d6bc Replaced equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(...)) with == operator
Pattern used:

find . -name "*.cxx" -exec sed -i 's/\( *\)return \([^()]*\)\.equalsAsciiL( *RTL_CONSTASCII_STRINGPARAM *( *\([^)]*\) ) *);/\1return \2 == \3;/' \{\} \;
2012-04-06 12:48:32 +02:00
Thorsten Behrens
eb4f96c988 Cleanup formatting in cairocanvas
White-space changes - code was in parts unreadable after tab/spaces
conversion. While at it, removed a few lines of commented-out code.
2012-03-16 17:02:23 +01:00
Norbert Thiebaud
24c0f87615 remove include of pch header in canvas 2011-11-27 12:57:22 -06:00
Thorsten Behrens
09b546cf9c Fix overloaded-virtual warning in canvas
With enabled -Woverloaded-virtual gcc warning (see
http://lists.freedesktop.org/archives/libreoffice/2011-March/009567.html),
canvas exposed a nasty clash between WeakComponentImplHelper::disposing
and XEventListener::disposing. Fixed by overriding *once* in baseclass,
and then calling disambiguated, renamed methods.
2011-04-08 16:47:25 +02:00
Sebastian Spaeth
4905a19032 Add vim/emacs modelines to all source files
Fixes #fdo30794
Based on bin/add-modelines script (originally posted in mail
1286706307.1871.1399280959@webmail.messagingengine.com)

Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
2010-10-14 17:02:15 +02:00
Jens-Heiner Rechtien
8764506704 changefileheader2: #i109125#: change source file copyright notice from Sun Microsystems to Oracle; remove CVS style keywords (RCSfile, Revision) 2010-02-12 15:01:35 +01:00
Kurt Zenker
e2ca3a417c INTEGRATION: CWS canvas05 (1.3.68); FILE MERGED
2008/05/21 13:32:03 thb 1.3.68.10: Made vcl and cairo canvas work with emf+ patches; smoothed out internal cairo makefile changes; corrected cairocanvas sprite update
2008/04/21 07:32:10 thb 1.3.68.9: RESYNC: (1.3-1.4); FILE MERGED
2008/04/16 13:47:38 thb 1.3.68.8: Made cairocanvas build on Win32 again
2008/04/10 21:18:37 mox 1.3.68.7: Making cairo quartz buildable. Some pieces still missing.
2008/04/04 22:08:33 thb 1.3.68.6: Fixed output of bezier polygons for cairo; fixed missing surfaces here and there; removed useless refcounted SurfaceProvider arguments (that lead to premature canvas death, as called during ctor)
2008/04/02 22:56:26 thb 1.3.68.5: Reworked Surface class to abstract interface; changed all manual refcount handling to RAII
2008/03/18 22:00:55 thb 1.3.68.4: Implementing non-backbuffered canvas for cairocanvas as well - reworked to share most of the code
2008/03/13 22:48:50 thb 1.3.68.3: merging in remaining ooo-build cairocanvas fixes; completing std color space implementation
2007/12/20 22:18:56 thb 1.3.68.2: #i81092# #i78888# #i78925# #i79258# #i79437# #i84784# Large canvas rework, completing various areas such as color spaces, bitmap data access, true sprite and non-sprite implementations, and upstreaming the canvas parts of rodos emf+ rendering
2007/10/01 13:02:01 thb 1.3.68.1: #i78888# #i78925# #i79258# #i79437# Merge from CWS picom
2008-06-24 09:19:20 +00:00
Rüdiger Timm
ecc762136a INTEGRATION: CWS changefileheader (1.3.92); FILE MERGED
2008/03/28 16:34:55 rt 1.3.92.1: #i87441# Change license header to LPGL v3.
2008-04-11 07:49:32 +00:00
Oliver Bolte
6299517e3a INTEGRATION: CWS pchfix02 (1.2.32); FILE MERGED
2006/09/01 17:18:00 kaib 1.2.32.1: #i68856# Added header markers and pch files
2006-09-17 02:19:20 +00:00
Kurt Zenker
d77315495d INTEGRATION: CWS cairocanvas (1.1.2); FILE ADDED
2006/01/11 12:29:01 radekdoulik 1.1.2.5: Issue number:  #51657
Submitted by:  radekdoulik
Reviewed by:   radekdoulik
optimizes resizes and adds fallback to rgb surfaces for fully opaque bitmap
draws on sprites
2005/12/14 15:38:04 radekdoulik 1.1.2.4: Issue number:  #51657
Submitted by:  radekdoulik
Reviewed by:   radekdoulik
use vcl to draw text to virtual device created from our pixmaps
2005/11/08 21:23:00 radekdoulik 1.1.2.3: Issue number:  #51657
Submitted by:  radekdoulik
Reviewed by:   radekdoulik
updated cairo canvas to be usable by canvas02
2005/09/14 10:50:56 radekdoulik 1.1.2.2: Issue number: #51657
Submitted by: radekdoulik
Reviewed by: radekdoulik
Sync code in ooo-build with cairo canvas cws
2005/07/07 07:57:54 radekdoulik 1.1.2.1: Issue number:  51657
Submitted by:  radekdoulik
Reviewed by:   radekdoulik
initial import of cairo canvas code
2006-02-28 09:33:08 +00:00