merged branch 'unbounded-processing' into 'dev'
This commit is contained in:
@@ -1978,6 +1978,7 @@ bool EditorPanel::saveImmediately (const Glib::ustring &filename, const SaveForm
|
||||
{
|
||||
rtengine::procparams::ProcParams pparams;
|
||||
ipc->getParams (&pparams);
|
||||
|
||||
rtengine::ProcessingJob *job = rtengine::ProcessingJob::create (ipc->getInitialImage(), pparams);
|
||||
|
||||
// save immediately
|
||||
@@ -1985,7 +1986,9 @@ bool EditorPanel::saveImmediately (const Glib::ustring &filename, const SaveForm
|
||||
|
||||
int err = 0;
|
||||
|
||||
if (sf.format == "tif") {
|
||||
if (gimpPlugin) {
|
||||
err = img->saveAsTIFF (filename, 32, true);
|
||||
} else if (sf.format == "tif") {
|
||||
err = img->saveAsTIFF (filename, sf.tiffBits, sf.tiffUncompressed);
|
||||
} else if (sf.format == "png") {
|
||||
err = img->saveAsPNG (filename, sf.pngBits);
|
||||
|
@@ -662,15 +662,8 @@ int main (int argc, char **argv)
|
||||
m.run (*rtWindow);
|
||||
gdk_threads_leave();
|
||||
|
||||
if (gimpPlugin &&
|
||||
rtWindow->epanel && rtWindow->epanel->isRealized()) {
|
||||
SaveFormat sf;
|
||||
sf.format = "tif";
|
||||
sf.tiffBits = 16;
|
||||
sf.tiffUncompressed = true;
|
||||
sf.saveParams = true;
|
||||
|
||||
if (!rtWindow->epanel->saveImmediately (argv2, sf)) {
|
||||
if (gimpPlugin && rtWindow->epanel && rtWindow->epanel->isRealized()) {
|
||||
if (!rtWindow->epanel->saveImmediately(argv2, SaveFormat())) {
|
||||
ret = -2;
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user