Commit Graph

109 Commits

Author SHA1 Message Date
Andrzej Hunt
8d1ca883b1 EMF+: Only draw endcap outline if not filled, fix endcap scaling.
Change-Id: I4520eea08e43ccd657c1db03b258ef84612da971
Reviewed-on: https://gerrit.libreoffice.org/7726
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Jan Holesovsky <kendy@collabora.com>
2014-01-30 11:24:47 +00:00
Stephan Bergmann
460c15be2e Apparently broken bitmask operation
Change-Id: Id4dfa3d4676b50a86fd6044d501de15b122bb7f1
2014-01-28 20:24:36 +01:00
Caolán McNamara
766a512a88 coverity#1158489 Uninitialized scalar field
Change-Id: Ibe8600f8ad38859cd79d52528f970d99f0b8f536
2014-01-23 16:02:12 +00:00
Andrzej Hunt
9b1ceabd5f EMF+: actually use lineJoin attribute for polygons.
Change-Id: I5b369703333332598353d9817f0253bbe5fc3601
2014-01-01 17:40:16 +00:00
Andrzej Hunt
83f2b3c590 EMF+: mapping can rotate the width vector, so use resulting length.
Otherwise (i.e. with non-vertical lines) the width will be incorrect,
and can result in lines disappearing as the resulting X component
can be tiny/approaching zero.

Change-Id: Icf3b7c10c627594600b517b8ff445f8df87c56f8
2014-01-01 17:07:56 +00:00
Andrzej Hunt
793f14db15 EMF+: Add EMFPlusPointR detection to EMFPPath.
Change-Id: Iff1ae9806ee05654762b313ed00ada206e51337f
2013-12-27 11:30:36 +00:00
Andrzej Hunt
d8dedc775c EMF+: Integer coordinate values are signed.
Change-Id: I5babcec50d48dc2a6288a01685db61fbb7058680
2013-12-26 20:26:12 +00:00
Matúš Kukan
131f3230d9 EMF+: Fill line cap object if EmfPlusCustomLineCapDataFillPath is set.
Change-Id: I7b53a8f18e1fb24b1ae0322bdf0980e431a0725f
2013-12-06 15:04:11 +01:00
Jan Holesovsky
eb45c69b64 EMF+: Log the stride too.
Change-Id: I903d8e5629c578f292307bf3abdb2f58ef9dd92c
2013-12-05 09:08:09 +01:00
Matúš Kukan
f115ec6ce1 EMF+: Do not ignore source rectangle of the image to be rendered.
Change-Id: I4f861c7653c89d8f1ca73696e885f33f7bfc3b06
2013-12-04 17:46:41 +01:00
Jan Holesovsky
acd5edd3d4 EMF+: Line thickness has to be considered when drawing the caps.
Change-Id: I6043ee3c214f453afaef06125993c73be624c07e
2013-11-27 11:54:53 +01:00
Tor Lillqvist
b64d5dc6a4 WaE: potentially uninitialized local variable 'pPattern' used
Change-Id: Ic000edc60a9c5ae7d64fab9bf8b6c2a88bcec223
2013-11-26 10:04:09 +02:00
Stephan Bergmann
9abd09f04b -Werror,-Wunused-const-variable
Change-Id: I25fa3ea9e0101de7b17c17ef44da6d7b26a46017
2013-11-26 09:02:05 +01:00
Jan Holesovsky
ad8875e2a0 EMF+: Set the stroke attributes on the custom line caps.
This finally makes the rendering of the custom line caps nice & complete.

Change-Id: If35ef1c44f34f5d5e6c50789c907105d03e96fca
2013-11-25 22:11:31 +01:00
Jan Holesovsky
ff98a070eb EMF+: Render custom line cap data.
Change-Id: Ic5e2e2d105fb006503b63e4e162d4dc09dab9e68
2013-11-25 22:11:31 +01:00
Jan Holesovsky
20f9413f17 EMF+: Parse custom line cap data for start and end line caps.
Change-Id: I3a5f79e22500f53c3c61c173e0827c250b2a8fd0
2013-11-25 14:10:47 +01:00
Jan Holesovsky
172acd5bea EMF+: Small cleanup & more logging in preparation for line starts & ends.
Change-Id: I584f8a1680c6aa7b51b948a00213c285387b77c3
2013-11-25 14:10:47 +01:00
Jan Holesovsky
40977516a5 EMF+: Implement line dashing.
Change-Id: I9eb21c0a8b5baa5b0080845f61b12fc65034d959
2013-11-25 14:10:46 +01:00
Jan Holesovsky
6f6b12cb24 EMF+: Stroke size is always supposed to be absolute.
Change-Id: I7221311e5dee6384dc2d1c071bf6f1c61811895a
2013-11-25 14:10:45 +01:00
Noel Grandin
aeb41c9b9b remove redundant calls to OUString constructor
Change code like this:
  aStr = OUString("xxxx");
