55996 2011-03-09 00:14:23 -0800 Some Gtk code uses defined(USE_FREETYPE) instead of just USE(FREETYPE) 2011-03-10 12:33:33 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 eric webkit-unassigned alex mrobinson xan.lopez oldest_to_newest 364346 0 eric 2011-03-09 00:14:23 -0800 Some Gtk code uses defined(USE_FREETYPE) instead of just USE(FREETYPE) platform/graphics/cairo/OwnPtrCairo.cpp:#if defined(USE_FREETYPE) platform/graphics/cairo/OwnPtrCairo.cpp:#if defined(USE_FREETYPE) platform/graphics/cairo/OwnPtrCairo.h:#if defined(USE_FREETYPE) platform/graphics/cairo/OwnPtrCairo.h:#if defined(USE_FREETYPE) platform/graphics/cairo/RefPtrCairo.cpp:#if defined(USE_FREETYPE) platform/graphics/cairo/RefPtrCairo.cpp:#if defined(USE_FREETYPE) platform/graphics/cairo/RefPtrCairo.h:#if defined(USE_FREETYPE) platform/graphics/cairo/RefPtrCairo.h:#if defined(USE_FREETYPE) platform/graphics/gtk/FontGtk.cpp:#if defined(USE_FREETYPE) platform/graphics/gtk/FontGtk.cpp:#if defined(USE_FREETYPE) platform/graphics/gtk/FontGtk.cpp:#if defined(USE_FREETYPE) platform/graphics/gtk/FontGtk.cpp:#if defined(USE_FREETYPE) platform/graphics/gtk/FontGtk.cpp:#if defined(USE_FREETYPE) platform/graphics/gtk/FontGtk.cpp:#if defined(USE_FREETYPE) Seems like a typo/misunderstanding? 364354 1 eric 2011-03-09 00:40:32 -0800 Actually, that would fail due to USE(FOO) assumes WTF_USE_FOO. I wonder where we're getting USE_FREETYPE from. 365394 2 alex 2011-03-10 11:58:47 -0800 (In reply to comment #1) > Actually, that would fail due to USE(FOO) assumes WTF_USE_FOO. I wonder where we're getting USE_FREETYPE from. It is defined in the Source/WebCore/GNUmakefile.am: if USE_FREETYPE webcoregtk_cppflags += \ -DUSE_FREETYPE=1 \ -I$(srcdir)/Source/WebCore/platform/graphics/freetype ... I think it is just an oversight, I would say we should use the macro USE. 365414 3 85368 alex 2011-03-10 12:18:38 -0800 Created attachment 85368 Proposed patch I've added also the USE_PANGO define to the patch. 365423 4 85368 mrobinson 2011-03-10 12:28:41 -0800 Comment on attachment 85368 Proposed patch Great. Thanks for the cleanup. 365428 5 85368 alex 2011-03-10 12:33:13 -0800 Comment on attachment 85368 Proposed patch Clearing flags on attachment: 85368 Committed r80744: <http://trac.webkit.org/changeset/80744> 365429 6 alex 2011-03-10 12:33:33 -0800 All reviewed patches have been landed. Closing bug. 85368 2011-03-10 12:18:38 -0800 2011-03-10 12:33:13 -0800 Proposed patch wtuse.patch text/plain 7454 alex ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBjYWEyMWQ3Li4zMWU0YTAxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUg QEAKKzIwMTEtMDMtMTAgIEFsZWphbmRybyBHLiBDYXN0cm8gIDxhbGV4QGlnYWxpYS5jb20+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU29tZSBHdGsg Y29kZSB1c2VzIGRlZmluZWQoVVNFX0ZSRUVUWVBFKSBpbnN0ZWFkIG9mIGp1c3QgVVNFKEZSRUVU WVBFKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTU5 OTYKKworICAgICAgICBVc2UgdGhlIG1hY3JlIFVTRSBpbnN0ZWFkIG9mIGRlZmluZWQgZnJvIFdU Rl9VU0VfRlJFRVRZUEUgYW5kCisgICAgICAgIFdURl9VU0VfUEFOR08uCisKKyAgICAgICAgKiBH TlVtYWtlZmlsZS5hbToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9Pd25QdHJD YWlyby5jcHA6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vT3duUHRyQ2Fpcm8u aDoKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9SZWZQdHJDYWlyby5jcHA6Cisg ICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vUmVmUHRyQ2Fpcm8uaDoKKyAgICAgICAg KiBwbGF0Zm9ybS9ncmFwaGljcy9ndGsvRm9udEd0ay5jcHA6CisgICAgICAgIChXZWJDb3JlOjpz ZXRQYW5nb0F0dHJpYnV0ZXMpOgorICAgICAgICAoV2ViQ29yZTo6Rm9udDo6ZHJhd0NvbXBsZXhU ZXh0KToKKyAgICAgICAgKFdlYkNvcmU6OkZvbnQ6OmZsb2F0V2lkdGhGb3JDb21wbGV4VGV4dCk6 CisgICAgICAgIChXZWJDb3JlOjpGb250OjpvZmZzZXRGb3JQb3NpdGlvbkZvckNvbXBsZXhUZXh0 KToKKyAgICAgICAgKFdlYkNvcmU6OkZvbnQ6OnNlbGVjdGlvblJlY3RGb3JDb21wbGV4VGV4dCk6 CisKIDIwMTEtMDMtMTAgIFNoZXJpZmYgQm90ICA8d2Via2l0LnJldmlldy5ib3RAZ21haWwuY29t PgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHI4MDcwMS4KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL0dOVW1ha2VmaWxlLmFtIGIvU291cmNlL1dlYkNvcmUvR05VbWFrZWZp bGUuYW0KaW5kZXggNWU4MWRmYS4uYmFjMDk0NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv R05VbWFrZWZpbGUuYW0KKysrIGIvU291cmNlL1dlYkNvcmUvR05VbWFrZWZpbGUuYW0KQEAgLTM5 MDIsNyArMzkwMiw3IEBAIGVuZGlmICMgRU5EIEVOQUJMRV9GQVNUX01PQklMRV9TQ1JPTExJTkcK ICMgLS0tCiBpZiBVU0VfRlJFRVRZUEUKIHdlYmNvcmVndGtfY3BwZmxhZ3MgKz0gXAotCS1EVVNF X0ZSRUVUWVBFPTEgXAorCS1EV1RGX1VTRV9GUkVFVFlQRT0xIFwKIAktSSQoc3JjZGlyKS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9mcmVldHlwZQogCiB3ZWJjb3JlZ3RrX3NvdXJj ZXMgKz0gXApAQCAtMzkxOSw3ICszOTE5LDcgQEAgZW5kaWYgIyBFTkQgVVNFX0ZSRUVUWVBFCiAj IC0tLQogaWYgVVNFX1BBTkdPCiB3ZWJjb3JlZ3RrX2NwcGZsYWdzICs9IFwKLQktRFVTRV9QQU5H Tz0xIFwKKwktRFdURl9VU0VfUEFOR089MSBcCiAJLUkkKHNyY2RpcikvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvcGFuZ28KIAogd2ViY29yZWd0a19zb3VyY2VzICs9IFwKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL093blB0ckNhaXJv LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL093blB0ckNhaXJv LmNwcAppbmRleCA5NGY2ODA5Li4xNTk0ZTdiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9jYWlyby9Pd25QdHJDYWlyby5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vT3duUHRyQ2Fpcm8uY3BwCkBAIC0yMCw3ICsyMCw3 IEBACiAjaW5jbHVkZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAiT3duUHRyQ2Fpcm8uaCIKIAotI2lm IGRlZmluZWQoVVNFX0ZSRUVUWVBFKQorI2lmIFVTRShGUkVFVFlQRSkKICNpbmNsdWRlIDxjYWly by1mdC5oPgogI2luY2x1ZGUgPGZvbnRjb25maWcvZmNmcmVldHlwZS5oPgogI2VuZGlmCkBAIC0y OSw3ICsyOSw3IEBACiAKIG5hbWVzcGFjZSBXVEYgewogCi0jaWYgZGVmaW5lZChVU0VfRlJFRVRZ UEUpCisjaWYgVVNFKEZSRUVUWVBFKQogdGVtcGxhdGUgPD4gdm9pZCBkZWxldGVPd25lZFB0cjxG Y09iamVjdFNldD4oRmNPYmplY3RTZXQqIHB0cikKIHsKICAgICBpZiAocHRyKQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vT3duUHRyQ2Fpcm8uaCBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL093blB0ckNhaXJvLmgKaW5k ZXggMDM1ZDgwZS4uZTFkZDM3MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvY2Fpcm8vT3duUHRyQ2Fpcm8uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9jYWlyby9Pd25QdHJDYWlyby5oCkBAIC0yMiw3ICsyMiw3IEBACiAKICNpbmNs dWRlICJPd25QdHIuaCIKIAotI2lmIGRlZmluZWQoVVNFX0ZSRUVUWVBFKQorI2lmIFVTRShGUkVF VFlQRSkKIHR5cGVkZWYgc3RydWN0IF9GY09iamVjdFNldCBGY09iamVjdFNldDsKIHR5cGVkZWYg c3RydWN0IF9GY0ZvbnRTZXQgRmNGb250U2V0OwogI2VuZGlmCkBAIC0zMSw3ICszMSw3IEBAIHR5 cGVkZWYgc3RydWN0IGNhaXJvX3BhdGggY2Fpcm9fcGF0aF90OwogCiBuYW1lc3BhY2UgV1RGIHsK IAotI2lmIGRlZmluZWQoVVNFX0ZSRUVUWVBFKQorI2lmIFVTRShGUkVFVFlQRSkKIHRlbXBsYXRl IDw+IHZvaWQgZGVsZXRlT3duZWRQdHI8RmNPYmplY3RTZXQ+KEZjT2JqZWN0U2V0Kik7CiB0ZW1w bGF0ZSA8PiB2b2lkIGRlbGV0ZU93bmVkUHRyPEZjRm9udFNldD4oRmNGb250U2V0Kik7CiAjZW5k aWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL1Jl ZlB0ckNhaXJvLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL1Jl ZlB0ckNhaXJvLmNwcAppbmRleCBjOGIyNDJjLi4xNzkyMDAyIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9SZWZQdHJDYWlyby5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vUmVmUHRyQ2Fpcm8uY3BwCkBAIC0y MSw3ICsyMSw3IEBACiAKICNpbmNsdWRlIDxjYWlyby5oPgogCi0jaWYgZGVmaW5lZChVU0VfRlJF RVRZUEUpCisjaWYgVVNFKEZSRUVUWVBFKQogI2luY2x1ZGUgPGNhaXJvLWZ0Lmg+CiAjaW5jbHVk ZSA8Zm9udGNvbmZpZy9mY2ZyZWV0eXBlLmg+CiAjZW5kaWYKQEAgLTg4LDcgKzg4LDcgQEAgdGVt cGxhdGU8PiB2b2lkIGRlcmVmSWZOb3ROdWxsKGNhaXJvX3BhdHRlcm5fdCogcHRyKQogICAgICAg ICBjYWlyb19wYXR0ZXJuX2Rlc3Ryb3kocHRyKTsKIH0KIAotI2lmIGRlZmluZWQoVVNFX0ZSRUVU WVBFKQorI2lmIFVTRShGUkVFVFlQRSkKIHRlbXBsYXRlPD4gdm9pZCByZWZJZk5vdE51bGwoRmNQ YXR0ZXJuKiBwdHIpCiB7CiAgICAgaWYgKExJS0VMWShwdHIgIT0gMCkpCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9SZWZQdHJDYWlyby5oIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vUmVmUHRyQ2Fpcm8uaAppbmRleCAy MDRkMWUzLi41NDBmOWRjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9jYWlyby9SZWZQdHJDYWlyby5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2NhaXJvL1JlZlB0ckNhaXJvLmgKQEAgLTI4LDcgKzI4LDcgQEAgdHlwZWRlZiBzdHJ1 Y3QgX2NhaXJvX2ZvbnRfZmFjZSBjYWlyb19mb250X2ZhY2VfdDsKIHR5cGVkZWYgc3RydWN0IF9j YWlyb19zY2FsZWRfZm9udCBjYWlyb19zY2FsZWRfZm9udF90OwogdHlwZWRlZiBzdHJ1Y3QgX2Nh aXJvX3BhdHRlcm4gY2Fpcm9fcGF0dGVybl90OwogCi0jaWYgZGVmaW5lZChVU0VfRlJFRVRZUEUp CisjaWYgVVNFKEZSRUVUWVBFKQogdHlwZWRlZiBzdHJ1Y3QgX0ZjUGF0dGVybiBGY1BhdHRlcm47 CiAjZW5kaWYKIApAQCAtNDksNyArNDksNyBAQCB0ZW1wbGF0ZTw+IHZvaWQgZGVyZWZJZk5vdE51 bGwoY2Fpcm9fc2NhbGVkX2ZvbnRfdCogcHRyKTsKIHRlbXBsYXRlPD4gdm9pZCByZWZJZk5vdE51 bGwoY2Fpcm9fcGF0dGVybl90Kik7CiB0ZW1wbGF0ZTw+IHZvaWQgZGVyZWZJZk5vdE51bGwoY2Fp cm9fcGF0dGVybl90Kik7CiAKLSNpZiBkZWZpbmVkKFVTRV9GUkVFVFlQRSkKKyNpZiBVU0UoRlJF RVRZUEUpCiB0ZW1wbGF0ZTw+IHZvaWQgcmVmSWZOb3ROdWxsKEZjUGF0dGVybiogcHRyKTsKIHRl bXBsYXRlPD4gdm9pZCBkZXJlZklmTm90TnVsbChGY1BhdHRlcm4qIHB0cik7CiAjZW5kaWYKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2d0ay9Gb250R3RrLmNw cCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2d0ay9Gb250R3RrLmNwcAppbmRl eCAyMTZmYjU2Li42NTRhZGFjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9ndGsvRm9udEd0ay5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvZ3RrL0ZvbnRHdGsuY3BwCkBAIC00NCw3ICs0NCw3IEBACiAjaW5jbHVkZSA8cGFuZ28v cGFuZ28uaD4KICNpbmNsdWRlIDxwYW5nby9wYW5nb2NhaXJvLmg+CiAKLSNpZiBkZWZpbmVkKFVT RV9GUkVFVFlQRSkKKyNpZiBVU0UoRlJFRVRZUEUpCiAjaW5jbHVkZSA8cGFuZ28vcGFuZ29mYy1m b250bWFwLmg+CiAjZW5kaWYKIApAQCAtMTcxLDEzICsxNzEsMTMgQEAgc3RhdGljIGdjaGFyKiBj b252ZXJ0VW5pQ2hhclRvVVRGOChjb25zdCBVQ2hhciogY2hhcmFjdGVycywgZ2ludCBsZW5ndGgs IGludCBmcm8KIAogc3RhdGljIHZvaWQgc2V0UGFuZ29BdHRyaWJ1dGVzKGNvbnN0IEZvbnQqIGZv bnQsIGNvbnN0IFRleHRSdW4mIHJ1biwgUGFuZ29MYXlvdXQqIGxheW91dCkKIHsKLSNpZiBkZWZp bmVkKFVTRV9GUkVFVFlQRSkKKyNpZiBVU0UoRlJFRVRZUEUpCiAgICAgaWYgKGZvbnQtPnByaW1h cnlGb250KCktPnBsYXRmb3JtRGF0YSgpLm1fcGF0dGVybikgewogICAgICAgICBQYW5nb0ZvbnRE ZXNjcmlwdGlvbiogZGVzYyA9IHBhbmdvX2ZjX2ZvbnRfZGVzY3JpcHRpb25fZnJvbV9wYXR0ZXJu KGZvbnQtPnByaW1hcnlGb250KCktPnBsYXRmb3JtRGF0YSgpLm1fcGF0dGVybi5nZXQoKSwgRkFM U0UpOwogICAgICAgICBwYW5nb19sYXlvdXRfc2V0X2ZvbnRfZGVzY3JpcHRpb24obGF5b3V0LCBk ZXNjKTsKICAgICAgICAgcGFuZ29fZm9udF9kZXNjcmlwdGlvbl9mcmVlKGRlc2MpOwogICAgIH0K LSNlbGlmIGRlZmluZWQoVVNFX1BBTkdPKQorI2VsaWYgVVNFKFBBTkdPKQogICAgIGlmIChmb250 LT5wcmltYXJ5Rm9udCgpLT5wbGF0Zm9ybURhdGEoKS5tX2ZvbnQpIHsKICAgICAgICAgUGFuZ29G b250RGVzY3JpcHRpb24qIGRlc2MgPSBwYW5nb19mb250X2Rlc2NyaWJlKGZvbnQtPnByaW1hcnlG b250KCktPnBsYXRmb3JtRGF0YSgpLm1fZm9udCk7CiAgICAgICAgIHBhbmdvX2xheW91dF9zZXRf Zm9udF9kZXNjcmlwdGlvbihsYXlvdXQsIGRlc2MpOwpAQCAtMjY4LDcgKzI2OCw3IEBAIHN0YXRp YyB2b2lkIGRyYXdHbHlwaHNTaGFkb3coR3JhcGhpY3NDb250ZXh0KiBncmFwaGljc0NvbnRleHQs IGNhaXJvX3QqIGNvbnRleHQsCiAKIHZvaWQgRm9udDo6ZHJhd0NvbXBsZXhUZXh0KEdyYXBoaWNz Q29udGV4dCogY29udGV4dCwgY29uc3QgVGV4dFJ1biYgcnVuLCBjb25zdCBGbG9hdFBvaW50JiBw b2ludCwgaW50IGZyb20sIGludCB0bykgY29uc3QKIHsKLSNpZiBkZWZpbmVkKFVTRV9GUkVFVFlQ RSkKKyNpZiBVU0UoRlJFRVRZUEUpCiAgICAgaWYgKCFwcmltYXJ5Rm9udCgpLT5wbGF0Zm9ybURh dGEoKS5tX3BhdHRlcm4pIHsKICAgICAgICAgZHJhd1NpbXBsZVRleHQoY29udGV4dCwgcnVuLCBw b2ludCwgZnJvbSwgdG8pOwogICAgICAgICByZXR1cm47CkBAIC0zNDgsNyArMzQ4LDcgQEAgc3Rh dGljIFBhbmdvTGF5b3V0KiBnZXREZWZhdWx0UGFuZ29MYXlvdXQoY29uc3QgVGV4dFJ1biYgcnVu KQogCiBmbG9hdCBGb250OjpmbG9hdFdpZHRoRm9yQ29tcGxleFRleHQoY29uc3QgVGV4dFJ1biYg cnVuLCBIYXNoU2V0PGNvbnN0IFNpbXBsZUZvbnREYXRhKj4qIGZhbGxiYWNrRm9udHMsIEdseXBo T3ZlcmZsb3cqIG92ZXJmbG93KSBjb25zdAogewotI2lmIGRlZmluZWQoVVNFX0ZSRUVUWVBFKQor I2lmIFVTRShGUkVFVFlQRSkKICAgICBpZiAoIXByaW1hcnlGb250KCktPnBsYXRmb3JtRGF0YSgp Lm1fcGF0dGVybikKICAgICAgICAgcmV0dXJuIGZsb2F0V2lkdGhGb3JTaW1wbGVUZXh0KHJ1biwg MCwgZmFsbGJhY2tGb250cywgb3ZlcmZsb3cpOwogI2VuZGlmCkBAIC0zNzMsNyArMzczLDcgQEAg ZmxvYXQgRm9udDo6ZmxvYXRXaWR0aEZvckNvbXBsZXhUZXh0KGNvbnN0IFRleHRSdW4mIHJ1biwg SGFzaFNldDxjb25zdCBTaW1wbGVGb24KIAogaW50IEZvbnQ6Om9mZnNldEZvclBvc2l0aW9uRm9y Q29tcGxleFRleHQoY29uc3QgVGV4dFJ1biYgcnVuLCBmbG9hdCB4RmxvYXQsIGJvb2wgaW5jbHVk ZVBhcnRpYWxHbHlwaHMpIGNvbnN0CiB7Ci0jaWYgZGVmaW5lZChVU0VfRlJFRVRZUEUpCisjaWYg VVNFKEZSRUVUWVBFKQogICAgIGlmICghcHJpbWFyeUZvbnQoKS0+cGxhdGZvcm1EYXRhKCkubV9w YXR0ZXJuKQogICAgICAgICByZXR1cm4gb2Zmc2V0Rm9yUG9zaXRpb25Gb3JTaW1wbGVUZXh0KHJ1 biwgeEZsb2F0LCBpbmNsdWRlUGFydGlhbEdseXBocyk7CiAjZW5kaWYKQEAgLTQwMSw3ICs0MDEs NyBAQCBpbnQgRm9udDo6b2Zmc2V0Rm9yUG9zaXRpb25Gb3JDb21wbGV4VGV4dChjb25zdCBUZXh0 UnVuJiBydW4sIGZsb2F0IHhGbG9hdCwgYm9vbAogCiBGbG9hdFJlY3QgRm9udDo6c2VsZWN0aW9u UmVjdEZvckNvbXBsZXhUZXh0KGNvbnN0IFRleHRSdW4mIHJ1biwgY29uc3QgRmxvYXRQb2ludCYg cG9pbnQsIGludCBoLCBpbnQgZnJvbSwgaW50IHRvKSBjb25zdAogewotI2lmIGRlZmluZWQoVVNF X0ZSRUVUWVBFKQorI2lmIFVTRShGUkVFVFlQRSkKICAgICBpZiAoIXByaW1hcnlGb250KCktPnBs YXRmb3JtRGF0YSgpLm1fcGF0dGVybikKICAgICAgICAgcmV0dXJuIHNlbGVjdGlvblJlY3RGb3JT aW1wbGVUZXh0KHJ1biwgcG9pbnQsIGgsIGZyb20sIHRvKTsKICNlbmRpZgo=