118249 2013-07-01 08:35:28 -0700 Fix cast-align warnings in WebCore/platform/graphics/texmap/TextureMapperGL.cpp 2013-07-02 04:19:54 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ossy ossy allan.jensen cmarcelo commit-queue luiz noam ossy oldest_to_newest 905036 0 ossy 2013-07-01 08:35:28 -0700 /home/oszi/WebKit/Source/WebCore/platform/graphics/texmap/TextureMapperGL.cpp:894:59: warning: cast from 'char*' to 'uint32_t* {aka unsigned int*}' increases required alignment of target type [-Wcast-align] void BitmapTextureGL::updateContents(const void* srcData, const IntRect& targetRect, const IntPoint& sourceOffset, int bytesPerLine, UpdateContentsFlag updateContentsFlag) { .... char* data = reinterpret_cast<char*>(const_cast<void*>(srcData)); ... swizzleBGRAToRGBA(reinterpret_cast<uint32_t*>(data), IntRect(adjustedSourceOffset, targetRect.size()), bytesPerLine / bytesPerPixel); < ---- line 894 ... } ... void BitmapTextureGL::updateContents(Image* image, const IntRect& targetRect, const IntPoint& offset, UpdateContentsFlag updateContentsFlag) { if (!image) return; NativeImagePtr frameImage = image->nativeImageForCurrentFrame(); if (!frameImage) return; int bytesPerLine; const char* imageData; #if PLATFORM(QT) QImage qImage = frameImage->toImage(); imageData = reinterpret_cast<const char*>(qImage.constBits()); bytesPerLine = qImage.bytesPerLine(); #elif USE(CAIRO) cairo_surface_t* surface = frameImage.get(); imageData = reinterpret_cast<const char*>(cairo_image_surface_get_data(surface)); bytesPerLine = cairo_image_surface_get_stride(surface); #endif updateContents(imageData, targetRect, offset, bytesPerLine, updateContentsFlag); < ------ call! } ... The problematic data is come from cairo_image_surface_get_data(surface) or qImage.constBits(). Both of them contains BGRA data, so I think we can assume that they are 32 bit aligned. 905037 1 205813 ossy 2013-07-01 08:38:30 -0700 Created attachment 205813 Patch 905295 2 ossy 2013-07-02 02:13:29 -0700 ping for Qt and Cairo review. 905323 3 205813 ossy 2013-07-02 04:19:48 -0700 Comment on attachment 205813 Patch Clearing flags on attachment: 205813 Committed r152283: <http://trac.webkit.org/changeset/152283> 905324 4 ossy 2013-07-02 04:19:54 -0700 All reviewed patches have been landed. Closing bug. 205813 2013-07-01 08:38:30 -0700 2013-07-02 04:19:48 -0700 Patch bug-118249-20130701083630.patch text/plain 1739 ossy U3VidmVyc2lvbiBSZXZpc2lvbjogMTUyMjI0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzY2YTFmOTE1Nzc4ZThl YmMwYzY0YjkxZTA3NTIyM2U0YzgyMzFmOS4uM2ZlMjk2MGE0MTJhNGZlM2YyZWE4OGJlZWVmYTI4 NDE5M2QzMmU2NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDEzLTA3LTAxICBDc2Fi YSBPc3p0cm9nb27DoWMgIDxvc3N5QHdlYmtpdC5vcmc+CisKKyAgICAgICAgRml4IGNhc3QtYWxp Z24gd2FybmluZ3MgaW4gV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1h cHBlckdMLmNwcAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTE4MjQ5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgKiBwbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlckdMLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OkJpdG1hcFRleHR1cmVHTDo6dXBkYXRlQ29udGVudHMpOgorCiAyMDEzLTA3 LTAxICBBbGxhbiBTYW5kZmVsZCBKZW5zZW4gIDxhbGxhbi5qZW5zZW5AZGlnaWEuY29tPgogCiAg ICAgICAgIFtRdF0gQXZvaWQgY3JlYXRpbmcgYSBRV2luZG93IGZvciBvZmZzY3JlZW4gR3JhcGhp Y3NDb250ZXh0M0QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L3RleG1hcC9UZXh0dXJlTWFwcGVyR0wuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJHTC5jcHAKaW5kZXggMWM0NzcwZGQxMmUzYzY5NGRm MzU1Nzg4MzY0YjE3NmRkMzQ3ZWZmMC4uNTVjMGI2YWNhNTg2ZjRjZmVhYTBkMmRjNDgzMTM3OWQw Y2I1YTAyZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4 bWFwL1RleHR1cmVNYXBwZXJHTC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJHTC5jcHAKQEAgLTg5MSw3ICs4OTEsNyBAQCB2b2lk IEJpdG1hcFRleHR1cmVHTDo6dXBkYXRlQ29udGVudHMoY29uc3Qgdm9pZCogc3JjRGF0YSwgY29u c3QgSW50UmVjdCYgdGFyZ2V0UgogICAgIGlmIChkcml2ZXJTdXBwb3J0c0V4dGVybmFsVGV4dHVy ZUJHUkEobV9jb250ZXh0M0QuZ2V0KCkpKQogICAgICAgICBnbEZvcm1hdCA9IEdyYXBoaWNzQ29u dGV4dDNEOjpCR1JBOwogICAgIGVsc2UKLSAgICAgICAgc3dpenpsZUJHUkFUb1JHQkEocmVpbnRl cnByZXRfY2FzdDx1aW50MzJfdCo+KGRhdGEpLCBJbnRSZWN0KGFkanVzdGVkU291cmNlT2Zmc2V0 LCB0YXJnZXRSZWN0LnNpemUoKSksIGJ5dGVzUGVyTGluZSAvIGJ5dGVzUGVyUGl4ZWwpOworICAg ICAgICBzd2l6emxlQkdSQVRvUkdCQShyZWludGVycHJldF9jYXN0X3B0cjx1aW50MzJfdCo+KGRh dGEpLCBJbnRSZWN0KGFkanVzdGVkU291cmNlT2Zmc2V0LCB0YXJnZXRSZWN0LnNpemUoKSksIGJ5 dGVzUGVyTGluZSAvIGJ5dGVzUGVyUGl4ZWwpOwogCiAgICAgdXBkYXRlQ29udGVudHNOb1N3aXp6 bGUoZGF0YSwgdGFyZ2V0UmVjdCwgYWRqdXN0ZWRTb3VyY2VPZmZzZXQsIGJ5dGVzUGVyTGluZSwg Ynl0ZXNQZXJQaXhlbCwgZ2xGb3JtYXQpOwogfQo=