mirror of
git://source.winehq.org/git/wine.git
synced 2024-09-30 05:52:55 +00:00
winemac: Remove unused macdrv_get_surface_display_image copy_data parameter.
This commit is contained in:
parent
9cf95e76ef
commit
446c8ff670
|
@ -532,7 +532,7 @@ - (void) updateLayer
|
||||||
imageRect.origin.y *= layer.contentsScale;
|
imageRect.origin.y *= layer.contentsScale;
|
||||||
imageRect.size.width *= layer.contentsScale;
|
imageRect.size.width *= layer.contentsScale;
|
||||||
imageRect.size.height *= layer.contentsScale;
|
imageRect.size.height *= layer.contentsScale;
|
||||||
image = macdrv_get_surface_display_image(window.surface, &imageRect, FALSE, window.colorKeyed,
|
image = macdrv_get_surface_display_image(window.surface, &imageRect, window.colorKeyed,
|
||||||
window.colorKeyRed, window.colorKeyGreen, window.colorKeyBlue);
|
window.colorKeyRed, window.colorKeyGreen, window.colorKeyBlue);
|
||||||
|
|
||||||
if (image)
|
if (image)
|
||||||
|
|
|
@ -553,7 +553,7 @@ extern void macdrv_order_cocoa_window(macdrv_window w, macdrv_window prev,
|
||||||
extern void macdrv_get_cocoa_window_frame(macdrv_window w, CGRect* out_frame);
|
extern void macdrv_get_cocoa_window_frame(macdrv_window w, CGRect* out_frame);
|
||||||
extern void macdrv_set_cocoa_parent_window(macdrv_window w, macdrv_window parent);
|
extern void macdrv_set_cocoa_parent_window(macdrv_window w, macdrv_window parent);
|
||||||
extern void macdrv_set_window_surface(macdrv_window w, struct window_surface *window_surface);
|
extern void macdrv_set_window_surface(macdrv_window w, struct window_surface *window_surface);
|
||||||
extern CGImageRef macdrv_get_surface_display_image(struct window_surface *window_surface, CGRect *rect, int copy_data, int color_keyed,
|
extern CGImageRef macdrv_get_surface_display_image(struct window_surface *window_surface, CGRect *rect, int color_keyed,
|
||||||
CGFloat key_red, CGFloat key_green, CGFloat key_blue);
|
CGFloat key_red, CGFloat key_green, CGFloat key_blue);
|
||||||
extern void macdrv_window_needs_display(macdrv_window w, CGRect rect);
|
extern void macdrv_window_needs_display(macdrv_window w, CGRect rect);
|
||||||
extern void macdrv_set_window_shape(macdrv_window w, const CGRect *rects, int count);
|
extern void macdrv_set_window_shape(macdrv_window w, const CGRect *rects, int count);
|
||||||
|
|
|
@ -191,7 +191,7 @@ void set_surface_use_alpha(struct window_surface *window_surface, BOOL use_alpha
|
||||||
* must not use Win32 or Wine functions, including debug
|
* must not use Win32 or Wine functions, including debug
|
||||||
* logging.
|
* logging.
|
||||||
*/
|
*/
|
||||||
CGImageRef macdrv_get_surface_display_image(struct window_surface *window_surface, CGRect *rect, int copy_data, int color_keyed,
|
CGImageRef macdrv_get_surface_display_image(struct window_surface *window_surface, CGRect *rect, int color_keyed,
|
||||||
CGFloat key_red, CGFloat key_green, CGFloat key_blue)
|
CGFloat key_red, CGFloat key_green, CGFloat key_blue)
|
||||||
{
|
{
|
||||||
CGImageRef cgimage = NULL;
|
CGImageRef cgimage = NULL;
|
||||||
|
@ -220,15 +220,7 @@ CGImageRef macdrv_get_surface_display_image(struct window_surface *window_surfac
|
||||||
offset = CGRectGetMinX(visrect) * 4 + CGRectGetMinY(visrect) * bytes_per_row;
|
offset = CGRectGetMinX(visrect) * 4 + CGRectGetMinY(visrect) * bytes_per_row;
|
||||||
size = min(CGRectGetHeight(visrect) * bytes_per_row,
|
size = min(CGRectGetHeight(visrect) * bytes_per_row,
|
||||||
surface->info.bmiHeader.biSizeImage - offset);
|
surface->info.bmiHeader.biSizeImage - offset);
|
||||||
|
provider = CGDataProviderCreateWithData(NULL, (UInt8 *)window_surface->color_bits + offset, size, NULL);
|
||||||
if (copy_data)
|
|
||||||
{
|
|
||||||
CFDataRef data = CFDataCreate(NULL, (UInt8 *)window_surface->color_bits + offset, size);
|
|
||||||
provider = CGDataProviderCreateWithCFData(data);
|
|
||||||
CFRelease(data);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
provider = CGDataProviderCreateWithData(NULL, (UInt8 *)window_surface->color_bits + offset, size, NULL);
|
|
||||||
|
|
||||||
alphaInfo = surface->use_alpha ? kCGImageAlphaPremultipliedFirst : kCGImageAlphaNoneSkipFirst;
|
alphaInfo = surface->use_alpha ? kCGImageAlphaPremultipliedFirst : kCGImageAlphaNoneSkipFirst;
|
||||||
cgimage = CGImageCreate(CGRectGetWidth(visrect), CGRectGetHeight(visrect),
|
cgimage = CGImageCreate(CGRectGetWidth(visrect), CGRectGetHeight(visrect),
|
||||||
|
|
Loading…
Reference in a new issue