765038 - The fix for bug 761890 broke clang builds in gfx/skia/src/sfnt/SkOTTable_head.h

Status: RESOLVED FIXED

(Core :: Graphics, defect)

Description

[Jonathan Watt [:jwatt]]

gfx/skia/src/sfnt/SkOTTable_head.h:117:76: error: non-type template argument evaluates to -1, which cannot be narrowed to type 'uint16_t' (aka 'unsigned short')
      [-Wc++11-narrowing]
SkPathEffect.cpp
            ((OnlyStronglyRTL, static_cast<SK_OT_SHORT>(SkTEndian_SwapBE16(-1))))
gfx/skia/src/sfnt/SkOTTable_head.h:118:72: error: non-type template argument evaluates to -2, which cannot be narrowed to type 'uint16_t' (aka 'unsigned short')
      [-Wc++11-narrowing]
            ((StronglyRTL, static_cast<SK_OT_SHORT>(SkTEndian_SwapBE16(-2))))

Comment 1

[Daniel Holbert [:dholbert]]

Additional context (via IRC):
jwatt hit this while doing a local clobber build of mozilla-inbound, on Mac OS X, using clang.

Comment 2

[Nick Cameron [:nrc]]

Attachment: patch

builds with Visual Studio, hope this fixes the Clang issue

Comment 3

[Nick Cameron [:nrc]]

Disclaimer: I'm pretty sure this is innocuous, but I haven't tried any testing at all.

Comment 4

[Jonathan Watt [:jwatt]]

Comment on attachment 633401 [details] [diff] [review]
patch

Looks fine to me.

I filed an upstream bug on this too, noting your patch here:

http://code.google.com/p/skia/issues/detail?id=649

Comment 5

[Jonathan Watt [:jwatt]]

Seems to work fine too.

I pushed this to m-i:

https://hg.mozilla.org/integration/mozilla-inbound/rev/3ec9d53ce65c

Thanks, nrc!

Comment 6

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/3ec9d53ce65c