Build fixes for ppc64 and x86_64, and fixes needed now that we use -Wshorten-64-to-32.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@16158 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/kcanvas/device/quartz/filters/WKDiscreteTransferFilter.m b/WebCore/kcanvas/device/quartz/filters/WKDiscreteTransferFilter.m
index c963709d4b28602f3915f487f34d14e8a83a1c98..cab018aeb53acfac6e8aefabd2f2e8b52d321a4c 100644 (file)
--- a/WebCore/kcanvas/device/quartz/filters/WKDiscreteTransferFilter.m
+++ b/WebCore/kcanvas/device/quartz/filters/WKDiscreteTransferFilter.m
@@ -61,7 +61,7 @@ static CIKernel *discreteTransferFilter = nil;
     CISampler *inputSampler = [CISampler samplerWithImage: inputImage];
     CISampler *tableSampler = [CISampler samplerWithImage: inputTable keysAndValues:kCISamplerFilterMode, kCISamplerFilterNearest, kCISamplerWrapMode, kCISamplerWrapClamp, nil];
     NSArray *args = [NSArray arrayWithObjects:inputSampler, tableSampler, inputSelector, 
-        [NSNumber numberWithFloat:[inputTable extent].size.width - 1.0f], @"definition", [inputSampler definition], nil];
+        [NSNumber numberWithDouble:[inputTable extent].size.width - 1.0f], @"definition", [inputSampler definition], nil];
     return [self apply:discreteTransferFilter arguments:args options:nil];
 }
 

diff --git a/WebCore/kcanvas/device/quartz/filters/WKTableTransferFilter.m b/WebCore/kcanvas/device/quartz/filters/WKTableTransferFilter.m
index 175341d6b55c74aabbbe7bc61e95b6588a8eaa8f..0c214cd988e06a1741e7e8c12cd0efc6ac394d18 100644 (file)
--- a/WebCore/kcanvas/device/quartz/filters/WKTableTransferFilter.m
+++ b/WebCore/kcanvas/device/quartz/filters/WKTableTransferFilter.m
@@ -64,7 +64,7 @@ static CIKernel *tableTransferFilter = nil;
     CISampler *inputSampler = [CISampler samplerWithImage: inputImage];
     CISampler *tableSampler = [CISampler samplerWithImage: inputTable keysAndValues:kCISamplerFilterMode, kCISamplerFilterLinear, kCISamplerWrapMode, kCISamplerWrapClamp, nil];
     NSArray *args = [NSArray arrayWithObjects:inputSampler, tableSampler, inputSelector, 
-        [NSNumber numberWithFloat:[inputTable extent].size.width - 1.0f], @"definition", [inputSampler definition], nil];
+        [NSNumber numberWithDouble:[inputTable extent].size.width - 1.0f], @"definition", [inputSampler definition], nil];
     return [self apply:tableTransferFilter arguments:args options:nil];
 }
 

diff --git a/WebCore/rendering/RenderThemeMac.mm b/WebCore/rendering/RenderThemeMac.mm
index 38ffccab2c86022a97ba25f67bb32ec2f0d18822..61eef2cc9e6c2c21c485d39230e8aef62efea06c 100644 (file)
--- a/WebCore/rendering/RenderThemeMac.mm
+++ b/WebCore/rendering/RenderThemeMac.mm
@@ -716,7 +716,7 @@ const int styledPopupPaddingLeft = 8;
 const int styledPopupPaddingTop = 1;
 const int styledPopupPaddingBottom = 2;
 
-static void TopGradientInterpolate( void *info, float const *inData, float *outData )
+static void TopGradientInterpolate( void *info, const CGFloat *inData, CGFloat *outData )
 {
     static float dark[4] = { 1, 1, 1, 0.4 };
     static float light[4] = { 1, 1, 1, 0.15 };
@@ -726,7 +726,7 @@ static void TopGradientInterpolate( void *info, float const *inData, float *outD
         outData[i] = ( 1.0 - a ) * dark[i] + a * light[i];
 }
 
-static void BottomGradientInterpolate( void *info, float const *inData, float *outData )
+static void BottomGradientInterpolate( void *info, const CGFloat *inData, CGFloat *outData )
 {
     static float dark[4] = { 1, 1, 1, 0 };
     static float light[4] = { 1, 1, 1, 0.3 };
@@ -736,7 +736,7 @@ static void BottomGradientInterpolate( void *info, float const *inData, float *o
         outData[i] = ( 1.0 - a ) * dark[i] + a * light[i];
 }
 
-static void MainGradientInterpolate( void *info, float const *inData, float *outData )
+static void MainGradientInterpolate( void *info, const CGFloat *inData, CGFloat *outData )
 {
     static float dark[4] = { 0, 0, 0, 0.15 };
     static float light[4] = { 0, 0, 0, 0 };