Merge branch '1.x'

.travis.yml

@@ -1,14 +1,20 @@
 language: php
+dist: trusty
 
-php:
-    - 5.4
-    - 5.5
-    - 5.6
-    - 7.0
-    - 7.1
-    - 7.2
-    - 7.3
-    - nightly
+matrix:
+  include:
+    - php: 5.4
+    - php: 5.4
+    - php: 5.5
+    - php: 5.6
+    - php: 7.0
+    - php: 7.1
+    - php: 7.2
+    - php: 7.3
+    - php: 7.4snapshot
+    - php: nightly
+  allow_failures:
+    - php: nightly
 
 before_script: composer install
 

lib/Type/TypeJpeg.php

@@ -15,7 +15,7 @@ class TypeJpeg extends TypeBase
 {
 	/** @var int JPEG max header size. Headers can be bigger, but we'll abort
 	 *			going through the header after this */
-	const JPEG_MAX_HEADER_SIZE = 124576;
+	const JPEG_MAX_HEADER_SIZE = 786432; // = 768 kiB
 
 	/** @var string JPEG header */
 	const JPEG_HEADER = "\xFF\xD8";
@@ -43,17 +43,6 @@ class TypeJpeg extends TypeBase
 		"\xCF"
 	);
 
-	/** @var array JPEG APP markers */
-	protected $appMarkers = array(
-		"\xE0",
-		"\xE1",
-		"\xE2",
-		"\xE3",
-		"\xEC",
-		"\xED",
-		"\xEE",
-	);
-
 	/** @var string|bool JPEG data stream */
 	protected $data = '';