200163 2019-07-26 08:33:22 -0700 JPEGImageDecoder: use libjpeg-turbo RGBA output path even for Adobe transform=0 JPEGs 2019-09-18 03:06:17 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=79457 InRadar P2 Normal --- 200498 1 loic.yhuel fujii achristensen annulen cgarcia don.olmstead fujii mcatanzaro olivier.blin sabouhallawa webkit-bug-importer zan oldest_to_newest 1556104 0 loic.yhuel 2019-07-26 08:33:22 -0700 JPEGImageDecoder: use libjpeg-turbo RGBA output path even for Adobe transform=0 JPEGs 1556107 1 374964 loic.yhuel 2019-07-26 08:41:26 -0700 Created attachment 374964 Patch 1556479 2 374964 fujii 2019-07-28 20:36:41 -0700 Comment on attachment 374964 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=374964&action=review > Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp:303 > +#if defined(TURBO_JPEG_RGB_SWIZZLE) && !defined(LIBJPEG_TURBO_SUPPORTS_CONVERSIONS_FROM_RGB) libjpeg-turbo seems to have LIBJPEG_TURBO_VERSION_NUMBER. Can you use it? LIBJPEG_TURBO_VERSION_NUMBER < 1002001 1556480 3 fujii 2019-07-28 20:50:28 -0700 Can we simply remove the code? Debian 9 (stretch) has libjpeg-turbo 1.5.1. Ubuntu 18.04 (bionic) has libjpeg-turbo 1.5.2. https://trac.webkit.org/wiki/WebKitGTK/DependenciesPolicy https://packages.debian.org/source/stretch/libjpeg-turbo https://packages.ubuntu.com/source/bionic/libjpeg-turbo 1556525 4 loic.yhuel 2019-07-29 02:05:34 -0700 LIBJPEG_TURBO_VERSION_NUMBER was added in 1.5.0, I wanted to do the test with the version which fixed the issue. We could remove the code, but we would have to test the version, either : - with a solution like the proposed patch - in the code : -#if defined(JCS_ALPHA_EXTENSIONS) && ASSUME_LITTLE_ENDIAN +#if defined(LIBJPEG_TURBO_VERSION_NUMBER) && ASSUME_LITTLE_ENDIAN +#if LIBJPEG_TURBO_VERSION_NUMBER >= 1002001 It would reference the 1.2.1 version, but only work with 1.5.0 and later, unless they are patched. Older libjpeg-turbo versions would be handled as libjpeg, so without BGRA output. 1556539 5 374964 mcatanzaro 2019-07-29 04:26:56 -0700 Comment on attachment 374964 Patch I think this is fine, but yeah, a simpler check not requiring regex would be even better. 1556542 6 loic.yhuel 2019-07-29 05:12:36 -0700 (In reply to Michael Catanzaro from comment #5) > Comment on attachment 374964 [details] > Patch > > I think this is fine, but yeah, a simpler check not requiring regex would be > even better. Without the regex, the only possible test is LIBJPEG_TURBO_VERSION_NUMBER (and can be done in the code), but it would mean only 1.5.0 and later would have the fix, not 1.2.1. 1556885 7 fujii 2019-07-29 19:22:58 -0700 Which version of libjpeg-turbo are you using? When will you upgrade your libjpeg-turbo? 1556915 8 loic.yhuel 2019-07-30 02:08:50 -0700 (In reply to Fujii Hironori from comment #7) > Which version of libjpeg-turbo are you using? When will you upgrade your > libjpeg-turbo? In our builds, we use 1.4.2 or never depending on the target, but we can upgrade. I just wanted to avoid requiring a more recent version that what is really needed. If we keep the code, but do the test with LIBJPEG_TURBO_VERSION_NUMBER, users of libjpeg-turbo 1.2.x/1.4.x would keep the current behavior, not taking advantage of the fast path with those specific JPEG files. I think that would be OK. Removing the code would mean slowing down those potential users for all other JPEGs, without any warning. 1556925 9 fujii 2019-07-30 02:54:18 -0700 I think we should restrict libjpeg-turbo version by CMake and remove the workaround. find_package(JPEG 1.2.1 REQUIRED) 1556946 10 mcatanzaro 2019-07-30 08:34:00 -0700 Yeah that's good, 1.2.1 is pretty old. 1556973 11 loic.yhuel 2019-07-30 09:21:34 -0700 (In reply to Fujii Hironori from comment #9) > I think we should restrict libjpeg-turbo version by CMake and remove the > workaround. > > find_package(JPEG 1.2.1 REQUIRED) FindJPEG.cmake defines JPEG_VERSION from JPEG_LIB_VERSION (with a regexp) : it's the libjpeg ABI version chosen when configuring libjpeg (for example 62). libjpeg-turbo >= 1.5.0 has a libjpeg.pc, which has the libjpeg-turbo version. (In reply to Michael Catanzaro from comment #10) > Yeah that's good, 1.2.1 is pretty old. But does everyone use libjpeg-turbo ? The code is still compatible with the original libjpeg (IJG), obviously using only RGB output. 1556981 12 annulen 2019-07-30 09:29:43 -0700 (In reply to Fujii Hironori from comment #9) > I think we should restrict libjpeg-turbo version by CMake and remove the > workaround. > > find_package(JPEG 1.2.1 REQUIRED) Problem is that CMake's bundled FindJPEG (which we are using) does not detect libjpeg version, so you can write e.g. find_package(JPEG 55 REQUIRED) and it will succeed. 1556982 13 annulen 2019-07-30 09:31:05 -0700 (In reply to Loïc Yhuel from comment #11) > (In reply to Michael Catanzaro from comment #10) > > Yeah that's good, 1.2.1 is pretty old. > But does everyone use libjpeg-turbo ? Of course no. 1557000 14 374964 achristensen 2019-07-30 10:28:12 -0700 Comment on attachment 374964 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=374964&action=review > Source/WebCore/ChangeLog:10 > + Covered by existing fast/images/rgb-jpeg-with-adobe-marker-only.html. If it's covered by this test, should we see an update of the test expectations with this change? 1557031 15 loic.yhuel 2019-07-30 11:22:18 -0700 (In reply to Alex Christensen from comment #14) > Comment on attachment 374964 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=374964&action=review > > > Source/WebCore/ChangeLog:10 > > + Covered by existing fast/images/rgb-jpeg-with-adobe-marker-only.html. > > If it's covered by this test, should we see an update of the test > expectations with this change? https://trac.webkit.org/changeset/108870/webkit added the test and the workaround (RGB output, converted to RGBA in WebKit, like with the IJG libjpeg), so the test always passed. My patch removes the workaround when we have libjpeg-turbo >= 1.2.1. The test would only fail if we force RGBA decoding with a libjpeg-turbo < 1.2.1. 1559075 16 374964 fujii 2019-08-06 23:56:10 -0700 Comment on attachment 374964 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=374964&action=review > Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp:302 > m_info.out_color_space = rgbOutputColorSpace(); It seems that JPEGImageDecoder::outputScanlines doesn't support the case out_color_space is BGRA and m_scaled is false. I think we should set out_color_space JCS_RGB if m_scaled. m_info.out_color_space = m_scaled ? JCS_RGB : rgbOutputColorSpace(); 1559077 17 374964 fujii 2019-08-07 00:51:29 -0700 Comment on attachment 374964 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=374964&action=review >> Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp:302 >> m_info.out_color_space = rgbOutputColorSpace(); > > It seems that JPEGImageDecoder::outputScanlines doesn't support the case out_color_space is BGRA and m_scaled is false. > I think we should set out_color_space JCS_RGB if m_scaled. > > m_info.out_color_space = m_scaled ? JCS_RGB : rgbOutputColorSpace(); It seems a dead code. Filed Bug 200498. 1559096 18 loic.yhuel 2019-08-07 05:25:18 -0700 (In reply to Fujii Hironori from comment #16) > Comment on attachment 374964 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=374964&action=review > > > Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp:302 > > m_info.out_color_space = rgbOutputColorSpace(); > > It seems that JPEGImageDecoder::outputScanlines doesn't support the case > out_color_space is BGRA and m_scaled is false. > I think we should set out_color_space JCS_RGB if m_scaled. > > m_info.out_color_space = m_scaled ? JCS_RGB : rgbOutputColorSpace(); Yes, r225091 left dead code which wasn't under the flag, but depended on the flag to work properly. Btw, the generic downsampling code doesn't really makes sense for JPEG, since the library support fractional M/8 scaling (which is faster than full size decoding, let alone the additional manual scaling loop here). 1565282 19 374964 fujii 2019-08-27 00:54:12 -0700 Comment on attachment 374964 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=374964&action=review > Source/WebCore/platform/ImageDecoders.cmake:71 > + set_property(SOURCE platform/image-decoders/jpeg/JPEGImageDecoder.cpp APPEND PROPERTY COMPILE_DEFINITIONS "LIBJPEG_TURBO_SUPPORTS_CONVERSIONS_FROM_RGB") Let's remove the workaround. Make it a fatal error at CMake phase by using message(FATAL_ERROR "") if you want. 1571821 20 379020 fujii 2019-09-17 22:12:28 -0700 Created attachment 379020 Patch 1571833 21 loic.yhuel 2019-09-18 00:33:12 -0700 Sorry, I forgot this patch. So, without the test, we just assume no one will really use an old libjpeg-turbo. 1571835 22 fujii 2019-09-18 00:41:11 -0700 libjpeg-turbo 1.2.1 has been released 2012-06-30. https://sourceforge.net/p/libjpeg-turbo/mailman/message/29479885/ Who does want to use very old libjpeg-turbo with very new WebKit together? 1571868 23 379020 fujii 2019-09-18 03:04:59 -0700 Comment on attachment 379020 Patch Clearing flags on attachment: 379020 Committed r250029: <https://trac.webkit.org/changeset/250029> 1571869 24 fujii 2019-09-18 03:05:03 -0700 All reviewed patches have been landed. Closing bug. 1571870 25 webkit-bug-importer 2019-09-18 03:06:17 -0700 <rdar://problem/55472267> 374964 2019-07-26 08:41:26 -0700 2019-09-17 22:12:08 -0700 Patch bug-200163-20190726174125.patch text/plain 3264 loic.yhuel U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ3ODYyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGUyMjIyMGY4NGE2NDQ0 ZWVjNmRlMWYyMTAzNWJhZTQ0ODVlODE4Mi4uNjM0YzY3ZmUyZDFmOGQwNzNjOTFlNjRhODM1N2Y3 MDViNTViMzQ2NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE5LTA3LTI2ICBMb8Ov YyBZaHVlbCAgPGxvaWMueWh1ZWxAc29mdGF0aG9tZS5jb20+CisKKyAgICAgICAgSlBFR0ltYWdl RGVjb2RlcjogdXNlIGxpYmpwZWctdHVyYm8gUkdCQSBvdXRwdXQgcGF0aCBldmVuIGZvciBBZG9i ZSB0cmFuc2Zvcm09MCBKUEVHcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjAwMTYzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc5NDU3 IGhhcyBiZWVuIGZpeGVkIGluIGxpYmpwZWctdHVyYm8gMS4yLjEuCisKKyAgICAgICAgQ292ZXJl ZCBieSBleGlzdGluZyBmYXN0L2ltYWdlcy9yZ2ItanBlZy13aXRoLWFkb2JlLW1hcmtlci1vbmx5 Lmh0bWwuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9JbWFnZURlY29kZXJzLmNtYWtlOgorICAgICAg ICAqIHBsYXRmb3JtL2ltYWdlLWRlY29kZXJzL2pwZWcvSlBFR0ltYWdlRGVjb2Rlci5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpKUEVHSW1hZ2VSZWFkZXI6OmRlY29kZSk6CisKIDIwMTktMDctMjYg IEFsZXhhbmRlciBNaWtoYXlsZW5rbyAgPGV4YWxtNzY1OUBnbWFpbC5jb20+CiAKICAgICAgICAg UkVHUkVTU0lPTihyMjQ2NDk2KTogW0dUS10gVGFwcGluZyB0aGUgd2ViIHZpZXcgc2Nyb2xscyB1 cCBhIGJpdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vSW1hZ2VEZWNvZGVy cy5jbWFrZSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0ltYWdlRGVjb2RlcnMuY21ha2UKaW5k ZXggMjBhZDU1ZjU2ZDlmYjliY2U3N2EyZTBiZjYxNTJlOWEyOGVhODU0OS4uMzBhZGJhZjkwYjAy MzhiZTdmZDJmMTAwOTJmZjIwNzg4ZWY2NDAxYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vSW1hZ2VEZWNvZGVycy5jbWFrZQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9JbWFnZURlY29kZXJzLmNtYWtlCkBAIC02MiwzICs2MiwxMyBAQCBpZiAoVVNFX0NBSVJPKQog ICAgICAgICBwbGF0Zm9ybS9pbWFnZS1kZWNvZGVycy9jYWlyby9JbWFnZUJhY2tpbmdTdG9yZUNh aXJvLmNwcAogICAgICkKIGVuZGlmICgpCisKK2lmIChFWElTVFMgIiR7SlBFR19JTkNMVURFX0RJ Un0vamNvbmZpZy5oIikKKyAgICBmaWxlKFNUUklOR1MgIiR7SlBFR19JTkNMVURFX0RJUn0vamNv bmZpZy5oIiBKUEVHX1RVUkJPX1ZFUlNJT05fTElORSBSRUdFWCAiXiNkZWZpbmVbXHQgXStMSUJK UEVHX1RVUkJPX1ZFUlNJT05bXHQgXSsuKiIpCisgICAgaWYgKEpQRUdfVFVSQk9fVkVSU0lPTl9M SU5FKQorICAgICAgICBzdHJpbmcoUkVHRVggUkVQTEFDRSAiXiNkZWZpbmVbXHQgXStMSUJKUEVH X1RVUkJPX1ZFUlNJT05bXHQgXSsoWzAtOVwuXSspLioiICJcXDEiIEpQRUdfVFVSQk9fVkVSU0lP TiAiJHtKUEVHX1RVUkJPX1ZFUlNJT05fTElORX0iKQorICAgICAgICBpZiAoSlBFR19UVVJCT19W RVJTSU9OIFZFUlNJT05fR1JFQVRFUl9FUVVBTCAxLjIuMSkKKyAgICAgICAgICAgIHNldF9wcm9w ZXJ0eShTT1VSQ0UgcGxhdGZvcm0vaW1hZ2UtZGVjb2RlcnMvanBlZy9KUEVHSW1hZ2VEZWNvZGVy LmNwcCBBUFBFTkQgUFJPUEVSVFkgQ09NUElMRV9ERUZJTklUSU9OUyAiTElCSlBFR19UVVJCT19T VVBQT1JUU19DT05WRVJTSU9OU19GUk9NX1JHQiIpCisgICAgICAgIGVuZGlmICgpCisgICAgZW5k aWYgKCkKK2VuZGlmICgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pbWFn ZS1kZWNvZGVycy9qcGVnL0pQRUdJbWFnZURlY29kZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vaW1hZ2UtZGVjb2RlcnMvanBlZy9KUEVHSW1hZ2VEZWNvZGVyLmNwcAppbmRleCBiNzJj NTVhMmNiOTA5ZmEzNDYxY2Y3OTVmMDRkY2VhZDUxMDRlOGVlLi4xYTBkZmY1OWU4MGI5OWY5YWM5 OWEyM2JiNWYzODBmMTEwMjc4OTRhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9pbWFnZS1kZWNvZGVycy9qcGVnL0pQRUdJbWFnZURlY29kZXIuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2ltYWdlLWRlY29kZXJzL2pwZWcvSlBFR0ltYWdlRGVjb2Rlci5jcHAK QEAgLTMwMCwxMSArMzAwLDExIEBAIHB1YmxpYzoKICAgICAgICAgICAgIGNhc2UgSkNTX1lDYkNy OgogICAgICAgICAgICAgICAgIC8vIGxpYmpwZWcgY2FuIGNvbnZlcnQgR1JBWVNDQUxFIGFuZCBZ Q2JDciBpbWFnZSBwaXhlbHMgdG8gUkdCLgogICAgICAgICAgICAgICAgIG1faW5mby5vdXRfY29s b3Jfc3BhY2UgPSByZ2JPdXRwdXRDb2xvclNwYWNlKCk7Ci0jaWYgZGVmaW5lZChUVVJCT19KUEVH X1JHQl9TV0laWkxFKQorI2lmIGRlZmluZWQoVFVSQk9fSlBFR19SR0JfU1dJWlpMRSkgJiYgIWRl ZmluZWQoTElCSlBFR19UVVJCT19TVVBQT1JUU19DT05WRVJTSU9OU19GUk9NX1JHQikKICAgICAg ICAgICAgICAgICBpZiAobV9pbmZvLnNhd19KRklGX21hcmtlcikKICAgICAgICAgICAgICAgICAg ICAgYnJlYWs7Ci0gICAgICAgICAgICAgICAgLy8gRklYTUU6IFN3aXp6bGUgZGVjb2RpbmcgZG9l cyBub3Qgc3VwcG9ydCBBZG9iZSB0cmFuc2Zvcm09MAotICAgICAgICAgICAgICAgIC8vIGltYWdl cyAoeWV0KSwgc28gcmV2ZXJ0IHRvIHVzaW5nIEpTQ19SR0IgaW4gdGhhdCBjYXNlLgorICAgICAg ICAgICAgICAgIC8vIFN3aXp6bGUgZGVjb2RpbmcgaXMgbm90IHN1cHBvcnRlZCB1bnRpbCBsaWJq cGVnLXR1cmJvIDEuMi4xIGZvcgorICAgICAgICAgICAgICAgIC8vIEFkb2JlIHRyYW5zZm9ybT0w IGltYWdlcywgc28gcmV2ZXJ0IHRvIHVzaW5nIEpTQ19SR0IgaW4gdGhhdCBjYXNlLgogICAgICAg ICAgICAgICAgIGlmIChtX2luZm8uc2F3X0Fkb2JlX21hcmtlciAmJiAhbV9pbmZvLkFkb2JlX3Ry YW5zZm9ybSkKICAgICAgICAgICAgICAgICAgICAgbV9pbmZvLm91dF9jb2xvcl9zcGFjZSA9IEpD U19SR0I7CiAjZW5kaWYK 379020 2019-09-17 22:12:28 -0700 2019-09-18 03:04:59 -0700 Patch bug-200163-20190918141227.patch text/plain 2788 fujii U3VidmVyc2lvbiBSZXZpc2lvbjogMjUwMDE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDEwODc3NzgyNzgwOWRl M2MyMjYxNTMzNGFkMjYxZTA2OGIwNTYxNC4uOTBiY2UwYjNlNzJkMTZmZDQ0NzA0OGZjMmMxZWMw Y2FmNTNmZTYxZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE5LTA5LTE3ICBMb8Ov YyBZaHVlbCAgPGxvaWMueWh1ZWxAc29mdGF0aG9tZS5jb20+ICBhbmQgIEZ1amlpIEhpcm9ub3Jp ICA8SGlyb25vcmkuRnVqaWlAc29ueS5jb20+CisKKyAgICAgICAgSlBFR0ltYWdlRGVjb2Rlcjog dXNlIGxpYmpwZWctdHVyYm8gUkdCQSBvdXRwdXQgcGF0aCBldmVuIGZvciBBZG9iZSB0cmFuc2Zv cm09MCBKUEVHcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MjAwMTYzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgUmVtb3ZlIHRoZSB3b3JrYXJvdW5kIGZvciBvbGQgbGlianBlZy10dXJibyB3aGljaCBkb2Vz bid0IHN1cHBvcnQKKyAgICAgICAgQkdSQSBvdXRwdXQgZm9yIEFkb2JlIHRyYW5zZm9ybT0wIGlt YWdlcy4gVGhlIGJ1ZyB3YXMgZml4ZWQgaW4KKyAgICAgICAgbGlianBlZy10dXJibyAxLjIuMS4K KworICAgICAgICBObyBuZXcgdGVzdHMsIG5vIGJlaGF2aW9yIGNoYW5nZS4KKworICAgICAgICAq IHBsYXRmb3JtL2ltYWdlLWRlY29kZXJzL2pwZWcvSlBFR0ltYWdlRGVjb2Rlci5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpKUEVHSW1hZ2VSZWFkZXI6OmRlY29kZSk6IFJlbW92ZWQgY29kZSBpbiAj aWYgZGVmaW5lZChUVVJCT19KUEVHX1JHQl9TV0laWkxFKS4KKyAgICAgICAgKGNvbG9yU3BhY2VI YXNBbHBoYSk6IFJlbW92ZWQgYW4gdW51c2VkIGlubGluZSBmdW5jdGlvbi4KKwogMjAxOS0wOS0x NyAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQs IHJldmVydCBjaGFuZ2UgdGhhdCBBbGV4IG1pc3Rha2VubHkgY29tbWl0dGVkIGF0IHRoZSBzYW1l IHRpbWUgYXMgcjI1MDAwNiBhbmQgYnJva2UgdGhlIGJ1aWxkLgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vaW1hZ2UtZGVjb2RlcnMvanBlZy9KUEVHSW1hZ2VEZWNvZGVyLmNw cCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2ltYWdlLWRlY29kZXJzL2pwZWcvSlBFR0ltYWdl RGVjb2Rlci5jcHAKaW5kZXggZjMzZjI0N2FkNzBjZDYxMDQ0YzBjNGE0MzQyMzdlNDQzMGYwMWNj NS4uNmY2Y2YwZDMzN2YzZGEzMjc5ZjI5YmRlNTUxNDBhMzY2YjMwOTM3MiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW1hZ2UtZGVjb2RlcnMvanBlZy9KUEVHSW1hZ2VEZWNv ZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pbWFnZS1kZWNvZGVycy9qcGVn L0pQRUdJbWFnZURlY29kZXIuY3BwCkBAIC01NywxMCArNTcsOCBAQCBleHRlcm4gIkMiIHsKICNk ZWZpbmUgVFVSQk9fSlBFR19SR0JfU1dJWlpMRQogaW5saW5lIEpfQ09MT1JfU1BBQ0UgcmdiT3V0 cHV0Q29sb3JTcGFjZSgpIHsgcmV0dXJuIEpDU19FWFRfQkdSQTsgfQogaW5saW5lIGJvb2wgdHVy Ym9Td2l6emxlZChKX0NPTE9SX1NQQUNFIGNvbG9yU3BhY2UpIHsgcmV0dXJuIGNvbG9yU3BhY2Ug PT0gSkNTX0VYVF9SR0JBIHx8IGNvbG9yU3BhY2UgPT0gSkNTX0VYVF9CR1JBOyB9Ci1pbmxpbmUg Ym9vbCBjb2xvclNwYWNlSGFzQWxwaGEoSl9DT0xPUl9TUEFDRSBjb2xvclNwYWNlKSB7IHJldHVy biB0dXJib1N3aXp6bGVkKGNvbG9yU3BhY2UpOyB9CiAjZWxzZQogaW5saW5lIEpfQ09MT1JfU1BB Q0UgcmdiT3V0cHV0Q29sb3JTcGFjZSgpIHsgcmV0dXJuIEpDU19SR0I7IH0KLWlubGluZSBib29s IGNvbG9yU3BhY2VIYXNBbHBoYShKX0NPTE9SX1NQQUNFKSB7IHJldHVybiBmYWxzZTsgfQogI2Vu ZGlmCiAKICNpZiBVU0UoTE9XX1FVQUxJVFlfSU1BR0VfTk9fSlBFR19ESVRIRVJJTkcpCkBAIC0z MDAsMTQgKzI5OCw2IEBAIHB1YmxpYzoKICAgICAgICAgICAgIGNhc2UgSkNTX1lDYkNyOgogICAg ICAgICAgICAgICAgIC8vIGxpYmpwZWcgY2FuIGNvbnZlcnQgR1JBWVNDQUxFIGFuZCBZQ2JDciBp bWFnZSBwaXhlbHMgdG8gUkdCLgogICAgICAgICAgICAgICAgIG1faW5mby5vdXRfY29sb3Jfc3Bh Y2UgPSByZ2JPdXRwdXRDb2xvclNwYWNlKCk7Ci0jaWYgZGVmaW5lZChUVVJCT19KUEVHX1JHQl9T V0laWkxFKQotICAgICAgICAgICAgICAgIGlmIChtX2luZm8uc2F3X0pGSUZfbWFya2VyKQotICAg ICAgICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgICAgICAgICAvLyBGSVhNRTogU3dpenps ZSBkZWNvZGluZyBkb2VzIG5vdCBzdXBwb3J0IEFkb2JlIHRyYW5zZm9ybT0wCi0gICAgICAgICAg ICAgICAgLy8gaW1hZ2VzICh5ZXQpLCBzbyByZXZlcnQgdG8gdXNpbmcgSlNDX1JHQiBpbiB0aGF0 IGNhc2UuCi0gICAgICAgICAgICAgICAgaWYgKG1faW5mby5zYXdfQWRvYmVfbWFya2VyICYmICFt X2luZm8uQWRvYmVfdHJhbnNmb3JtKQotICAgICAgICAgICAgICAgICAgICBtX2luZm8ub3V0X2Nv bG9yX3NwYWNlID0gSkNTX1JHQjsKLSNlbmRpZgogICAgICAgICAgICAgICAgIGJyZWFrOwogICAg ICAgICAgICAgY2FzZSBKQ1NfQ01ZSzoKICAgICAgICAgICAgIGNhc2UgSkNTX1lDQ0s6Cg==