[webkit-changes] cvs commit: WebKit/WebCoreSupport.subproj WebImageData.m

[Adele]

adele       05/07/20 13:36:38

  Modified:    .        ChangeLog
               WebCoreSupport.subproj WebImageData.m
  Log:
            Merged fix for:
            <rdar://problem/4125127> [WebKit] horizontal rulers don't render on Safari on web.apple.com
  
            * WebCoreSupport.subproj/WebImageData.m:
            (-[WebImageData _checkSolidColor:]):
  
  Revision  Changes    Path
  1.3242    +8 -0      WebKit/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebKit/ChangeLog,v
  retrieving revision 1.3241
  retrieving revision 1.3242
  diff -u -r1.3241 -r1.3242
  --- ChangeLog	20 Jul 2005 20:04:10 -0000	1.3241
  +++ ChangeLog	20 Jul 2005 20:36:35 -0000	1.3242
  @@ -1,5 +1,13 @@
   2005-07-20  Adele Peterson  <adele at apple.com>
   
  +          Merged fix for:
  +          <rdar://problem/4125127> [WebKit] horizontal rulers don't render on Safari on web.apple.com
  +
  +          * WebCoreSupport.subproj/WebImageData.m:
  +          (-[WebImageData _checkSolidColor:]):
  +
  +2005-07-20  Adele Peterson  <adele at apple.com>
  +
           Merged fix for :
           <rdar://problem/4118278> mail divide by zero navigating messages
     
  
  
  
  1.39      +5 -0      WebKit/WebCoreSupport.subproj/WebImageData.m
  
  Index: WebImageData.m
  ===================================================================
  RCS file: /cvs/root/WebKit/WebCoreSupport.subproj/WebImageData.m,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- WebImageData.m	13 Jun 2005 15:33:35 -0000	1.38
  +++ WebImageData.m	20 Jul 2005 20:36:38 -0000	1.39
  @@ -293,8 +293,13 @@
       if( image && CGImageGetWidth(image)==1 && CGImageGetHeight(image)==1 ) {
           float pixel[4]; // RGBA
           CGColorSpaceRef space = CGColorSpaceCreateDeviceRGB();
  +#if __i386__	
  +        CGContextRef bmap = CGBitmapContextCreate(&pixel,1,1,8*sizeof(float),sizeof(pixel),space,
  +                                                  kCGImageAlphaPremultipliedLast | kCGBitmapFloatComponents | kCGBitmapByteOrder32Host);
  +#else
           CGContextRef bmap = CGBitmapContextCreate(&pixel,1,1,8*sizeof(float),sizeof(pixel),space,
                                                     kCGImageAlphaPremultipliedLast | kCGBitmapFloatComponents);
  +#endif
           if( bmap ) {
               NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
               [[NSGraphicsContext graphicsContextWithGraphicsPort:bmap flipped:NO] setCompositingOperation:NSCompositeCopy];