Bustage fix for non-libxul windows builds from bug 551277. Wrap the return value for the implementation in NS_GFX_ as well. a=bustage-fix,tree quiet
authorMark Banner <bugzilla@standard8.plus.com>
Fri, 23 Apr 2010 08:47:54 +0100
changeset 41195 fe937d72a9cea4ca9d1cf85230989dc109d6bc36
parent 41194 92bf83a7f317bdb578bcfe2cedf86829259a38d8
child 41196 f8825507a4925d572e3a495441e43201dc89b6b0
push idunknown
push userunknown
push dateunknown
reviewersbustage-fix, tree
bugs551277
milestone1.9.3a5pre
first release with
nightly linux32
fe937d72a9ce / 3.7a5pre / 20100423030227 / files
nightly linux64
fe937d72a9ce / 3.7a5pre / 20100423030644 / files
nightly mac
fe937d72a9ce / 3.7a5pre / 20100423030621 / files
nightly win32
fe937d72a9ce / 3.7a5pre / 20100423040128 / files
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
Bustage fix for non-libxul windows builds from bug 551277. Wrap the return value for the implementation in NS_GFX_ as well. a=bustage-fix,tree quiet
gfx/ycbcr/yuv_convert.cpp
--- a/gfx/ycbcr/yuv_convert.cpp
+++ b/gfx/ycbcr/yuv_convert.cpp
@@ -22,28 +22,28 @@
 #include "yuv_row.h"
 #include "mozilla/SSE.h"
 
 namespace mozilla {
 
 namespace gfx {
 
 // Convert a frame of YUV to 32 bit ARGB.
-void ConvertYCbCrToRGB32(const uint8* y_buf,
-                         const uint8* u_buf,
-                         const uint8* v_buf,
-                         uint8* rgb_buf,
-                         int pic_x,
-                         int pic_y,
-                         int pic_width,
-                         int pic_height,
-                         int y_pitch,
-                         int uv_pitch,
-                         int rgb_pitch,
-                         YUVType yuv_type) {
+NS_GFX_(void) ConvertYCbCrToRGB32(const uint8* y_buf,
+                                  const uint8* u_buf,
+                                  const uint8* v_buf,
+                                  uint8* rgb_buf,
+                                  int pic_x,
+                                  int pic_y,
+                                  int pic_width,
+                                  int pic_height,
+                                  int y_pitch,
+                                  int uv_pitch,
+                                  int rgb_pitch,
+                                  YUVType yuv_type) {
   unsigned int y_shift = yuv_type == YV12 ? 1 : 0;
   unsigned int x_shift = yuv_type == YV24 ? 0 : 1;
   // There is no optimized YV24 MMX routine so we check for this and
   // fall back to the C code.
   bool has_mmx = supports_mmx() && yuv_type != YV24;
   bool odd_pic_x = yuv_type != YV24 && pic_x % 2 != 0;
   int x_width = odd_pic_x ? pic_width - 1 : pic_width;