The Tor Browser / file diff

     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/gfx/ycbcr/QuellGccWarnings.patch	Wed Dec 31 06:09:35 2014 +0100
     1.3 @@ -0,0 +1,40 @@
     1.4 +diff --git a/gfx/ycbcr/yuv_convert.cpp b/gfx/ycbcr/yuv_convert.cpp
     1.5 +--- a/gfx/ycbcr/yuv_convert.cpp
     1.6 ++++ b/gfx/ycbcr/yuv_convert.cpp
     1.7 +@@ -337,16 +337,17 @@ NS_GFX_(void) ScaleYCbCrToRGB32(const ui
     1.8 +                                          source_dx_uv >> kFractionBits);
     1.9 +         }
    1.10 +       }
    1.11 +       else {
    1.12 +         ScaleYUVToRGB32Row_C(y_ptr, u_ptr, v_ptr,
    1.13 +                              dest_pixel, width, source_dx);
    1.14 +       }
    1.15 + #else
    1.16 ++      (void)source_dx_uv;
    1.17 +       ScaleYUVToRGB32Row(y_ptr, u_ptr, v_ptr,
    1.18 +                          dest_pixel, width, source_dx);
    1.19 + #endif
    1.20 +     }
    1.21 +   }
    1.22 +   // MMX used for FastConvertYUVToRGB32Row and FilterRows requires emms.
    1.23 +   if (has_mmx)
    1.24 +     EMMS();
    1.25 +diff --git a/gfx/ycbcr/yuv_row.h b/gfx/ycbcr/yuv_row.h
    1.26 +--- a/gfx/ycbcr/yuv_row.h
    1.27 ++++ b/gfx/ycbcr/yuv_row.h
    1.28 +@@ -129,14 +129,14 @@ extern SIMD_ALIGNED(int16 kCoefficientsR
    1.29 + #if defined(ARCH_CPU_X86) && !defined(ARCH_CPU_X86_64)
    1.30 + #if defined(_MSC_VER)
    1.31 + #define EMMS() __asm emms
    1.32 + #pragma warning(disable: 4799)
    1.33 + #else
    1.34 + #define EMMS() asm("emms")
    1.35 + #endif
    1.36 + #else
    1.37 +-#define EMMS()
    1.38 ++#define EMMS() ((void)0)
    1.39 + #endif
    1.40 + 
    1.41 + }  // extern "C"
    1.42 + 
    1.43 + #endif  // MEDIA_BASE_YUV_ROW_H_