Bug 859024 - Remove the MSVC exemption for FAIL_ON_WARNINGS in content/canvas/src. r=jmuizelaar
authorMasatoshi Kimura <VYV03354@nifty.ne.jp>
Sun, 28 Apr 2013 07:10:36 +0900
changeset 130157 5597242cf58068e06fc483429faa34a94357889a
parent 130156 fc9427895561219823fe8aef2b4f2a7a16d11dcb
child 130158 cbd36f35883ca6c4f74f5b5c77b1e69b1e1fffde
push id24599
push userryanvm@gmail.com
push dateSun, 28 Apr 2013 01:24:06 +0000
treeherdermozilla-central@9d8977cbbfc6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjmuizelaar
bugs859024
milestone23.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 859024 - Remove the MSVC exemption for FAIL_ON_WARNINGS in content/canvas/src. r=jmuizelaar
content/canvas/src/Makefile.in
content/canvas/src/WebGLTexelConversions.cpp
--- a/content/canvas/src/Makefile.in
+++ b/content/canvas/src/Makefile.in
@@ -7,19 +7,17 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= gkconcvs_s
 LIBXUL_LIBRARY  = 1
-ifndef _MSC_VER
 FAIL_ON_WARNINGS = 1
-endif # !_MSC_VER
 
 CPPSRCS	= \
 	CanvasImageCache.cpp \
 	CanvasRenderingContext2D.cpp \
 	CanvasUtils.cpp \
 	DocumentRendererParent.cpp \
 	DocumentRendererChild.cpp \
 	ImageData.cpp \
--- a/content/canvas/src/WebGLTexelConversions.cpp
+++ b/content/canvas/src/WebGLTexelConversions.cpp
@@ -354,17 +354,17 @@ WebGLContext::ConvertImage(size_t width,
         }
         return;
     }
 
     uint8_t* dstStart = dst;
     ptrdiff_t signedDstStride = dstStride;
     if (mPixelStoreFlipY) {
         dstStart = dst + (height - 1) * dstStride;
-        signedDstStride = -dstStride;
+        signedDstStride = -signedDstStride;
     }
 
     WebGLImageConverter converter(width, height, src, dstStart, srcStride, signedDstStride);
 
     const WebGLTexelPremultiplicationOp premultiplicationOp
         = FormatsRequireNoPremultiplicationOp     ? NoPremultiplicationOp
         : (!srcPremultiplied && dstPremultiplied) ? Premultiply
         : (srcPremultiplied && !dstPremultiplied) ? Unpremultiply