From ac8b4de0c72feac45372ff13205c9ca608f392f2 Mon Sep 17 00:00:00 2001
From: "mark%moxienet.com"
 <mark%moxienet.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Fri, 11 Jan 2008 16:57:27 +0000
Subject: [PATCH] 409849 1.8 branch build for ppc with gcc 4.0 fails:
 .../nsCanvasRenderingContext2D.cpp: 1026: error: invalid conversion from
 'int' to 'CGImageAlphaInfo'.  Cast to CGImageAlphaInfo.  r=vlad a/1.8.1.12=ss

git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@242904 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/content/canvas/src/nsCanvasRenderingContext2D.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mozilla/content/canvas/src/nsCanvasRenderingContext2D.cpp b/mozilla/content/canvas/src/nsCanvasRenderingContext2D.cpp
index 6a58f9c81af..ed7d20f0cb7 100644
--- a/mozilla/content/canvas/src/nsCanvasRenderingContext2D.cpp
+++ b/mozilla/content/canvas/src/nsCanvasRenderingContext2D.cpp
@@ -1022,7 +1022,8 @@ nsCanvasRenderingContext2D::Render(nsIRenderingContext *rc)
                                                  NULL);
     CGColorSpaceRef rgb = CGColorSpaceCreateDeviceRGB();
     img = CGImageCreate (mWidth, mHeight, 8, 32, mWidth * 4, rgb,
-                         kCGImageAlphaPremultipliedFirst | CG_BITMAP_BYTE_ORDER_FLAG,
+                         (CGImageAlphaInfo)(kCGImageAlphaPremultipliedFirst |
+                                            CG_BITMAP_BYTE_ORDER_FLAG),
                          dataProvider, NULL, false, kCGRenderingIntentDefault);
     CGColorSpaceRelease (rgb);
     CGDataProviderRelease (dataProvider);