into this:
  aStr = "xxxx";

Change-Id: I31cb92e21658d57bb9e14b65c179536eae8096f6
2013-11-04 10:11:07 +02:00
Muthu Subramanian
3d0d0717e8 n#812793: Reverting the workaround. 2013-10-10 14:51:04 +05:30
Noel Grandin
abe49a8427 convert CPPCANVAS module from String to OUString
Change-Id: I12a219a50cc3a9b07c9852cc0d417f71797b9e15
2013-09-17 09:05:43 +02:00
Fridrich Štrba
21ee132af1 Revert some random work-in-progress that is most probably bitrotten
Revert "EMF+: aBaseTransform is a hardcoded identity matrix, don't bother with it"

This reverts commit 2b700a710e.

Revert "Pass also the bounding box in device units to the EMF+ part"

This reverts commit f387c5da5a.
2013-08-30 14:37:27 +02:00
Caolán McNamara
b9fa1e20f3 build on higher debug levels
Change-Id: I7f4d85f3e26ab8b19dae05c6907840b97a8af1d6
2013-08-24 14:02:48 +01:00
Mark Wielaard
cb14b1e56d Fix memory leak in EMFPPen.
Delete dashPattern, compoundArray, customStartCap and customEndCap
arrays if they were created in the destructor.

Change-Id: I5f3821b1ab0ac31a9cd4bc402c04090585953573
Reviewed-on: https://gerrit.libreoffice.org/4821
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
2013-07-11 04:02:51 +00:00
Stephan Bergmann
fdcd77cdd7 warning C4305: 'argument' : truncation from 'double' to 'float'
Change-Id: Ieee74fd7e7cec65304dd5de9c1368f5449b66407
2013-06-12 17:27:37 +02:00
Fridrich Štrba
2b700a710e EMF+: aBaseTransform is a hardcoded identity matrix, don't bother with it
Change-Id: Ifa4f42c4f17a70c7238347a13897ef6742eb4679
2013-06-12 10:03:55 +02:00
Fridrich Štrba
721f82c9bf Use a local variable for the points
Change-Id: Ibd274ecd7eaeadaaef9f2a17a0d721355a561431
2013-06-11 11:41:23 +02:00
Fridrich Štrba
eb0a738d1b Refactor a bit the code while reading it
Change-Id: I58693bb4ffe0f59365069a87fc30081ddf226eaa
2013-06-11 11:41:23 +02:00
Fridrich Štrba
2933de9ce0 Fix typo and make the debug output a bit more readable
Change-Id: I45cb5303bfcc1f3df8455ac454f3e1b3fc5a11e0
2013-06-11 11:41:23 +02:00
Armin Le Grand
385bb45473 Resolves: #i120604# unified and secured gradient tooling for primitives
(cherry picked from commit 05785d283e718aab182a5ea848de72e4a4b2efe3)

Conflicts:
	basegfx/inc/basegfx/tools/gradienttools.hxx
	basegfx/source/tools/gradienttools.cxx
	cppcanvas/source/mtfrenderer/implrenderer.cxx
	drawinglayer/inc/drawinglayer/primitive2d/fillgradientprimitive2d.hxx
	drawinglayer/inc/drawinglayer/texture/texture.hxx
	drawinglayer/source/primitive2d/fillgradientprimitive2d.cxx
	drawinglayer/source/processor2d/vclhelpergradient.cxx

Change-Id: I21f94e7b4eede094171a83a009ae19213e77f22c

Unname unused argument to prevent warnings.

(cherry picked from commit f7d4af835cf308bc9ece6fd84cbd14ba5be0adcd)

Change-Id: I44381f1e417c39dfbd1d4051079bbd09f0c61848
2013-06-11 10:32:54 +01:00
Michael Stahl
930127da85 cppcanvas: try to make MSVC tinderbox happy
Change-Id: If4fd5a788d3907a986e27f5f53d5995c7035f685
2013-06-07 20:54:33 +02:00
Michael Meeks
ed30996f8f fdo#65502 - EmfFillPie fix.
Change-Id: I395ef5f5175b9a2d758f4023605b8e2d4dce859f
2013-06-07 15:00:32 +01:00
Fridrich Štrba
abdbb847fa Transform the clipping polygon before using it
Change-Id: I71a00f7d4b80ef41b637889e51a414fac6883ba1
2013-06-07 15:35:48 +02:00
Fridrich Štrba
db73861949 log point types as numbers and not as ascii chars with the value of the number
Change-Id: Ia64c2b3a53f150afd3c194598dc3bf7d6c5d3b17
2013-06-07 10:47:57 +02:00
Chris Sherlock
931984489e Janitorial: indent code correctly
Change-Id: I9fcbeb5f60df1a977347076dac82d4b5f7aba2c1
Reviewed-on: https://gerrit.libreoffice.org/3867
Reviewed-by: Thorsten Behrens <tbehrens@suse.com>
Tested-by: Thorsten Behrens <tbehrens@suse.com>
2013-05-12 13:01:24 +00:00
David Tardon
2293815a63 fix build
Change-Id: Iae000243265335e3f0bc6bd8979c2131243c48f9
2013-05-12 07:37:00 +02:00
Chris Sherlock
00fbf73b07 EMF+ fixes
A number of fixes have been made to commit
256e42646b:

