30797 2009-10-26 16:47:44 -0700 ENABLE_FILTERS compile fixes under Windows 2009-10-26 18:13:45 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) PC Windows Vista RESOLVED FIXED P2 Normal --- 1 bfulgham bfulgham oldest_to_newest 158019 0 bfulgham 2009-10-26 16:47:44 -0700 Differences between the Microsoft and GNU compilers seems to require a few specific casts, as well as ensuring that the M_PI macro is defined in a few places. These changes are in keeping with the use of these macros and casts in other areas of WebKit. 158023 1 41915 bfulgham 2009-10-26 17:00:32 -0700 Created attachment 41915 Small fixes to get a clean Windows build. 158029 2 41915 mrowe 2009-10-26 17:21:28 -0700 Comment on attachment 41915 Small fixes to get a clean Windows build. Take a look at MathExtras.h for an alternative to defining M_PI in a bunch of places. 158030 3 41915 darin 2009-10-26 17:25:54 -0700 Comment on attachment 41915 Small fixes to get a clean Windows build. > unsigned dx, int stride, int strideLine, int effectWidth, int effectHeight, bool alphaImage) > { > - int dxLeft = static_cast<int>(floor(dx / 2)); > + int dxLeft = static_cast<int>(floor(static_cast<float>(dx / 2))); And this should just be dx / 2, no call to floor. There's no need to call floor just to convert an unsigned to an integer. If you were calling floor, you'd cast to double, not float, because floor takes a double. The one that takes a float is named floorf. 158047 4 41922 bfulgham 2009-10-26 17:44:12 -0700 Created attachment 41922 Second rev. Revised patch to use MathExtras.h and specifically the piDouble constant. Also corrected the use of floor(dx/2) as suggested by Darin. 158049 5 41922 darin 2009-10-26 17:49:57 -0700 Comment on attachment 41922 Second rev. > +#include "MathExtras.h" The way to include this is: #include <wtf/MathExtras.h> > - int dxLeft = static_cast<int>(floor(dx / 2)); > + int dxLeft = static_cast<int>(dx / 2); You also don't need the static_cast any more. Please fix the include and consider removing the static_cast. review- 158051 6 41923 bfulgham 2009-10-26 17:59:06 -0700 Created attachment 41923 Revision 3 * Correct includes of MathExtras. * Get rid of unnecessary static_cast. 158052 7 bfulgham 2009-10-26 18:13:45 -0700 Landed in http://trac.webkit.org/changeset/50118. 41915 2009-10-26 17:00:32 -0700 2009-10-26 17:44:12 -0700 Small fixes to get a clean Windows build. filter_build.patch text/plain 2294 bfulgham SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1MDExMykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTcgQEAKKzIwMDktMTAtMjYgIEJyZW50IEZ1bGdoYW0gIDxiZnVsZ2hhbUB3ZWJr aXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IEJ1aWxkIGNvcnJlY3Rpb25zIGZvciBFTkFCTEVfRklMVEVSUyBpbiBXaW5kb3dzLgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzA3OTcKKworICAgICAg ICBCdWlsZCBjb3JyZWN0aW9uIGZvciBFTkFCTEVfRklMVEVSUyBmZWF0dXJlLiAgTm8gbmV3IHRl c3RzIG5lZWRlZC4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2ZpbHRlcnMvRkVDb2xv ck1hdHJpeC5jcHA6IFRoZSBNX1BJIG1hY3JvIGlzCisgICAgICAgICAgbmVlZGVkLgorICAgICAg ICAqIHBsYXRmb3JtL2dyYXBoaWNzL2ZpbHRlcnMvRkVHYXVzc2lhbkJsdXIuY3BwOiAgVGhlIE1f UEkgbWFjcm8gaXMKKyAgICAgICAgICBuZWVkZWQuICBBbHNvLCBmbG9vcidzIGFyZ3VtZW50IG5l ZWRlZCBhIGNhc3QgdG8gcmVtb3ZlIGFtYmlndWl0eS4KKwogMjAwOS0xMC0yNiAgSmVyZW15IE9y bG93ICA8am9ybG93QGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBEaW1pdHJp IEdsYXprb3YuCkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2ZpbHRlcnMvRkVDb2xv ck1hdHJpeC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9maWx0 ZXJzL0ZFQ29sb3JNYXRyaXguY3BwCShyZXZpc2lvbiA1MDA4NCkKKysrIFdlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvZmlsdGVycy9GRUNvbG9yTWF0cml4LmNwcAkod29ya2luZyBjb3B5KQpAQCAt MzEsNiArMzEsMTAgQEAKICNpbmNsdWRlICJJbWFnZURhdGEuaCIKICNpbmNsdWRlIDxtYXRoLmg+ CiAKKyNpZm5kZWYgTV9QSQorI2RlZmluZSBNX1BJIDMuMTQxNTkyNjUzNTg5NzkzMjM4NDYKKyNl bmRpZgorCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIEZFQ29sb3JNYXRyaXg6OkZFQ29sb3JNYXRy aXgoRmlsdGVyRWZmZWN0KiBpbiwgQ29sb3JNYXRyaXhUeXBlIHR5cGUsIGNvbnN0IFZlY3Rvcjxm bG9hdD4mIHZhbHVlcykKSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZmlsdGVycy9G RUdhdXNzaWFuQmx1ci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9maWx0ZXJzL0ZFR2F1c3NpYW5CbHVyLmNwcAkocmV2aXNpb24gNTAwODQpCisrKyBXZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2ZpbHRlcnMvRkVHYXVzc2lhbkJsdXIuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC0zMSw2ICszMSwxMCBAQAogI2luY2x1ZGUgIkltYWdlRGF0YS5oIgogI2luY2x1ZGUg PG1hdGguaD4KIAorI2lmbmRlZiBNX1BJCisjZGVmaW5lIE1fUEkgMy4xNDE1OTI2NTM1ODk3OTMy Mzg0NgorI2VuZGlmCisKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogRkVHYXVzc2lhbkJsdXI6OkZF R2F1c3NpYW5CbHVyKEZpbHRlckVmZmVjdCogaW4sIGNvbnN0IGZsb2F0JiB4LCBjb25zdCBmbG9h dCYgeSkKQEAgLTY5LDcgKzczLDcgQEAgdm9pZCBGRUdhdXNzaWFuQmx1cjo6c2V0U3RkRGV2aWF0 aW9uWShmbAogc3RhdGljIHZvaWQgYm94Qmx1cihDYW52YXNQaXhlbEFycmF5KiYgc3JjUGl4ZWxB cnJheSwgQ2FudmFzUGl4ZWxBcnJheSomIGRzdFBpeGVsQXJyYXksCiAgICAgICAgICAgICAgICAg IHVuc2lnbmVkIGR4LCBpbnQgc3RyaWRlLCBpbnQgc3RyaWRlTGluZSwgaW50IGVmZmVjdFdpZHRo LCBpbnQgZWZmZWN0SGVpZ2h0LCBib29sIGFscGhhSW1hZ2UpCiB7Ci0gICAgaW50IGR4TGVmdCA9 IHN0YXRpY19jYXN0PGludD4oZmxvb3IoZHggLyAyKSk7CisgICAgaW50IGR4TGVmdCA9IHN0YXRp Y19jYXN0PGludD4oZmxvb3Ioc3RhdGljX2Nhc3Q8ZmxvYXQ+KGR4IC8gMikpKTsKICAgICBpbnQg ZHhSaWdodCA9IGR4IC0gZHhMZWZ0OwogCiAgICAgZm9yIChpbnQgeSA9IDA7IHkgPCBlZmZlY3RI ZWlnaHQ7ICsreSkgewo= 41922 2009-10-26 17:44:12 -0700 2009-10-26 17:59:06 -0700 Second rev. filter_build.patch text/plain 3342 bfulgham SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1MDExMykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTggQEAKKzIwMDktMTAtMjYgIEJyZW50IEZ1bGdoYW0gIDxiZnVsZ2hhbUB3ZWJr aXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IEJ1aWxkIGNvcnJlY3Rpb25zIGZvciBFTkFCTEVfRklMVEVSUyBpbiBXaW5kb3dzLgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzA3OTcKKworICAgICAg ICBCdWlsZCBjb3JyZWN0aW9uIGZvciBFTkFCTEVfRklMVEVSUyBmZWF0dXJlLiAgTm8gbmV3IHRl c3RzIG5lZWRlZC4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2ZpbHRlcnMvRkVDb2xv ck1hdHJpeC5jcHA6IFVzZSBNYXRoRXh0cmFzLmggYW5kCisgICAgICAgICAgaXRzIHBpRG91Ymxl IGNvbnN0YW50LgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2ZpbHRlcnMvRkVHYXVzc2lh bkJsdXIuY3BwOiBVc2UgTWF0aEV4dHJhcy5oIGFuZAorICAgICAgICAgIGl0cyBwaURvdWJsZSBj b25zdGFudC4gIFJlbW92ZSB1bm5lY2Vzc2FyeSBjYWxsIHRvIGZsb29yIHVzZWQgaW4KKyAgICAg ICAgICB0aGUgZGl2aXNpb24gb2YgYW4gdW5zaWduZWQsIGNvbnZlcnRpbmcgdG8gaW50LgorCiAy MDA5LTEwLTI2ICBKZXJlbXkgT3Jsb3cgIDxqb3Jsb3dAY2hyb21pdW0ub3JnPgogCiAgICAgICAg IFJldmlld2VkIGJ5IERpbWl0cmkgR2xhemtvdi4KSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvZmlsdGVycy9GRUdhdXNzaWFuQmx1ci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9maWx0ZXJzL0ZFR2F1c3NpYW5CbHVyLmNwcAkocmV2aXNpb24gNTAw ODQpCisrKyBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2ZpbHRlcnMvRkVHYXVzc2lhbkJsdXIu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yOSw2ICsyOSw3IEBACiAjaW5jbHVkZSAiRmlsdGVyLmgi CiAjaW5jbHVkZSAiR3JhcGhpY3NDb250ZXh0LmgiCiAjaW5jbHVkZSAiSW1hZ2VEYXRhLmgiCisj aW5jbHVkZSAiTWF0aEV4dHJhcy5oIgogI2luY2x1ZGUgPG1hdGguaD4KIAogbmFtZXNwYWNlIFdl YkNvcmUgewpAQCAtNjksNyArNzAsNyBAQCB2b2lkIEZFR2F1c3NpYW5CbHVyOjpzZXRTdGREZXZp YXRpb25ZKGZsCiBzdGF0aWMgdm9pZCBib3hCbHVyKENhbnZhc1BpeGVsQXJyYXkqJiBzcmNQaXhl bEFycmF5LCBDYW52YXNQaXhlbEFycmF5KiYgZHN0UGl4ZWxBcnJheSwKICAgICAgICAgICAgICAg ICAgdW5zaWduZWQgZHgsIGludCBzdHJpZGUsIGludCBzdHJpZGVMaW5lLCBpbnQgZWZmZWN0V2lk dGgsIGludCBlZmZlY3RIZWlnaHQsIGJvb2wgYWxwaGFJbWFnZSkKIHsKLSAgICBpbnQgZHhMZWZ0 ID0gc3RhdGljX2Nhc3Q8aW50PihmbG9vcihkeCAvIDIpKTsKKyAgICBpbnQgZHhMZWZ0ID0gc3Rh dGljX2Nhc3Q8aW50PihkeCAvIDIpOwogICAgIGludCBkeFJpZ2h0ID0gZHggLSBkeExlZnQ7CiAK ICAgICBmb3IgKGludCB5ID0gMDsgeSA8IGVmZmVjdEhlaWdodDsgKyt5KSB7CkBAIC0xMTAsOCAr MTExLDggQEAgdm9pZCBGRUdhdXNzaWFuQmx1cjo6YXBwbHkoRmlsdGVyKiBmaWx0ZQogICAgIGlm IChtX3ggPT0gMCB8fCBtX3kgPT0gMCkKICAgICAgICAgcmV0dXJuOwogCi0gICAgdW5zaWduZWQg c2R4ID0gc3RhdGljX2Nhc3Q8dW5zaWduZWQ+KGZsb29yKG1feCAqIDMgKiBzcXJ0KDIgKiBNX1BJ KSAvIDQuZiArIDAuNWYpKTsKLSAgICB1bnNpZ25lZCBzZHkgPSBzdGF0aWNfY2FzdDx1bnNpZ25l ZD4oZmxvb3IobV95ICogMyAqIHNxcnQoMiAqIE1fUEkpIC8gNC5mICsgMC41ZikpOworICAgIHVu c2lnbmVkIHNkeCA9IHN0YXRpY19jYXN0PHVuc2lnbmVkPihmbG9vcihtX3ggKiAzICogc3FydCgy ICogcGlEb3VibGUpIC8gNC5mICsgMC41ZikpOworICAgIHVuc2lnbmVkIHNkeSA9IHN0YXRpY19j YXN0PHVuc2lnbmVkPihmbG9vcihtX3kgKiAzICogc3FydCgyICogcGlEb3VibGUpIC8gNC5mICsg MC41ZikpOwogCiAgICAgSW50UmVjdCBlZmZlY3REcmF3aW5nUmVjdCA9IGNhbGN1bGF0ZURyYXdp bmdJbnRSZWN0KG1faW4tPnN1YlJlZ2lvbigpKTsKICAgICBSZWZQdHI8SW1hZ2VEYXRhPiBzcmNJ bWFnZURhdGEobV9pbi0+cmVzdWx0SW1hZ2UoKS0+Z2V0UHJlbXVsdGlwbGllZEltYWdlRGF0YShl ZmZlY3REcmF3aW5nUmVjdCkpOwpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9maWx0 ZXJzL0ZFQ29sb3JNYXRyaXguY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvZmlsdGVycy9GRUNvbG9yTWF0cml4LmNwcAkocmV2aXNpb24gNTAwODQpCisrKyBXZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2ZpbHRlcnMvRkVDb2xvck1hdHJpeC5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTI5LDYgKzI5LDcgQEAKICNpbmNsdWRlICJGaWx0ZXIuaCIKICNpbmNsdWRlICJH cmFwaGljc0NvbnRleHQuaCIKICNpbmNsdWRlICJJbWFnZURhdGEuaCIKKyNpbmNsdWRlICJNYXRo RXh0cmFzLmgiCiAjaW5jbHVkZSA8bWF0aC5oPgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CkBAIC05 Miw4ICs5Myw4IEBACiAKIGlubGluZSB2b2lkIGh1ZXJvdGF0ZShkb3VibGUmIHJlZCwgZG91Ymxl JiBncmVlbiwgZG91YmxlJiBibHVlLCBjb25zdCBmbG9hdCYgaHVlKQogewotICAgIGRvdWJsZSBj b3NIdWUgPSBjb3MoaHVlICogTV9QSSAvIDE4MCk7IAotICAgIGRvdWJsZSBzaW5IdWUgPSBzaW4o aHVlICogTV9QSSAvIDE4MCk7IAorICAgIGRvdWJsZSBjb3NIdWUgPSBjb3MoaHVlICogcGlEb3Vi bGUgLyAxODApOyAKKyAgICBkb3VibGUgc2luSHVlID0gc2luKGh1ZSAqIHBpRG91YmxlIC8gMTgw KTsgCiAgICAgZG91YmxlIHIgPSByZWQgICAqICgwLjIxMyArIGNvc0h1ZSAqIDAuNzg3IC0gc2lu SHVlICogMC4yMTMpICsKICAgICAgICAgICAgICAgIGdyZWVuICogKDAuNzE1IC0gY29zSHVlICog MC43MTUgLSBzaW5IdWUgKiAwLjcxNSkgKwogICAgICAgICAgICAgICAgYmx1ZSAgKiAoMC4wNzIg LSBjb3NIdWUgKiAwLjA3MiArIHNpbkh1ZSAqIDAuOTI4KTsK 41923 2009-10-26 17:59:06 -0700 2009-10-26 18:03:09 -0700 Revision 3 filter_build2.patch text/plain 3868 bfulgham SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1MDExMykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjAgQEAKKzIwMDktMTAtMjYgIEJyZW50IEZ1bGdoYW0gIDxiZnVsZ2hhbUB3ZWJr aXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IEJ1aWxkIGNvcnJlY3Rpb25zIGZvciBFTkFCTEVfRklMVEVSUyBpbiBXaW5kb3dzLgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzA3OTcKKworICAgICAg ICBCdWlsZCBjb3JyZWN0aW9uIGZvciBFTkFCTEVfRklMVEVSUyBmZWF0dXJlLiAgTm8gbmV3IHRl c3RzIG5lZWRlZC4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2ZpbHRlcnMvRkVDb2xv ck1hdHJpeC5jcHA6IFVzZSBNYXRoRXh0cmFzLmggYW5kCisgICAgICAgICAgaXRzIHBpRG91Ymxl IGNvbnN0YW50LgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2ZpbHRlcnMvRkVHYXVzc2lh bkJsdXIuY3BwOiBVc2UgTWF0aEV4dHJhcy5oIGFuZAorICAgICAgICAgIGl0cyBwaURvdWJsZSBj b25zdGFudC4gIFJlbW92ZSB1bm5lY2Vzc2FyeSBjYWxsIHRvIGZsb29yIHVzZWQgaW4KKyAgICAg ICAgICB0aGUgZGl2aXNpb24gb2YgYW4gdW5zaWduZWQsIGNvbnZlcnRpbmcgdG8gaW50LgorICAg ICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3dpbi9TaW1wbGVGb250RGF0YUNhaXJvV2luLmNwcDog Q29ycmVjdCBpbmNsdWRlCisgICAgICAgICAgc3R5bGUgZm9yIE1hdGhFeHRyYXMuaC4KKwogMjAw OS0xMC0yNiAgSmVyZW15IE9ybG93ICA8am9ybG93QGNocm9taXVtLm9yZz4KIAogICAgICAgICBS ZXZpZXdlZCBieSBEaW1pdHJpIEdsYXprb3YuCkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2ZpbHRlcnMvRkVDb2xvck1hdHJpeC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9maWx0ZXJzL0ZFQ29sb3JNYXRyaXguY3BwCShyZXZpc2lvbiA1MDA4NCkK KysrIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZmlsdGVycy9GRUNvbG9yTWF0cml4LmNwcAko d29ya2luZyBjb3B5KQpAQCAtMzAsNiArMzAsNyBAQAogI2luY2x1ZGUgIkdyYXBoaWNzQ29udGV4 dC5oIgogI2luY2x1ZGUgIkltYWdlRGF0YS5oIgogI2luY2x1ZGUgPG1hdGguaD4KKyNpbmNsdWRl IDx3dGYvTWF0aEV4dHJhcy5oPgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKQEAgLTkyLDggKzkz LDggQEAKIAogaW5saW5lIHZvaWQgaHVlcm90YXRlKGRvdWJsZSYgcmVkLCBkb3VibGUmIGdyZWVu LCBkb3VibGUmIGJsdWUsIGNvbnN0IGZsb2F0JiBodWUpCiB7Ci0gICAgZG91YmxlIGNvc0h1ZSA9 IGNvcyhodWUgKiBNX1BJIC8gMTgwKTsgCi0gICAgZG91YmxlIHNpbkh1ZSA9IHNpbihodWUgKiBN X1BJIC8gMTgwKTsgCisgICAgZG91YmxlIGNvc0h1ZSA9IGNvcyhodWUgKiBwaURvdWJsZSAvIDE4 MCk7IAorICAgIGRvdWJsZSBzaW5IdWUgPSBzaW4oaHVlICogcGlEb3VibGUgLyAxODApOyAKICAg ICBkb3VibGUgciA9IHJlZCAgICogKDAuMjEzICsgY29zSHVlICogMC43ODcgLSBzaW5IdWUgKiAw LjIxMykgKwogICAgICAgICAgICAgICAgZ3JlZW4gKiAoMC43MTUgLSBjb3NIdWUgKiAwLjcxNSAt IHNpbkh1ZSAqIDAuNzE1KSArCiAgICAgICAgICAgICAgICBibHVlICAqICgwLjA3MiAtIGNvc0h1 ZSAqIDAuMDcyICsgc2luSHVlICogMC45MjgpOwpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9maWx0ZXJzL0ZFR2F1c3NpYW5CbHVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2ZpbHRlcnMvRkVHYXVzc2lhbkJsdXIuY3BwCShyZXZpc2lvbiA1MDA4 NCkKKysrIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZmlsdGVycy9GRUdhdXNzaWFuQmx1ci5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTMwLDYgKzMwLDcgQEAKICNpbmNsdWRlICJHcmFwaGljc0Nv bnRleHQuaCIKICNpbmNsdWRlICJJbWFnZURhdGEuaCIKICNpbmNsdWRlIDxtYXRoLmg+CisjaW5j bHVkZSA8d3RmL01hdGhFeHRyYXMuaD4KIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCkBAIC02OSw3 ICs3MCw3IEBACiBzdGF0aWMgdm9pZCBib3hCbHVyKENhbnZhc1BpeGVsQXJyYXkqJiBzcmNQaXhl bEFycmF5LCBDYW52YXNQaXhlbEFycmF5KiYgZHN0UGl4ZWxBcnJheSwKICAgICAgICAgICAgICAg ICAgdW5zaWduZWQgZHgsIGludCBzdHJpZGUsIGludCBzdHJpZGVMaW5lLCBpbnQgZWZmZWN0V2lk dGgsIGludCBlZmZlY3RIZWlnaHQsIGJvb2wgYWxwaGFJbWFnZSkKIHsKLSAgICBpbnQgZHhMZWZ0 ID0gc3RhdGljX2Nhc3Q8aW50PihmbG9vcihkeCAvIDIpKTsKKyAgICBpbnQgZHhMZWZ0ID0gZHgg LyAyOwogICAgIGludCBkeFJpZ2h0ID0gZHggLSBkeExlZnQ7CiAKICAgICBmb3IgKGludCB5ID0g MDsgeSA8IGVmZmVjdEhlaWdodDsgKyt5KSB7CkBAIC0xMTAsOCArMTExLDggQEAKICAgICBpZiAo bV94ID09IDAgfHwgbV95ID09IDApCiAgICAgICAgIHJldHVybjsKIAotICAgIHVuc2lnbmVkIHNk eCA9IHN0YXRpY19jYXN0PHVuc2lnbmVkPihmbG9vcihtX3ggKiAzICogc3FydCgyICogTV9QSSkg LyA0LmYgKyAwLjVmKSk7Ci0gICAgdW5zaWduZWQgc2R5ID0gc3RhdGljX2Nhc3Q8dW5zaWduZWQ+ KGZsb29yKG1feSAqIDMgKiBzcXJ0KDIgKiBNX1BJKSAvIDQuZiArIDAuNWYpKTsKKyAgICB1bnNp Z25lZCBzZHggPSBzdGF0aWNfY2FzdDx1bnNpZ25lZD4oZmxvb3IobV94ICogMyAqIHNxcnQoMiAq IHBpRG91YmxlKSAvIDQuZiArIDAuNWYpKTsKKyAgICB1bnNpZ25lZCBzZHkgPSBzdGF0aWNfY2Fz dDx1bnNpZ25lZD4oZmxvb3IobV95ICogMyAqIHNxcnQoMiAqIHBpRG91YmxlKSAvIDQuZiArIDAu NWYpKTsKIAogICAgIEludFJlY3QgZWZmZWN0RHJhd2luZ1JlY3QgPSBjYWxjdWxhdGVEcmF3aW5n SW50UmVjdChtX2luLT5zdWJSZWdpb24oKSk7CiAgICAgUmVmUHRyPEltYWdlRGF0YT4gc3JjSW1h Z2VEYXRhKG1faW4tPnJlc3VsdEltYWdlKCktPmdldFByZW11bHRpcGxpZWRJbWFnZURhdGEoZWZm ZWN0RHJhd2luZ1JlY3QpKTsKSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL1Np bXBsZUZvbnREYXRhQ2Fpcm9XaW4uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3Mvd2luL1NpbXBsZUZvbnREYXRhQ2Fpcm9XaW4uY3BwCShyZXZpc2lvbiA1MDA4NCkK KysrIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL1NpbXBsZUZvbnREYXRhQ2Fpcm9XaW4u Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zNCwxMSArMzQsMTEgQEAKICNpbmNsdWRlICJGb250Lmgi CiAjaW5jbHVkZSAiRm9udENhY2hlLmgiCiAjaW5jbHVkZSAiRm9udERlc2NyaXB0aW9uLmgiCi0j aW5jbHVkZSAiTWF0aEV4dHJhcy5oIgogI2luY2x1ZGUgPGNhaXJvLmg+CiAjaW5jbHVkZSA8Y2Fp cm8td2luMzIuaD4KICNpbmNsdWRlIDxtbGFuZy5oPgogI2luY2x1ZGUgPHRjaGFyLmg+CisjaW5j bHVkZSA8d3RmL01hdGhFeHRyYXMuaD4KIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCg==