[[ Bug 17216 ]] Reinstate TIFF processing in Mac clipboard

runrevmark · runrevmark · commit b3ded136a1a0 · 2016-03-31T17:22:07.000+01:00
Some applications on Mac only present TIFF as the image format on
the clipboard (Preview included).

As the engine (as a whole) does not understand TIFF data, this
patch makes TIFF data on the clipboard masquerade as PNG data
allowing it to be used in a loss-less way (relative to the original
TIFF encoding).

The TIFF data will still be listed in the rawClipboardData, but
in the fullClipboardData it will come through as image and png.
diff --git a/docs/notes/bugfix-17216.md b/docs/notes/bugfix-17216.md
@@ -0,0 +1 @@
+# Allow pasting images from some applications on Mac
diff --git a/engine/src/clipboard.cpp b/engine/src/clipboard.cpp
@@ -656,7 +656,15 @@ bool MCClipboard::HasPNG() const
     MCAutoRefcounted<const MCRawClipboardItem> t_item = GetItem();
     if (t_item == NULL)
         return false;
-    
+	
+#ifdef __MAC__
+	// Many Mac apps (like Preview) present things as TIFF on the clipboard. Since
+	// the engine doesn't currently understand TIFF generally we make TIFF data
+	// masquerade as PNG.
+	if (t_item -> HasRepresentation(m_clipboard->GetKnownTypeString(kMCRawClipboardKnownTypeTIFF)))
+		return true;
+#endif
+	
     return t_item->HasRepresentation(m_clipboard->GetKnownTypeString(kMCRawClipboardKnownTypePNG));
 }
 
@@ -932,7 +940,22 @@ bool MCClipboard::CopyAsHTML(MCDataRef& r_html_data) const
 
 bool MCClipboard::CopyAsPNG(MCDataRef& r_png) const
 {
-    return CopyAsData(kMCRawClipboardKnownTypePNG, r_png);
+    if (CopyAsData(kMCRawClipboardKnownTypePNG, r_png))
+		return true;
+	
+#ifdef __MAC__
+	MCAutoDataRef t_tiff_data;
+	if (!CopyAsData(kMCRawClipboardKnownTypeTIFF, &t_tiff_data))
+		return false;
+	
+	extern bool MCMacPasteboardConvertTIFFToPNG(MCDataRef p_in_data, MCDataRef& r_out_data);
+	if (!MCMacPasteboardConvertTIFFToPNG(*t_tiff_data, r_png))
+		return false;
+	
+	return true;
+#else
+	return false;
+#endif
 }
 
 bool MCClipboard::CopyAsGIF(MCDataRef& r_gif) const
diff --git a/engine/src/lnx-clipboard.cpp b/engine/src/lnx-clipboard.cpp
@@ -47,6 +47,7 @@ const char * const MCLinuxRawClipboard::s_formats[kMCRawClipboardKnownTypeLast+1
     "image/png",                    // PNG image
     "image/gif",                    // GIF image
     "image/jpeg",                   // JPEG image
+	"image/tiff",					// TIFF image
     NULL,                           // Windows metafile
     NULL,                           // Windows enhanced metafile
     NULL,                           // Windows bitmap
diff --git a/engine/src/mac-clipboard.mm b/engine/src/mac-clipboard.mm
@@ -36,6 +36,7 @@
     "public.png",
     "com.compuserve.gif",
     "public.jpeg",
+	"public.tiff",
     NULL,
     NULL,
     NULL,                   // "com.microsoft.bmp" but the Mac engine doesn't support this format
diff --git a/engine/src/raw-clipboard.h b/engine/src/raw-clipboard.h
@@ -48,6 +48,7 @@ enum MCRawClipboardKnownType
     kMCRawClipboardKnownTypePNG,        // PNG image
     kMCRawClipboardKnownTypeGIF,        // GIF image
     kMCRawClipboardKnownTypeJPEG,       // JPEG image
+	kMCRawClipboardKnownTypeTIFF,		// TIFF image
     kMCRawClipboardKnownTypeWinMF,      // Windows Metafile image
     kMCRawClipboardKnownTypeWinEMF,     // Windows Enhanced Metafile image
     kMCRawClipboardKnownTypeWinDIB,     // Windows BMP image
diff --git a/engine/src/w32-clipboard.cpp b/engine/src/w32-clipboard.cpp
@@ -36,6 +36,7 @@ MCWin32RawClipboardCommon::format_mapping MCWin32RawClipboardCommon::s_formats[]
 	{ 0, "PNG" },										// PNG image
 	{ 0, "GIF" },										// GIF image
 	{ 0, "JFIF" },										// JPEG image
+	{ 6, "CF_TIFF" },									// TIFF image
 	{ CF_METAFILEPICT, "CF_METAFILEPICT" },				// Windows Metafile image
 	{ CF_ENHMETAFILE, "CF_ENHMETAFILE" },				// Windows Enhanced Metafile image
 	{ CF_DIB, "CF_DIB" },								// Windows bitmap image
@@ -66,7 +67,6 @@ MCWin32RawClipboardCommon::format_mapping MCWin32RawClipboardCommon::s_formats[]
 	{ 10, "CF_PENDATA" },								// Windows 3.1 (!) pen input data
 	{ 11, "CF_RIFF" },									// RIFF-encoded audio
 	{ 4, "CF_SYLK" },									// Microsoft Symbolic Link format
-	{ 6, "CF_TIFF" },									// TIFF image
 	{ 12, "CF_WAVE" },									// PCM audio
 };
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Allow pasting images from some applications on Mac`