From ae638eec9424a74d7725e849709beaac4fd7ab29 Mon Sep 17 00:00:00 2001
From: Anthony Stirling <77850077+Frooodle@users.noreply.github.com>
Date: Sat, 28 Jan 2023 12:49:05 +0000
Subject: [PATCH 1/2] Update convert-from-pdf.html

---
 src/main/resources/templates/convert-from-pdf.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/templates/convert-from-pdf.html b/src/main/resources/templates/convert-from-pdf.html
index c1fffd73..4e997350 100644
--- a/src/main/resources/templates/convert-from-pdf.html
+++ b/src/main/resources/templates/convert-from-pdf.html
@@ -24,8 +24,8 @@
 					<div class="form-group">
 						<label>Image Format</label> <select class="form-control"
 							name="imageFormat">
-							<option value="jpg">JPEG</option>
 							<option value="png">PNG</option>
+							<option value="jpg">JPEG</option>
 							<option value="gif">GIF</option>
 						</select>
 					</div>
@@ -38,4 +38,4 @@
 	</div>
 	<div th:insert="~{footer.html :: footer}"></div>
 </body>
-</html>
\ No newline at end of file
+</html>

From cada1fd80fc5179c4b2f2958b0423cf1c4668243 Mon Sep 17 00:00:00 2001
From: Anthony Stirling <77850077+Frooodle@users.noreply.github.com>
Date: Sat, 28 Jan 2023 12:49:37 +0000
Subject: [PATCH 2/2] Update FromPDFController.java

---
 .../stirling/software/SPDF/controller/FromPDFController.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/stirling/software/SPDF/controller/FromPDFController.java b/src/main/java/stirling/software/SPDF/controller/FromPDFController.java
index 7f0ede1c..17a28c27 100644
--- a/src/main/java/stirling/software/SPDF/controller/FromPDFController.java
+++ b/src/main/java/stirling/software/SPDF/controller/FromPDFController.java
@@ -42,7 +42,7 @@ public class FromPDFController {
 	private String getMediaType(String imageFormat) {
 	    if(imageFormat.equalsIgnoreCase("PNG"))
 	        return "image/png";
-	    else if(imageFormat.equalsIgnoreCase("JPEG"))
+	    else if(imageFormat.equalsIgnoreCase("JPEG") || imageFormat.equalsIgnoreCase("JPG") )
 	        return "image/jpeg";
 	    else if(imageFormat.equalsIgnoreCase("GIF"))
 	        return "image/gif";