Version 1.0.11

4lex4 · Feb 19, 2018 · 442220f · 442220f
2 parents 76aa95e + ee73c6f
commit 442220f
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 13 deletions.
diff --git a/DefaultParamsDialog.cpp b/DefaultParamsDialog.cpp
@@ -963,6 +963,7 @@ void DefaultParamsDialog::profileChanged(const int index) {
     if (index == customProfileItemIdx) {
         profileCB->setEditText(profileCB->currentText());
         profileCB->lineEdit()->selectAll();
+        profileCB->setFocus();
         profileSaveButton->setEnabled(true);
         profileDeleteButton->setEnabled(false);
         setTabWidgetsEnabled(true);
@@ -998,6 +999,7 @@ void DefaultParamsDialog::profileChanged(const int index) {
             QMessageBox::critical(this, tr("Error"), tr("Error loading the profile."));
             profileCB->setCurrentIndex(0);
             profileCB->removeItem(index);
+            customProfileItemIdx--;
 
             profileSaveButton->setEnabled(false);
             profileDeleteButton->setEnabled(false);
@@ -1037,16 +1039,15 @@ void DefaultParamsDialog::profileSavePressed() {
 }
 
 void DefaultParamsDialog::profileDeletePressed() {
-    const ScopedIncDec<int> scopeGuard(ignoreProfileChanges);
-
     if (profileManager.deleteProfile(profileCB->currentText())) {
-        const int deletedProfileIndex = profileCB->currentIndex();
-        profileCB->setCurrentIndex(customProfileItemIdx--);
-        profileCB->removeItem(deletedProfileIndex);
+        {
+            const ScopedIncDec<int> scopeGuard(ignoreProfileChanges);
 
-        profileSaveButton->setEnabled(true);
-        profileDeleteButton->setEnabled(false);
-        setTabWidgetsEnabled(true);
+            const int deletedProfileIndex = profileCB->currentIndex();
+            profileCB->setCurrentIndex(customProfileItemIdx--);
+            profileCB->removeItem(deletedProfileIndex);
+        }
+        profileChanged(customProfileItemIdx);
     } else {
         QMessageBox::critical(this, tr("Error"), tr("Error deleting the profile."));
     }

diff --git a/Despeckle.cpp b/Despeckle.cpp
@@ -23,6 +23,7 @@
 #include "FastQueue.h"
 #include "imageproc/BinaryImage.h"
 #include "imageproc/ConnectivityMap.h"
+#include <unordered_map>
 #include <QImage>
 #include <QDebug>
 

diff --git a/ProjectPages.cpp b/ProjectPages.cpp
@@ -23,6 +23,7 @@
 #include "PageSequence.h"
 #include "RelinkablePath.h"
 #include "AbstractRelinker.h"
+#include <unordered_map>
 #include <boost/foreach.hpp>
 #include <boost/multi_index_container.hpp>
 #include <boost/multi_index/ordered_index.hpp>

diff --git a/Utils.h b/Utils.h
@@ -21,6 +21,8 @@
 
 #include <QString>
 #include "ThumbnailPixmapCache.h"
+#include <map>
+#include <unordered_map>
 
 class Utils {
 public:

diff --git a/filters/output/OutputGenerator.cpp b/filters/output/OutputGenerator.cpp
@@ -576,7 +576,7 @@ namespace output {
         }();
 
         QColor outsideBackgroundColor = BackgroundColorCalculator::calcDominantBackgroundColor(
-                inputOrigImage.allGray() ? inputGrayImage : inputOrigImage, m_xform.resultingPreCropArea()
+                inputOrigImage.allGray() ? inputGrayImage : inputOrigImage, m_xform.preCropArea()
         );
 
         const bool needNormalizeIllumination
@@ -867,7 +867,7 @@ namespace output {
 
                 if (needNormalizeIllumination && !render_params.normalizeIlluminationColor()) {
                     outsideBackgroundColor = BackgroundColorCalculator::calcDominantBackgroundColor(
-                            inputOrigImage.allGray() ? inputGrayImage : inputOrigImage, m_xform.resultingPreCropArea()
+                            inputOrigImage.allGray() ? inputGrayImage : inputOrigImage, m_xform.preCropArea()
                     );
 
                     if (inputOrigImage.allGray()) {
@@ -1133,7 +1133,7 @@ namespace output {
         }();
 
         QColor outsideBackgroundColor = BackgroundColorCalculator::calcDominantBackgroundColor(
-                inputOrigImage.allGray() ? inputGrayImage : inputOrigImage, m_xform.resultingPreCropArea()
+                inputOrigImage.allGray() ? inputGrayImage : inputOrigImage, m_xform.preCropArea()
         );
 
         const bool color_original = !inputOrigImage.allGray();
@@ -1775,7 +1775,7 @@ namespace output {
 
                 if (needNormalizeIllumination && !render_params.normalizeIlluminationColor()) {
                     outsideBackgroundColor = BackgroundColorCalculator::calcDominantBackgroundColor(
-                            inputOrigImage.allGray() ? inputGrayImage : inputOrigImage, m_xform.resultingPreCropArea()
+                            inputOrigImage.allGray() ? inputGrayImage : inputOrigImage, m_xform.preCropArea()
                     );
 
                     QImage orig_without_illumination;

diff --git a/version.h b/version.h
@@ -19,7 +19,7 @@
 #ifndef SCANTAILOR_VERSION_H_
 #define SCANTAILOR_VERSION_H_
 
-#define VERSION "1.0.10"
+#define VERSION "1.0.11"
 #define VERSION_QUAD "" // Must be "x.x.x.x" or an empty string.
 #define PROJECT_VERSION 2