diff --git a/Pdf4QtLibCore/sources/pdfredact.cpp b/Pdf4QtLibCore/sources/pdfredact.cpp index e6659132..47f0ee80 100644 --- a/Pdf4QtLibCore/sources/pdfredact.cpp +++ b/Pdf4QtLibCore/sources/pdfredact.cpp @@ -1,4 +1,4 @@ -// Copyright (C) 2020-2022 Jakub Melka +// Copyright (C) 2020-2023 Jakub Melka // // This file is part of PDF4QT. // @@ -98,7 +98,7 @@ PDFDocument PDFRedact::perform(Options options) const PDFRedactAnnotation* redactAnnotation = dynamic_cast(annotation.get()); Q_ASSERT(redactAnnotation); - redactPath.addPath(redactAnnotation->getRedactionRegion().getPath()); + redactPath = redactPath.united(redactAnnotation->getRedactionRegion().getPath()); } QTransform matrix; diff --git a/Pdf4QtViewer/pdfviewersettings.cpp b/Pdf4QtViewer/pdfviewersettings.cpp index 0753014b..81491a20 100644 --- a/Pdf4QtViewer/pdfviewersettings.cpp +++ b/Pdf4QtViewer/pdfviewersettings.cpp @@ -43,7 +43,7 @@ void PDFViewerSettings::readSettings(QSettings& settings, const pdf::PDFCMSSetti settings.beginGroup("ViewerSettings"); m_settings.m_directory = settings.value("defaultDirectory", QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation)).toString(); - m_settings.m_features = static_cast(settings.value("rendererFeatures", static_cast(pdf::PDFRenderer::getDefaultFeatures())).toInt()); + m_settings.m_features = static_cast(settings.value("rendererFeaturesv2", static_cast(pdf::PDFRenderer::getDefaultFeatures())).toInt()); m_settings.m_rendererEngine = static_cast(settings.value("renderingEngine", static_cast(pdf::RendererEngine::OpenGL)).toInt()); m_settings.m_multisampleAntialiasing = settings.value("msaa", defaultSettings.m_multisampleAntialiasing).toBool(); m_settings.m_rendererSamples = settings.value("rendererSamples", defaultSettings.m_rendererSamples).toInt(); @@ -118,7 +118,7 @@ void PDFViewerSettings::writeSettings(QSettings& settings) { settings.beginGroup("ViewerSettings"); settings.setValue("defaultDirectory", m_settings.m_directory); - settings.setValue("rendererFeatures", static_cast(m_settings.m_features)); + settings.setValue("rendererFeaturesv2", static_cast(m_settings.m_features)); settings.setValue("renderingEngine", static_cast(m_settings.m_rendererEngine)); settings.setValue("msaa", m_settings.m_multisampleAntialiasing); settings.setValue("rendererSamples", m_settings.m_rendererSamples); diff --git a/Pdf4QtViewerPlugins/RedactPlugin/createredacteddocumentdialog.cpp b/Pdf4QtViewerPlugins/RedactPlugin/createredacteddocumentdialog.cpp index 1c8bec1c..dbfe4720 100644 --- a/Pdf4QtViewerPlugins/RedactPlugin/createredacteddocumentdialog.cpp +++ b/Pdf4QtViewerPlugins/RedactPlugin/createredacteddocumentdialog.cpp @@ -57,7 +57,7 @@ QColor CreateRedactedDocumentDialog::getRedactColor() const if (ui->fillRedactedAreaCheckBox->isChecked()) { - color.fromString(ui->fillRedactedAreaColorEdit->text()); + color = QColor::fromString(ui->fillRedactedAreaColorEdit->text()); } return color; @@ -106,8 +106,8 @@ void CreateRedactedDocumentDialog::accept() { if (ui->fillRedactedAreaCheckBox->isChecked()) { - QColor color; - color.fromString(ui->fillRedactedAreaColorEdit->text()); + QColor color = QColor::fromString(ui->fillRedactedAreaColorEdit->text()); + if (!color.isValid()) { QMessageBox::critical(this, tr("Error"), tr("Cannot convert '%1' to color value.").arg(ui->fillRedactedAreaColorEdit->text())); diff --git a/RELEASES.txt b/RELEASES.txt index ec8d95c8..b33d00e7 100644 --- a/RELEASES.txt +++ b/RELEASES.txt @@ -1,4 +1,5 @@ CURRENT: + - Issue #137: Redaction - Cannot convert '#000000' to color value - Issue #134: Add search bar for actions - Issue #129: Cannot compile with lcms 2.16 - Issue #128: Create list of markup annotations