strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tdf#117957 WMF Replace ellipses with rects to fix tests on arm64

Browse source 
The issue is caused by floating numbers,
On x86_64 it is:

  338.499728160392-445.269903703769

on arm it is:

  338.499728160392-445.26990370377

As in test files, we have two ellipses (which are made from small lines),
which points rounds differently on different architectures

Change-Id: I44dd5c7b3b13f3b1680d5a3a8348d6f467cb2f7c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116270
Tested-by: Jenkins
Tested-by: René Engelhard <rene@debian.org>
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
This commit is contained in:
Bartosz Kosiorek 2021-05-27 19:38:50 +02:00 committed by Xisco Fauli
parent 00e13be1c3
commit 9864fbc9d5
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
emfio/qa/cppunit/emf/EmfImportTest.cxx
View file

@ -520,7 +520,7 @@ void Test::TestPaletteWMF()
"color", "#ffff00");
assertXPath(pDocument, "/primitive2D/metafile/transform/mask/polypolygoncolor[2]/polypolygon",
"path", "m4920 3571c0 236.798958993862-62.332250797861 469.426085921606-180.731730294792 674.5s-288.694355626813 375.368790208277-493.768269705208 493.768269705208-437.701041006137 180.731730294792-674.5 180.731730294792-469.426085921606-62.332250797861-674.5-180.731730294792-375.368790208277-288.694355626812-493.768269705208-493.768269705207-180.731730294792-437.701041006138-180.731730294792-674.5c-4.54747350886464E-013-236.798958993862 62.332250797861-469.426085921606 180.731730294792-674.5 118.399479496931-205.073914078395 288.694355626812-375.368790208277 493.768269705207-493.768269705208s437.701041006138-180.731730294793 674.5-180.731730294793c236.798958993862-4.54747350886464E-013 469.426085921606 62.3322507978601 674.5 180.731730294791s375.368790208277 288.694355626813 493.768269705208 493.768269705207c118.399479496932 205.073914078394 180.731730294793 437.701041006138 180.731730294793 674.5z");
"path", "m2222 2222h2698v2698h-2698z");
assertXPath(pDocument, "/primitive2D/metafile/transform/mask/polypolygoncolor[2]",
"color", "#0080ff");
@ -533,7 +533,7 @@ void Test::TestPaletteWMF()
"width", "132");
assertXPathContent(pDocument, "/primitive2D/metafile/transform/mask/polygonstroke[2]/polygon",
"4894,3545 4892,3477 4887,3409 4878,3341 4866,3273 4851,3207 4832,3141 4810,3076 4785,3013 4756,2951 4724,2890 4690,2831 4652,2774 4612,2719 4569,2666 4523,2616 4474,2567 4424,2521 4371,2478 4316,2438 4259,2400 4200,2366 4139,2334 4077,2305 4014,2280 3949,2258 3883,2239 3817,2224 3749,2212 3681,2203 3613,2198 3545,2196 3545,2196 3477,2198 3409,2203 3341,2212 3273,2224 3207,2239 3141,2258 3076,2280 3013,2305 2951,2334 2890,2366 2831,2400 2774,2438 2719,2478 2666,2521 2616,2567 2567,2616 2521,2666 2478,2719 2438,2774 2400,2831 2366,2890 2334,2951 2305,3013 2280,3076 2258,3141 2239,3207 2224,3273 2212,3341 2203,3409 2198,3477 2196,3545 2196,3545 2198,3613 2203,3681 2212,3749 2224,3817 2239,3883 2258,3949 2280,4014 2305,4077 2334,4139 2366,4200 2400,4259 2438,4316 2478,4371 2521,4424 2567,4474 2616,4523 2666,4569 2719,4612 2774,4652 2831,4690 2890,4724 2951,4756 3013,4785 3076,4810 3141,4832 3207,4851 3273,4866 3341,4878 3409,4887 3477,4892 3545,4894 3545,4894 3613,4892 3681,4887 3749,4878 3817,4866 3883,4851 3949,4832 4014,4810 4077,4785 4139,4756 4200,4724 4259,4690 4316,4652 4371,4612 4424,4569 4474,4523 4523,4474 4569,4424 4612,4371 4652,4316 4690,4259 4724,4200 4756,4139 4785,4077 4810,4014 4832,3949 4851,3883 4866,3817 4878,3749 4887,3681 4892,3613");
"2222,2222 4920,2222 4920,4920 2222,4920");
assertXPath(pDocument, "/primitive2D/metafile/transform/mask/polygonstroke[2]/line",
"color", "#ff0000");
assertXPath(pDocument, "/primitive2D/metafile/transform/mask/polygonstroke[2]/line",

BIN
emfio/qa/cppunit/wmf/data/TestPalette.wmf
View file

Binary file not shown.