Commit Graph

44 Commits

Author SHA1 Message Date
Radek Doulik
f0a5e147eb add .5 to control points coordinates after transformation
- otherwise we might end up with wrong coordinates
 - fixes fdo#38580
2012-04-12 10:07:35 +02:00
Szabolcs Dezsi
e4fb171d3a Replaced a few equal calls with == 2012-04-08 19:24:00 +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
Thorsten Behrens
83114b27fa Consistent use of alpha in cairocanvas
Use GetIndex() instead of GetBlue() (does the same, but more
self-documenting); use opaque when no alpha channel consistently.
2012-03-16 17:02:20 +01:00
Norbert Thiebaud
24c0f87615 remove include of pch header in canvas 2011-11-27 12:57:22 -06:00
Tor Lillqvist
6db1788c08 WaE: '=' : truncation of constant value 2011-10-06 12:02:02 +03:00
Thomas Arnhold
be6a8677a6 OSL_TRACE: Remove trailing newlines
Done with perl regex:
s/(\n\s*OSL_TRACE\(\s*\"[^\n]+?)\s*(\\n)+(\"[^\n]*\)\;\n)/$1$3/gs;

- removed trailing whitespaces and (multiple) newlines
2011-09-21 09:28:39 +02:00
Radek Doulik
72eff9e692 fix set color regression in cairo canvas
- the cairo_set_source_rgba should be called with non-alpha-pre-multiplied
   color values
 - fixes fdo#33591 and fdo#35681
2011-07-12 13:35:43 +02:00
Petr Mladek
c87019c1a9 Merge remote-tracking branch 'origin/libreoffice-3-3' into libreoffice-3-4
Conflicts:
	svtools/source/control/toolbarmenu.cxx
	vcl/inc/vcl/gdimtf.hxx
	vcl/inc/vcl/settings.hxx
	vcl/unx/inc/saldata.hxx
	vcl/unx/kde4/KDESalGraphics.cxx
2011-04-05 19:07:05 +02:00
Michael Meeks
662b3b7762 build against old cairos (with warning) 2011-03-29 12:02:12 +01:00
Radek Doulik
ef2cd9c0c0 fix cairo canvas edge count calculation
(cherry picked from commit abb5233c0b9b584407b4696f5db2c330ca45b632)

Signed-off-by: Thorsten Behrens <tbehrens@novell.com>
2011-02-21 11:49:47 +01:00
Radek Doulik
74ccf00ef4 Revert "fix cairo canvas regression - do not access polygon points outside range"
- it is not needed anymore

This reverts commit a898a8cb077c05b1085da8254e66f61aa265b7dc.
2011-02-17 18:47:30 +01:00
Radek Doulik
7d613299ae fix edge count calculation 2011-02-17 16:03:17 +01:00
Radek Doulik
c15ed83558 fix cairo canvas regression - do not access polygon points outside range
(cherry picked from commit a898a8cb077c05b1085da8254e66f61aa265b7dc)

Signed-off-by: Thorsten Behrens <tbehrens@novell.com>
2011-02-16 20:51:46 +01:00
Radek Doulik
c661a55df1 fix cairo canvas regression - do not access polygon points outside range 2011-02-16 18:14:23 +01: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
Caolán McNamara
41e955d473 #i113910# fix frame effect around images in cairo on some drivers 2010-10-06 11:47:54 +01:00
thb
ce1a6f9141 Merge DEV300_m75
* resolved two conflicts caused by lineend changes in
   canvashelper_texturefill.cxx and implrenderer.cxx. Took the cws
   version, which uses new texture fill semantics, and fixes clipping
   bug
 * binned file header changes from head for deleted files
2010-03-31 14:57:58 +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
thb
9fb80cbeee #i107137# fix wrong colorspace calculations
* applied patch from i107137
2010-01-18 21:01:43 +01:00
thb
58ed75fad4 #i108160# #i10000# backport cairocanvas build fix & more build fixes
* adapted tests to use new testshl include dir
 * took P1 masterfix also for this cws
 * more tweaks to get build done
2010-01-18 16:10:01 +01:00
thb
ea48c18b84 thbfixes10: merge with DEV300 m69 2010-01-18 01:10:42 +01:00
thb
1737f4d2fd #i52325# #i108250# removed B3DGeometry, fixed gradient/fill bitmap
* removed unused & broken B3DGeometry class
 * fixed bug in basegfx::tools::isRectangle for polygons with curves
 * fixed cairocanvas gradient and bitmap fill rendering
 * fixed vclcanvas bitmap fill rendering (not clipping properly)
 * added TextureMode::NONE, adapted all client code
 * fixed snafu in XGraphicDevice.idl, with missing include
2010-01-18 00:37:41 +01:00
Kurt Zenker
dcbaee1e7d masterfix: #i108160# build error fixed 2010-01-14 17:37:57 +01:00
thb
1837a267a2 #i105937# Much improved gradient support for canvas/basegfx/drawinglayer.
See http://blog.thebehrens.net/2009/07/28/hackweek-iv-canvas-convwatch/ for more background information
2009-10-16 00:43:16 +02:00
Armin Le Grand
727411be78 #i105655# commiting changes so far for preparing linux version 2009-10-14 13:55:31 +02:00
Jens-Heiner Rechtien
b1afe0f67d CWS-TOOLING: integrate CWS cmcfixes61
2009-07-22 10:53:14 +0200 cmc  r274224 : #i103714# duplicate patch
2009-07-22 10:45:26 +0200 cmc  r274223 : #i103715# fix up m68k makefile.mk
2009-07-22 10:32:16 +0200 cmc  r274222 : #i103714# || && new gcc warnings
2009-07-21 13:29:17 +0200 cmc  r274190 : #i103651# fix for subpixel gray line in cairo canvas animations
2009-07-20 17:35:58 +0200 cmc  r274151 : #i103668# WaE over use of const
2009-07-20 15:53:51 +0200 cmc  r274146 : #i103664# use boost::addressof instead
2009-07-20 15:38:40 +0200 cmc  r274145 : #i103451# long -> INT32 for these streamable values
2009-07-20 15:33:15 +0200 cmc  r274144 : #i103663 clear low-hanging aliasing warnings
2009-07-20 15:28:23 +0200 cmc  r274143 : #i103662 clear low-hanging aliasing warnings
2009-07-20 15:21:46 +0200 cmc  r274142 : #i103661 clear low-hanging aliasing warnings
2009-07-20 15:16:05 +0200 cmc  r274141 : #i103660 clear low-hanging aliasing warnings
2009-07-29 15:33:56 +00:00
Rüdiger Timm
08dd93a4b7 CWS-TOOLING: integrate CWS canvas06
2008-11-14 18:59:03 +0100 thb  r263697 : Reverted fAlpha setup to previous state, as this was bogus as well - code path is apparently not taken for test, but anyway
2008-11-13 21:32:45 +0100 thb  r263663 : WaE fix (and a bad bug as well - int color would have overflown)
2008-11-13 16:51:37 +0100 pl  r263654 : remove warnings
2008-11-13 09:46:28 +0100 thb  r263623 : #i95317# Fixed typo (thx WaE for finding)
2008-11-12 21:25:19 +0100 thb  r263617 : #i96047# call update() on hidden sprite shape as well, to force actual hiding
2008-11-12 21:23:31 +0100 thb  r263616 : #i95209# Merge from CWS thb11 - revives canvasbitmap unit tests, fixes nasty corner case in x11 salbmp (for 16bpp)
2008-11-12 21:21:46 +0100 thb  r263615 : #i95197# Shuffled code to make valgrind quiet during bmp loading
2008-11-12 21:18:06 +0100 thb  r263614 : #i93382# Make --disable-moz build work
2008-11-12 21:16:55 +0100 thb  r263613 : #i95317# Fixed mis-named traits methods for min and max numbers
2008-11-12 20:59:01 +0100 thb  r263612 : #i95317#, #i92902#: migrate CWS canvas06 to SVN.
2008-12-09 13:22:21 +00:00
Vladimir Glazounov
5212ed9ebf INTEGRATION: CWS aw033 (1.15.10); FILE MERGED
2008/07/11 11:30:46 aw 1.15.10.2: RESYNC: (1.15-1.16); FILE MERGED
2008/05/28 06:30:48 thb 1.15.10.1: Merge from canvas05 - fixing display of closed curves
2008-08-19 21:01:40 +00:00
Kurt Zenker
a22b5aa9bd INTEGRATION: CWS canvas05 (1.9.14); FILE MERGED
2008/06/03 15:39:06 thb 1.9.14.17: #i85116# Revived lost changes in cairocanvas
2008/05/30 16:03:39 thb 1.9.14.16: Added test of VirtualDevice::GetCanvas(); corrected one tiny bit in cairocanvas::clear
2008/05/21 13:32:03 thb 1.9.14.15: Made vcl and cairo canvas work with emf+ patches; smoothed out internal cairo makefile changes; corrected cairocanvas sprite update
2008/04/21 07:32:31 thb 1.9.14.14: RESYNC: (1.14-1.15); FILE MERGED
2008/04/20 23:36:08 thb 1.9.14.13: Made canvasdemo work again on dev300; made sure GDIPlusUser is always destroyed _last_ (as it kills all other GDIPlus objects); made cairocanvas sensitive to outdev size
2008/04/07 14:34:10 thb 1.9.14.12: RESYNC: (1.12-1.14); FILE MERGED
2008/04/04 22:08:33 thb 1.9.14.11: 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/03 16:02:25 thb 1.9.14.10: Merged in cairoquartz01 changes, reworked into the polymorphic Surface concept now
2008/04/02 22:56:27 thb 1.9.14.9: Reworked Surface class to abstract interface; changed all manual refcount handling to RAII
2008/03/28 23:38:46 thb 1.9.14.8: Backbuffer-less canvas implementation on top of cairo
2008/03/18 22:00:56 thb 1.9.14.7: Implementing non-backbuffered canvas for cairocanvas as well - reworked to share most of the code
2008/03/13 22:48:50 thb 1.9.14.6: merging in remaining ooo-build cairocanvas fixes; completing std color space implementation
2008/03/13 14:57:21 thb 1.9.14.5: Finishing touches to StdColorSpace; move cairocanvas to new color space mechanisms
2008/01/22 00:50:46 thb 1.9.14.4: RESYNC: (1.10-1.12); FILE MERGED
2007/12/20 22:18:56 thb 1.9.14.3: #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/11/06 12:36:43 thb 1.9.14.2: RESYNC: (1.9-1.10); FILE MERGED
2007/10/01 13:02:01 thb 1.9.14.1: #i78888# #i78925# #i79258# #i79437# Merge from CWS picom
2008-06-24 09:20:51 +00:00
Rüdiger Timm
becadb625d INTEGRATION: CWS changefileheader (1.12.22); FILE MERGED
2008/03/28 16:34:56 rt 1.12.22.1: #i87441# Change license header to LPGL v3.
2008-04-11 07:52:39 +00:00
Kurt Zenker
d767c954bf INTEGRATION: CWS presenterview (1.12.10); FILE MERGED
2008/01/13 23:25:52 thb 1.12.10.2: #i10000# Now even builds.
2008/01/13 22:16:13 thb 1.12.10.1: #i85206# Respecting fill rule
2008-04-03 12:12:12 +00:00
Kurt Zenker
6d54198b16 INTEGRATION: CWS cairoquartz01 (1.7.10); FILE MERGED
2008/03/27 22:50:18 thb 1.7.10.8: Cleaned up a few warnings, made this (almost) build on win32.
Still missing the cairo_win32_cairo.cxx file.
2008/01/18 18:48:31 mox 1.7.10.7: Remove too aggressive namespacing. Broke build with Mac OS X 10.5 Leopard.
2008/01/12 23:52:06 mox 1.7.10.6: This time cairo actually WORKS ON MACOSX!
2007/12/10 17:45:32 mox 1.7.10.5: RESYNC: (1.9-1.12); FILE MERGED
2007/08/11 18:09:39 mox 1.7.10.4: RESYNC: (1.8-1.9); FILE MERGED
2007/07/28 15:30:37 mox 1.7.10.3: RESYNC: (1.7-1.8); FILE MERGED
Hand-merged overlapping changes
2007/06/02 23:05:32 thb 1.7.10.2: #i70519# Merged in tml's fixes for WinCairo; made code compile warning-free under Linux; added prex/postx.h (which where already referenced); cleaned up a bit; replaces plain round() call with basegfx::fround; asserting unexpected/unimplemented case at selected places
2007/04/12 20:15:58 mox 1.7.10.1: Issue number:  #69066# initial Cairo Quartz implementation
2008-04-02 08:41:24 +00:00
Rüdiger Timm
44cd7644c6 INTEGRATION: CWS canvas23101_SRC680 (1.9.10); FILE MERGED
2007/09/13 12:19:10 pl 1.9.10.1: #i81235# #i81236# #i81237# cairo patches (thanks radekdoulik), cleaned up some warnings
2007-11-09 10:31:51 +00:00
Rüdiger Timm
51860e4594 INTEGRATION: CWS transogl01 (1.7.20); FILE MERGED
2007/08/27 14:35:48 radekdoulik 1.7.20.5: Issue number:  78745
Submitted by:  radekdoulik

fixed canvas helper getSize method, which was causing the getData called
with wrong size from client code
2007/07/26 13:48:19 smmathews 1.7.20.4: Issue number:
Submitted by:
Reviewed by:
2007/07/25 16:28:43 radekdoulik 1.7.20.3: Issue number:  78745
Submitted by:  radekdoulik
Reviewed by:   radekdoulik

Fix the offset of bitmap data in getData method
2007/07/25 14:58:16 thb 1.7.20.2: RESYNC: (1.7-1.8); FILE MERGED
2007/06/21 10:45:31 radekdoulik 1.7.20.1: Issue number:  78745
Submitted by:  radekdoulik
Reviewed by:   radekdoulik
implemented XIntegerBitmap::getData
2007-11-09 09:13:47 +00:00
Jens-Heiner Rechtien
f8c71d2596 INTEGRATION: CWS thbpp9_SRC680 (1.9.18); FILE MERGED
2007/10/17 13:50:42 thb 1.9.18.1: #i81116# Applied fix from rodo
2007-11-01 13:39:47 +00:00
Jens-Heiner Rechtien
db91067a05 INTEGRATION: CWS kendy18 (1.8.8); FILE MERGED
2007/07/26 12:48:15 kendy 1.8.8.1: #i80039#
Fix cairo canvas according to the basegfx API change.
2007-08-02 15:32:02 +00:00
Oliver Bolte
5ecf3ad439 INTEGRATION: CWS presfixes12 (1.6.18); FILE MERGED
2007/04/28 23:16:09 thb 1.6.18.6: #i76730# Added documentation to cairocanvas funcions - thanks mox
2007/03/01 13:45:34 thb 1.6.18.5: #i37778# Made compositing mode operational (to e.g. clear a surface to transparent); made cairocanvas compile warning-free under gcc4.1
2007/02/25 18:49:46 thb 1.6.18.4: #i37778# Fixed typo: missing cairo context
2007/02/21 14:44:30 thb 1.6.18.3: RESYNC: (1.6-1.7); FILE MERGED
2007/02/20 22:23:07 thb 1.6.18.2: #i37778# Added XCanvas::clear() method throughout all implementations
2007/02/14 13:21:02 thb 1.6.18.1: #i37778# Added XCanvas::clear() to all canvas implentations
2007-07-17 13:20:31 +00:00
Vladimir Glazounov
407cdaee48 INTEGRATION: CWS thbpp6v2 (1.6.10); FILE MERGED
2007/01/17 11:20:41 thb 1.6.10.1: #i72893# Delaying alpha mask query until it
2007-02-05 11:49:49 +00:00
Kurt Zenker
4c3cb25fbd INTEGRATION: CWS presfixes09 (1.3.8); FILE MERGED
2006/11/15 13:28:49 thb 1.3.8.3: RESYNC: (1.4-1.5); FILE MERGED
2006/10/18 13:55:54 thb 1.3.8.2: RESYNC: (1.3-1.4); FILE MERGED
2006/10/02 09:46:09 thb 1.3.8.1: #i49357# Enabling reads from canvas surfaces as XBitmaps
2006-12-13 13:39:19 +00:00
Vladimir Glazounov
1eb9dd738a INTEGRATION: CWS cairofixes02 (1.3.16); FILE MERGED
2006/10/09 16:30:39 radekdoulik 1.3.16.3: RESYNC: (1.3-1.4); FILE MERGED
2006/10/09 15:57:10 radekdoulik 1.3.16.2: Issue number:  69325
Submitted by:  radekdoulik
Reviewed by:   radekdoulik
2006-10-09  Radek Doulik  <rodo@novell.com>

	* patches/src680/apply: added fix from Caolan, move path
	coordinates only when doing stroke. Before they were moved for
	fills as well. It happened because of unclear method name, which
	was indicating just strokes, but was used for clips and fills as
	well. I changed the method names as well now.
2006/06/30 13:58:13 radekdoulik 1.3.16.1: #i65589#
workaround for cairo bug, fixes bitmap drawing problem
2006-11-01 13:45:42 +00:00
Oliver Bolte
152181fe1e INTEGRATION: CWS pchfix02 (1.3.28); FILE MERGED
2006/09/01 17:18:00 kaib 1.3.28.1: #i68856# Added header markers and pch files
2006-09-17 02:19:05 +00:00
Oliver Bolte
175142296f INTEGRATION: CWS cairofixes01 (1.2.2); FILE MERGED
2006/03/02 17:58:38 radekdoulik 1.2.2.2: Issue number:  62722
Submitted by:  radekdoulik
Reviewed by:   radekdoulik
2006-02-24  Radek Doulik  <rodo@novell.com>

	* build/src680-m152/canvas/source/cairo/cairo_canvashelper.cxx
	(implDrawBitmapSurface): set source after scale is set
2006/03/02 17:57:19 radekdoulik 1.2.2.1: Issue number:  62722
Submitted by:  radekdoulik
Reviewed by:   radekdoulik
2006-02-24  Radek Doulik  <rodo@novell.com>

	* build/src680-m152/canvas/source/cairo/cairo_canvashelper.cxx
	(drawPolyPolygonImplementation): check that textures are not empty
	(doOperation): fix textures handling, before I misunderstood the
	documentation and thought there's one texture per polygon. In real
	it is sequence of textures which is used for all polygons. So far
	we use only 1st texture from sequence - same as vcl canvas does
	for now.
2006-03-22 09:59:35 +00:00
Kurt Zenker
6f0bed9c05 INTEGRATION: CWS cairocanvas (1.1.2); FILE ADDED
2006/01/11 12:29:01 radekdoulik 1.1.2.6: 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:05 radekdoulik 1.1.2.5: Issue number:  #51657
Submitted by:  radekdoulik
Reviewed by:   radekdoulik
use vcl to draw text to virtual device created from our pixmaps
2005/12/07 11:20:48 radekdoulik 1.1.2.4: Issue number:  #51657
Submitted by:  radekdoulik
Reviewed by:   radekdoulik
fix bezier curves rendering, move lines/polygons by 0.5 points so that 0
width lines are sharp
2005/11/08 21:23:03 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:57 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:57 radekdoulik 1.1.2.1: Issue number:  51657
Submitted by:  radekdoulik
Reviewed by:   radekdoulik
initial import of cairo canvas code
2006-02-28 09:34:46 +00:00