* Missing redirect in SAL_WARN - only gets picked up when DBG_LEVEL > 1
* Some errant newlines in SAL_INFO
* Some missing braces
* Missing semi-colon fixed (!)
* Changed int to sal_Int32 (causing ambiguity error)
* Add dumpWords to the SAL_WARN that ensures that size is not greater
  than length
* Show values when proessing EMF+ comment record (only enabled when
  DBG_LEVEL > 2)
* Missing std::hex in SAL_INFO

Change-Id: I059ba24964dd428a56a31d100109cfec938a8a49
Reviewed-on: https://gerrit.libreoffice.org/3861
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
2013-05-12 05:19:56 +00:00
Chris Sherlock
e3c5f8f5d4 Fix: change to std::dec after having used std::hex
The basefield flag of a stream is persistent, which I didn't realise before.
This fixes commit 256e42646b

Change-Id: Ic0076c63ae6236ae75dcd79d108add27391b2125
Reviewed-on: https://gerrit.libreoffice.org/3842
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
2013-05-10 13:10:04 +00:00
Thorsten Behrens
569f6b41c6 Don't leak all of the EMF+ graphic objects.
Change-Id: I7951a9d25da5feec997dd0643f8579f5bcd0ee0f
2013-05-08 20:50:09 +02:00
Stephan Bergmann
e50ef53102 Fix adaption to SAL_INFO
Change-Id: I12e32c0323e21946b795ca7f2af392930f55eed6
2013-05-06 12:19:05 +02:00
Chris Sherlock
256e42646b Convert EMFP_DEBUG to SAL_INFO, etc.
* Change to SAL_INFO instead of EMFP_DEBUG in emfplus.cxx
* Use #ifdef OSL_DEBUG > 1 to conditionally compile in debugging routines
* Remove some commented/conditionally compiled out code
* Change logging area for SAL_WARN from cppcanvas to cppcanvas.emf

Change-Id: I6db0021807634070cfa2fee0f07e32d235b3d2f3
Reviewed-on: https://gerrit.libreoffice.org/3782
Reviewed-by: Tor Lillqvist <tml@iki.fi>
Tested-by: Tor Lillqvist <tml@iki.fi>
2013-05-06 09:39:43 +00:00
Noel Grandin
2f1a293e1a Clang cleanup, unaligned if statement
The extra semi-colons were confusing clang. Just remove the macro,
it's not adding any real value.

Change-Id: I7f7c312d2c0167a17e31624e197ae75b77fa0c2f
Reviewed-on: https://gerrit.libreoffice.org/3677
Reviewed-by: Tor Lillqvist <tml@iki.fi>
Tested-by: Tor Lillqvist <tml@iki.fi>
2013-04-29 13:59:47 +00:00
Muthu Subramanian
5a1d773278 fdo#60638: Workaround should be in FillRects rather than FillPolygon. 2013-04-26 14:04:21 +05:30
Muthu Subramanian
4bc3ead064 n#812793: (Workaround) Transparent background import in EMF+.
EMF+ seems to have alpha of 0xff for transparent background!
2013-04-25 11:57:59 +05:30
Luboš Luňák
1946794ae0 mass removal of rtl:: prefixes for O(U)String*
Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk
have kept them, in order not to break external API (the automatic using declaration
is LO-internal).

Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
2013-04-07 14:23:11 +02:00
Stephan Bergmann
aa753f01ba -Wunused-macros
Change-Id: Ifaa1637122d6f9cae1e29b77ac36ca5d1f220aed
2013-03-27 09:36:53 +01:00
Radek Doulik
8b1eac4a14 implemented BeginContainerNoParams and EndContainer records
- plus a bit of refactoring to reuse code

Change-Id: I416d2c47800752a27e2dc79f9b55b096e641062f
2013-03-22 20:55:09 +01:00
Radek Doulik
69b19ba284 implemented EmfPlusRecordTypeSave and EmfPlusRecordTypeRestore records
Change-Id: Iac87870c0f50a74b7f4db4c674adcded1494c055
2013-03-19 13:19:19 +01:00
Tor Lillqvist
fe8eba5faa WaE: Potentially uninitialized local variable
Change-Id: I497c30dfd951132fe2f7998a158b6c14efe5ebf7
2013-03-19 10:44:25 +02:00