From 672bca681533dcfb699c65f7a2354357a2ba781f Mon Sep 17 00:00:00 2001 From: thatcher Date: Thu, 31 Aug 2006 21:54:15 +0000 Subject: [PATCH] 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 --- .../device/quartz/filters/WKDiscreteTransferFilter.m | 2 +- .../kcanvas/device/quartz/filters/WKTableTransferFilter.m | 2 +- WebCore/rendering/RenderThemeMac.mm | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/WebCore/kcanvas/device/quartz/filters/WKDiscreteTransferFilter.m b/WebCore/kcanvas/device/quartz/filters/WKDiscreteTransferFilter.m index c963709d4b28..cab018aeb53a 100644 --- 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 175341d6b55c..0c214cd988e0 100644 --- 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 38ffccab2c86..61eef2cc9e6c 100644 --- 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 }; -- 2.36.0