diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2013-03-01 10:38:31 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2013-03-01 13:34:47 +0000 |
| commit | ada8b3fb0e84013c9793a0213a7637678dd79b55 (patch) | |
| tree | 4461c2440afd63dc180467a3f270c45d97a7974a /libcdr | |
| parent | d10c1b3a54f0264f895c2e5b0056e955f7d07380 (diff) | |
Upload libcdr 0.0.11; fixing fdo#55366 fdo#59528 fdo#53278 fdo#54586
Change-Id: Iadebf93d6002ce1a13152e9f7a8e4c490a4fbd94
(cherry picked from commit 8fad92201dc18592f2ffaecc798071f96fec82ba)
Reviewed-on: https://gerrit.libreoffice.org/2485
Reviewed-by: Miklos Vajna <vmiklos@suse.cz>
Tested-by: Miklos Vajna <vmiklos@suse.cz>
Diffstat (limited to 'libcdr')
| -rw-r--r-- | libcdr/UnpackedTarball_cdr.mk | 6 | ||||
| -rw-r--r-- | libcdr/libcdr-0.0.10-ellipse.patch | 19 |
2 files changed, 0 insertions, 25 deletions
diff --git a/libcdr/UnpackedTarball_cdr.mk b/libcdr/UnpackedTarball_cdr.mk index 541fa960e73b..be1e7d762a87 100644 --- a/libcdr/UnpackedTarball_cdr.mk +++ b/libcdr/UnpackedTarball_cdr.mk @@ -11,10 +11,4 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,cdr)) $(eval $(call gb_UnpackedTarball_set_tarball,cdr,$(CDR_TARBALL))) -$(eval $(call gb_UnpackedTarball_set_patchlevel,cdr,1)) - -$(eval $(call gb_UnpackedTarball_add_patches,cdr,\ - libcdr/libcdr-0.0.10-ellipse.patch \ -)) - # vim: set noet sw=4 ts=4: diff --git a/libcdr/libcdr-0.0.10-ellipse.patch b/libcdr/libcdr-0.0.10-ellipse.patch deleted file mode 100644 index 0b392a702b35..000000000000 --- a/libcdr/libcdr-0.0.10-ellipse.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/src/lib/CDRParser.cpp -+++ b/src/lib/CDRParser.cpp -@@ -1186,6 +1186,16 @@ void libcdr::CDRParser::readEllipse(WPXInputStream *input) - double rx = fabs(cx); - double ry = fabs(cy); - -+ while (angle1 < 0.0) -+ angle1 += 2*M_PI; -+ while (angle1 > 2*M_PI) -+ angle1 -= 2*M_PI; -+ -+ while (angle2 < 0.0) -+ angle2 += 2*M_PI; -+ while (angle2 > 2*M_PI) -+ angle2 -= 2*M_PI; -+ - if (angle1 != angle2) - { - if (angle2 < angle1) |