mirror of
https://github.com/lovell/sharp.git
synced 2025-07-10 11:00:14 +02:00
Simplify tiled layout JPEG file extension logic
This commit is contained in:
parent
c9bff94e17
commit
cf39fc4fb1
@ -933,9 +933,6 @@ class PipelineWorker : public Napi::AsyncWorker {
|
|||||||
};
|
};
|
||||||
suffix = AssembleSuffixString(".webp", options);
|
suffix = AssembleSuffixString(".webp", options);
|
||||||
} else {
|
} 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 {
|
std::vector<std::pair<std::string, std::string>> options {
|
||||||
{"Q", std::to_string(baton->jpegQuality)},
|
{"Q", std::to_string(baton->jpegQuality)},
|
||||||
{"interlace", baton->jpegProgressive ? "TRUE" : "FALSE"},
|
{"interlace", baton->jpegProgressive ? "TRUE" : "FALSE"},
|
||||||
@ -946,6 +943,7 @@ class PipelineWorker : public Napi::AsyncWorker {
|
|||||||
{"optimize_scans", baton->jpegOptimiseScans ? "TRUE": "FALSE"},
|
{"optimize_scans", baton->jpegOptimiseScans ? "TRUE": "FALSE"},
|
||||||
{"optimize_coding", baton->jpegOptimiseCoding ? "TRUE": "FALSE"}
|
{"optimize_coding", baton->jpegOptimiseCoding ? "TRUE": "FALSE"}
|
||||||
};
|
};
|
||||||
|
std::string extname = baton->tileLayout == VIPS_FOREIGN_DZ_LAYOUT_DZ ? ".jpeg" : ".jpg";
|
||||||
suffix = AssembleSuffixString(extname, options);
|
suffix = AssembleSuffixString(extname, options);
|
||||||
}
|
}
|
||||||
// Remove alpha channel from tile background if image does not contain an alpha channel
|
// Remove alpha channel from tile background if image does not contain an alpha channel
|
||||||
|
Loading…
x
Reference in New Issue
Block a user