summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Holgate <matt@emobix.co.uk>2014-07-02 18:16:59 +0100
committerMatt Holgate <matt@emobix.co.uk>2014-07-02 18:16:59 +0100
commite07e988bd9ba2db63924cdc98eee3a6e6eb38873 (patch)
treefc0bb20412bcf7024baea53056691fd5206562c6
parentfe01358a4e3cf8e8c1d625937f89ddb9c1a7d8dc (diff)
downloadmupdf-e07e988bd9ba2db63924cdc98eee3a6e6eb38873.tar.xz
Handle the application/xps mimetype.
I think this is non-standard, but some applications seem to use it. The email app on Android uses it, despite the fact the original email actually embedded it as application/octet-stream. I guess the email app is looking at the filename.
-rw-r--r--platform/android/AndroidManifest.xml1
-rw-r--r--source/xps/xps-doc.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/platform/android/AndroidManifest.xml b/platform/android/AndroidManifest.xml
index 91875e87..1e07779e 100644
--- a/platform/android/AndroidManifest.xml
+++ b/platform/android/AndroidManifest.xml
@@ -33,6 +33,7 @@
<action android:name="android.intent.action.VIEW"/>
<category android:name="android.intent.category.DEFAULT"/>
<data android:mimeType="application/vnd.ms-xpsdocument"/>
+ <data android:mimeType="application/xps"/>
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.VIEW"/>
diff --git a/source/xps/xps-doc.c b/source/xps/xps-doc.c
index 5aa2604c..ee3d9736 100644
--- a/source/xps/xps-doc.c
+++ b/source/xps/xps-doc.c
@@ -544,6 +544,7 @@ xps_recognize(fz_context *doc, const char *magic)
}
if (!strcmp(magic, "xps") || !strcmp(magic, "oxps") ||
!strcmp(magic, "application/vnd.ms-xpsdocument") ||
+ !strcmp(magic, "application/xps") ||
!strcmp(magic, "application/oxps"))
return 100;