NSTIFFPboardType is deprecated in favor of NSPasteboardTypeTIFF
This commit is contained in:
		
							parent
							
								
									fbf8c03a2f
								
							
						
					
					
						commit
						890682f353
					
				@ -29,7 +29,11 @@ const void * get_tiff_paste_board(unsigned long * size)
 | 
				
			|||||||
{
 | 
					{
 | 
				
			||||||
  NSPasteboard *pasteboard = [NSPasteboard generalPasteboard];
 | 
					  NSPasteboard *pasteboard = [NSPasteboard generalPasteboard];
 | 
				
			||||||
  NSLog(@"types in pasteboard : %@", [pasteboard types]);
 | 
					  NSLog(@"types in pasteboard : %@", [pasteboard types]);
 | 
				
			||||||
 | 
					#if defined(MAC_OS_X_VERSION_10_14) && (MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_14)
 | 
				
			||||||
 | 
					  NSData *data = [pasteboard dataForType:NSPasteboardTypeTIFF];
 | 
				
			||||||
 | 
					#else
 | 
				
			||||||
  NSData *data = [pasteboard dataForType:NSTIFFPboardType];
 | 
					  NSData *data = [pasteboard dataForType:NSTIFFPboardType];
 | 
				
			||||||
 | 
					#endif
 | 
				
			||||||
  if (data == nil)
 | 
					  if (data == nil)
 | 
				
			||||||
    return NULL;
 | 
					    return NULL;
 | 
				
			||||||
  *size = [data length];
 | 
					  *size = [data length];
 | 
				
			||||||
@ -41,9 +45,14 @@ int set_tiff_paste_board(const void * tiff, unsigned long size)
 | 
				
			|||||||
  if (tiff == NULL || size == 0)
 | 
					  if (tiff == NULL || size == 0)
 | 
				
			||||||
    return 0;
 | 
					    return 0;
 | 
				
			||||||
  NSPasteboard *pasteboard = [NSPasteboard generalPasteboard];
 | 
					  NSPasteboard *pasteboard = [NSPasteboard generalPasteboard];
 | 
				
			||||||
  [pasteboard declareTypes:[NSArray arrayWithObject:NSTIFFPboardType] owner:nil];
 | 
					 | 
				
			||||||
  NSData *data = [[NSData alloc] initWithBytes:tiff length:size];
 | 
					  NSData *data = [[NSData alloc] initWithBytes:tiff length:size];
 | 
				
			||||||
 | 
					#if defined(MAC_OS_X_VERSION_10_14) && (MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_14)
 | 
				
			||||||
 | 
					  [pasteboard declareTypes:[NSArray arrayWithObject:NSPasteboardTypeTIFF] owner:nil];
 | 
				
			||||||
 | 
					  BOOL b = [pasteboard setData:data forType:NSPasteboardTypeTIFF];
 | 
				
			||||||
 | 
					#else
 | 
				
			||||||
 | 
					  [pasteboard declareTypes:[NSArray arrayWithObject:NSTIFFPboardType] owner:nil];
 | 
				
			||||||
  BOOL b = [pasteboard setData:data forType:NSTIFFPboardType];
 | 
					  BOOL b = [pasteboard setData:data forType:NSTIFFPboardType];
 | 
				
			||||||
 | 
					#endif
 | 
				
			||||||
  if (!b)
 | 
					  if (!b)
 | 
				
			||||||
    NSLog(@"Failed to set data in pasteboard");
 | 
					    NSLog(@"Failed to set data in pasteboard");
 | 
				
			||||||
  [data release];
 | 
					  [data release];
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user