From cf39fc4fb18234db6f08b8c296e117bc5821d1d1 Mon Sep 17 00:00:00 2001
From: Lovell Fuller <github@lovell.info>
Date: Sat, 14 Mar 2020 22:08:46 +0000
Subject: [PATCH] Simplify tiled layout JPEG file extension logic

---
 src/pipeline.cc | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/pipeline.cc b/src/pipeline.cc
index 54cf9b7d..6a05be64 100644
--- a/src/pipeline.cc
+++ b/src/pipeline.cc
@@ -933,9 +933,6 @@ class PipelineWorker : public Napi::AsyncWorker {
             };
             suffix = AssembleSuffixString(".webp", options);
           } else {
-            std::string extname = baton->tileLayout == VIPS_FOREIGN_DZ_LAYOUT_GOOGLE
-              || baton->tileLayout == VIPS_FOREIGN_DZ_LAYOUT_ZOOMIFY
-                ? ".jpg" : ".jpeg";
             std::vector<std::pair<std::string, std::string>> options {
               {"Q", std::to_string(baton->jpegQuality)},
               {"interlace", baton->jpegProgressive ? "TRUE" : "FALSE"},
@@ -946,6 +943,7 @@ class PipelineWorker : public Napi::AsyncWorker {
               {"optimize_scans", baton->jpegOptimiseScans ? "TRUE": "FALSE"},
               {"optimize_coding", baton->jpegOptimiseCoding ? "TRUE": "FALSE"}
             };
+            std::string extname = baton->tileLayout == VIPS_FOREIGN_DZ_LAYOUT_DZ ? ".jpeg" : ".jpg";
             suffix = AssembleSuffixString(extname, options);
           }
           // Remove alpha channel from tile background if image does not contain an alpha channel