Ken Thomases : winemac: Remove JPEG 2000 from the bitmap formats that other bitmap formats can be converted to.

Alexandre Julliard julliard at wine.codeweavers.com
Thu Oct 8 09:20:59 CDT 2015


Module: wine
Branch: master
Commit: 10b95d0dc74d1c9f069807ec3f397839c3f9cc79
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=10b95d0dc74d1c9f069807ec3f397839c3f9cc79

Author: Ken Thomases <ken at codeweavers.com>
Date:   Wed Oct  7 16:22:27 2015 -0500

winemac: Remove JPEG 2000 from the bitmap formats that other bitmap formats can be converted to.

Since a983cfb01, the Mac driver won't even present formats, like this one,
which don't correspond to a known Windows format through the clipboard APIs, so
it's pointless.

Signed-off-by: Ken Thomases <ken at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/winemac.drv/cocoa_clipboard.m | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/dlls/winemac.drv/cocoa_clipboard.m b/dlls/winemac.drv/cocoa_clipboard.m
index b8ca796..1d1cb88 100644
--- a/dlls/winemac.drv/cocoa_clipboard.m
+++ b/dlls/winemac.drv/cocoa_clipboard.m
@@ -66,12 +66,10 @@ CFArrayRef macdrv_copy_pasteboard_types(CFTypeRef pasteboard)
                                     [NSNumber numberWithUnsignedInteger:NSBMPFileType],
                                     [NSNumber numberWithUnsignedInteger:NSGIFFileType],
                                     [NSNumber numberWithUnsignedInteger:NSJPEGFileType],
-                                    [NSNumber numberWithUnsignedInteger:NSJPEG2000FileType],
                                     nil];
 
         BitmapOutputTypes = [[NSArray alloc] initWithObjects:@"public.tiff", @"public.png",
-                             @"com.microsoft.bmp", @"com.compuserve.gif", @"public.jpeg",
-                             @"public.jpeg-2000", nil];
+                             @"com.microsoft.bmp", @"com.compuserve.gif", @"public.jpeg", nil];
 
         BitmapOutputTypeMap = [[NSDictionary alloc] initWithObjects:bitmapFileTypes
                                                             forKeys:BitmapOutputTypes];




More information about the wine-cvs mailing list