From 40ffe7c426c6818b2dc5c95a65ffb318f19136b9 Mon Sep 17 00:00:00 2001
From: "karthik.bashetty" <karthik.bashetty@uber.com>
Date: Wed, 9 Oct 2024 14:21:21 +0530
Subject: [PATCH] Support PDF files with magic byte in the header

---
 resources/PDF-2.0-with-offset-start.pdf | Bin 0 -> 5264 bytes
 vips/foreign.go                         |  14 ++++++++------
 vips/foreign_test.go                    |  11 +++++++++++
 vips/image_golden_test.go               |   8 ++++++++
 vips/image_test.go                      |  11 +++++++++++
 5 files changed, 38 insertions(+), 6 deletions(-)
 create mode 100644 resources/PDF-2.0-with-offset-start.pdf

diff --git a/resources/PDF-2.0-with-offset-start.pdf b/resources/PDF-2.0-with-offset-start.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..4cf62cc204ecbc2c2027451ea265ab8978510c6b
GIT binary patch
literal 5264
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

literal 0
HcmV?d00001

diff --git a/vips/foreign.go b/vips/foreign.go
index 80f643b4..711baaaa 100644
--- a/vips/foreign.go
+++ b/vips/foreign.go
@@ -6,13 +6,12 @@ import (
 	"bytes"
 	"encoding/xml"
 	"fmt"
+	"golang.org/x/image/bmp"
+	"golang.org/x/net/html/charset"
 	"image/png"
 	"math"
 	"runtime"
 	"unsafe"
-
-	"golang.org/x/image/bmp"
-	"golang.org/x/net/html/charset"
 )
 
 // SubsampleMode correlates to a libvips subsample mode
@@ -154,14 +153,14 @@ func DetermineImageType(buf []byte) ImageType {
 		return ImageTypeHEIF
 	} else if isSVG(buf) {
 		return ImageTypeSVG
-	} else if isPDF(buf) {
-		return ImageTypePDF
 	} else if isBMP(buf) {
 		return ImageTypeBMP
 	} else if isJP2K(buf) {
 		return ImageTypeJP2K
 	} else if isJXL(buf) {
 		return ImageTypeJXL
+	} else if isPDF(buf) {
+		return ImageTypePDF
 	} else {
 		return ImageTypeUnknown
 	}
@@ -240,7 +239,10 @@ func isSVG(buf []byte) bool {
 var pdf = []byte("\x25\x50\x44\x46")
 
 func isPDF(buf []byte) bool {
-	return bytes.HasPrefix(buf, pdf)
+	if len(buf) <= 1024 {
+		return bytes.Contains(buf, pdf)
+	}
+	return bytes.Contains(buf[:1024], pdf)
 }
 
 var bmpHeader = []byte("BM")
diff --git a/vips/foreign_test.go b/vips/foreign_test.go
index 38a40d32..d905865b 100644
--- a/vips/foreign_test.go
+++ b/vips/foreign_test.go
@@ -106,6 +106,17 @@ func Test_DetermineImageType__PDF(t *testing.T) {
 	assert.Equal(t, ImageTypePDF, imageType)
 }
 
+func Test_DetermineImageType__PDF_1(t *testing.T) {
+	Startup(&Config{})
+
+	buf, err := os.ReadFile(resources + "PDF-2.0-with-offset-start.pdf")
+	assert.NoError(t, err)
+	assert.NotNil(t, buf)
+
+	imageType := DetermineImageType(buf)
+	assert.Equal(t, ImageTypePDF, imageType)
+}
+
 func Test_DetermineImageType__BMP(t *testing.T) {
 	Startup(&Config{})
 
diff --git a/vips/image_golden_test.go b/vips/image_golden_test.go
index 5fb22dd3..a2276d37 100644
--- a/vips/image_golden_test.go
+++ b/vips/image_golden_test.go
@@ -954,6 +954,14 @@ func TestImage_Pixelate(t *testing.T) {
 		nil, nil)
 }
 
+func TestPDF_WithOffsetStart(t *testing.T) {
+	goldenTest(t, resources+"PDF-2.0-with-offset-start.pdf",
+		nil, func(img *ImageRef) {
+			assert.Equal(t, 612, img.Width())
+			assert.Equal(t, 396, img.Height())
+		}, nil)
+}
+
 func testWebpOptimizeIccProfile(t *testing.T, exportParams *WebpExportParams) []byte {
 	return goldenTest(t, resources+"has-icc-profile.png",
 		func(img *ImageRef) error {
diff --git a/vips/image_test.go b/vips/image_test.go
index 9c6090bc..8466aaac 100644
--- a/vips/image_test.go
+++ b/vips/image_test.go
@@ -1190,6 +1190,17 @@ func TestImageRef_SetGamma(t *testing.T) {
 	require.NoError(t, err)
 }
 
+func Test_NewImageFromFile(t *testing.T) {
+	Startup(nil)
+
+	image, err := NewImageFromFile(resources + "PDF-2.0-with-offset-start.pdf")
+	require.NoError(t, err)
+
+	assert.Equal(t, ImageTypePDF, image.originalFormat)
+	assert.Equal(t, ImageTypePDF, image.format)
+	assert.Equal(t, 1, image.Pages())
+}
+
 // TODO unit tests to cover:
 // NewImageFromReader failing test
 // NewImageFromFile failing test