From kde-commits Sat Mar 31 21:09:21 2018 From: Gilles Caulier Date: Sat, 31 Mar 2018 21:09:21 +0000 To: kde-commits Subject: [digikam] core: krazy++ Message-Id: X-MARC-Message: https://marc.info/?l=kde-commits&m=152253057305096 Git commit 7bad50bea40cc58a1cad58e6a1874f034e5b5919 by Gilles Caulier. Committed on 31/03/2018 at 21:09. Pushed by cgilles into branch 'master'. krazy++ M +2 -2 core/libs/dimg/filters/icc/iccmanager.cpp M +2 -2 core/libs/dimg/filters/icc/iccprofile.h M +2 -2 core/libs/dimg/filters/icc/iccsettings.cpp M +1 -1 core/libs/dimg/loaders/jp2kloader.cpp M +1 -1 core/libs/dimg/loaders/jpegloader.cpp M +1 -1 core/libs/dimg/loaders/pngloader.cpp M +2 -2 core/libs/dimg/loaders/rawloader.cpp M +1 -1 core/libs/dimg/loaders/tiffloader.cpp M +1 -1 core/libs/dmetadata/dmetadata.cpp M +1 -1 core/libs/widgets/iccprofiles/iccprofilewidget.cpp M +1 -1 core/utilities/imageeditor/core/editorcore.cpp M +4 -4 core/utilities/imageeditor/dialogs/colorcorrectiondlg.cpp M +1 -1 core/utilities/imageeditor/dialogs/softproofdialog.cpp M +1 -1 core/utilities/imageeditor/editor/editorwindow.cpp M +1 -1 core/utilities/imageeditor/editor/imageiface.cpp M +1 -1 core/utilities/imageeditor/printiface/printoptionspage.cpp M +1 -1 core/utilities/imageeditor/tools/colors/profileconversiontoo= l.cpp M +1 -1 core/utilities/imageeditor/widgets/imagepreviewitem.cpp M +1 -1 core/utilities/imageeditor/widgets/imageregionitem.cpp M +1 -1 core/utilities/queuemanager/tools/color/iccconvert.cpp M +4 -4 core/utilities/setup/setupicc.cpp https://commits.kde.org/digikam/7bad50bea40cc58a1cad58e6a1874f034e5b5919 diff --git a/core/libs/dimg/filters/icc/iccmanager.cpp b/core/libs/dimg/fil= ters/icc/iccmanager.cpp index 872879dc98..5d1d39324f 100644 --- a/core/libs/dimg/filters/icc/iccmanager.cpp +++ b/core/libs/dimg/filters/icc/iccmanager.cpp @@ -73,7 +73,7 @@ IccManager::IccManager(DImg& image, const ICCSettingsCont= ainer& settings) } = d->embeddedProfile =3D d->image.getIccProfile(); - d->workspaceProfile =3D d->settings.workspaceProfile; + d->workspaceProfile =3D IccProfile(d->settings.workspaceProfile); = if (!d->workspaceProfile.open()) { @@ -260,7 +260,7 @@ IccProfile IccManager::imageProfile(ICCSettingsContaine= r::Behavior behavior, con } else if (behavior & ICCSettingsContainer::UseDefaultInputProfile) { - return d->settings.defaultInputProfile; + return IccProfile(d->settings.defaultInputProfile); } else if (behavior & ICCSettingsContainer::UseSpecifiedProfile) { diff --git a/core/libs/dimg/filters/icc/iccprofile.h b/core/libs/dimg/filte= rs/icc/iccprofile.h index ec2dbe7cbf..278ab6ff95 100644 --- a/core/libs/dimg/filters/icc/iccprofile.h +++ b/core/libs/dimg/filters/icc/iccprofile.h @@ -69,12 +69,12 @@ public: /** * Creates a profile from the given data in memory */ - IccProfile(const QByteArray& data); + explicit IccProfile(const QByteArray& data); = /** * Creates a profile from the given file */ - IccProfile(const QString& filePath); + explicit IccProfile(const QString& filePath); = /** * Returns the profiles available with RawEngine. You still need to ca= ll open() on them. diff --git a/core/libs/dimg/filters/icc/iccsettings.cpp b/core/libs/dimg/fi= lters/icc/iccsettings.cpp index 252b567acc..1d661d379b 100644 --- a/core/libs/dimg/filters/icc/iccsettings.cpp +++ b/core/libs/dimg/filters/icc/iccsettings.cpp @@ -142,7 +142,7 @@ IccProfile IccSettings::monitorProfile(QWidget* const w= idget) = if (!d->settings.monitorProfile.isNull()) { - return d->settings.monitorProfile; + return IccProfile(d->settings.monitorProfile); } else { @@ -251,7 +251,7 @@ IccProfile IccSettings::Private::profileFromWindowSyste= m(QWidget* const widget) = if (!bytes.isEmpty()) { - profile =3D bytes; + profile =3D IccProfile(bytes); } = qCDebug(DIGIKAM_DIMG_LOG) << "Found X.org XICC monitor profile " <= < profile.description(); diff --git a/core/libs/dimg/loaders/jp2kloader.cpp b/core/libs/dimg/loaders= /jp2kloader.cpp index 6ef1e40ade..21dcc7a197 100644 --- a/core/libs/dimg/loaders/jp2kloader.cpp +++ b/core/libs/dimg/loaders/jp2kloader.cpp @@ -556,7 +556,7 @@ bool JP2KLoader::load(const QString& filePath, DImgLoad= erObserver* const observe QByteArray profile_rawdata; profile_rawdata.resize(blob->len_); memcpy(profile_rawdata.data(), blob->buf_, blob->l= en_); - imageSetIccProfile(profile_rawdata); + imageSetIccProfile(IccProfile(profile_rawdata)); jas_stream_close(icc_stream); } } diff --git a/core/libs/dimg/loaders/jpegloader.cpp b/core/libs/dimg/loaders= /jpegloader.cpp index 442ce592ea..d6bb7b4c92 100644 --- a/core/libs/dimg/loaders/jpegloader.cpp +++ b/core/libs/dimg/loaders/jpegloader.cpp @@ -582,7 +582,7 @@ bool JPEGLoader::load(const QString& filePath, DImgLoad= erObserver* const observe QByteArray profile_rawdata; profile_rawdata.resize(profile_size); memcpy(profile_rawdata.data(), profile_data, profile_size); - imageSetIccProfile(profile_rawdata); + imageSetIccProfile(IccProfile(profile_rawdata)); free(profile_data); } else diff --git a/core/libs/dimg/loaders/pngloader.cpp b/core/libs/dimg/loaders/= pngloader.cpp index 605b120ac4..198405ddff 100644 --- a/core/libs/dimg/loaders/pngloader.cpp +++ b/core/libs/dimg/loaders/pngloader.cpp @@ -531,7 +531,7 @@ bool PNGLoader::load(const QString& filePath, DImgLoade= rObserver* const observer QByteArray profile_rawdata; profile_rawdata.resize(profile_size); memcpy(profile_rawdata.data(), profile_data, profile_size); - imageSetIccProfile(profile_rawdata); + imageSetIccProfile(IccProfile(profile_rawdata)); } else { diff --git a/core/libs/dimg/loaders/rawloader.cpp b/core/libs/dimg/loaders/= rawloader.cpp index 5f686be2df..a67bd7c074 100644 --- a/core/libs/dimg/loaders/rawloader.cpp +++ b/core/libs/dimg/loaders/rawloader.cpp @@ -96,7 +96,7 @@ bool RAWLoader::load(const QString& filePath, DImgLoaderO= bserver* const observer { // Specifying a custom output is broken somewhere. We use = the extremely // wide gamut pro photo profile for 16bit (sRGB for 8bit) = and convert afterwards. - m_filter->setOutputProfile(m_decoderSettings.outputProfile= ); + m_filter->setOutputProfile(IccProfile(m_decoderSettings.ou= tputProfile)); = if (m_decoderSettings.sixteenBitsImage) { @@ -291,7 +291,7 @@ bool RAWLoader::loadedFromRawData(const QByteArray& dat= a, int width, int height, = case DRawDecoderSettings::CUSTOMOUTPUTCS: { - imageSetIccProfile(m_decoderSettings.outputProfile); + imageSetIccProfile(IccProfile(m_decoderSettings.outputProfile)= ); break; } = diff --git a/core/libs/dimg/loaders/tiffloader.cpp b/core/libs/dimg/loaders= /tiffloader.cpp index dd095fd0e1..d03d57c381 100644 --- a/core/libs/dimg/loaders/tiffloader.cpp +++ b/core/libs/dimg/loaders/tiffloader.cpp @@ -264,7 +264,7 @@ bool TIFFLoader::load(const QString& filePath, DImgLoad= erObserver* const observe QByteArray profile_rawdata; profile_rawdata.resize(profile_size); memcpy(profile_rawdata.data(), profile_data, profile_size); - imageSetIccProfile(profile_rawdata); + imageSetIccProfile(IccProfile(profile_rawdata)); } else { diff --git a/core/libs/dmetadata/dmetadata.cpp b/core/libs/dmetadata/dmetad= ata.cpp index 2cab420538..45bb8a2200 100644 --- a/core/libs/dmetadata/dmetadata.cpp +++ b/core/libs/dmetadata/dmetadata.cpp @@ -2260,7 +2260,7 @@ IccProfile DMetadata::getIccProfile() const if (!data.isNull()) { qCDebug(DIGIKAM_METAENGINE_LOG) << "Found an ICC profile in Exif m= etadata"; - return data; + return IccProfile(data); } = // Else check the Exif color-space tag and use default profiles that w= e ship diff --git a/core/libs/widgets/iccprofiles/iccprofilewidget.cpp b/core/libs= /widgets/iccprofiles/iccprofilewidget.cpp index ae0dd64124..81efca03ee 100644 --- a/core/libs/widgets/iccprofiles/iccprofilewidget.cpp +++ b/core/libs/widgets/iccprofiles/iccprofilewidget.cpp @@ -258,7 +258,7 @@ bool ICCProfileWidget::loadFromURL(const QUrl& url) bool ICCProfileWidget::loadFromProfileData(const QString& fileName, const = QByteArray& data) { setFileName(fileName); - return(setProfile(data)); + return(setProfile(IccProfile(data))); } = bool ICCProfileWidget::loadProfile(const QString& fileName, const IccProfi= le& profile) diff --git a/core/utilities/imageeditor/core/editorcore.cpp b/core/utilitie= s/imageeditor/core/editorcore.cpp index d047130a3a..b2908766af 100644 --- a/core/utilities/imageeditor/core/editorcore.cpp +++ b/core/utilities/imageeditor/core/editorcore.cpp @@ -843,7 +843,7 @@ QPixmap EditorCore::convertToPixmap(DImg& img) const = if (d->doSoftProofing) { - transform =3D manager.displaySoftProofingTransform(d->cmSettin= gs.defaultProofProfile); + transform =3D manager.displaySoftProofingTransform(IccProfile(= d->cmSettings.defaultProofProfile)); } else { diff --git a/core/utilities/imageeditor/dialogs/colorcorrectiondlg.cpp b/co= re/utilities/imageeditor/dialogs/colorcorrectiondlg.cpp index da8351c253..1b8cb542dc 100644 --- a/core/utilities/imageeditor/dialogs/colorcorrectiondlg.cpp +++ b/core/utilities/imageeditor/dialogs/colorcorrectiondlg.cpp @@ -522,7 +522,7 @@ QWidget* ColorCorrectionDlg::createAssumeOptions() const = d->imageProfileBox =3D new IccProfilesComboBox; d->imageProfileBox->addProfilesSqueezed(IccSettings::instance()->i= nputProfiles()); - d->imageProfileBox->setCurrentProfile(IccSettings::instance()->set= tings().defaultInputProfile); + d->imageProfileBox->setCurrentProfile(IccProfile(IccSettings::inst= ance()->settings().defaultInputProfile)); d->imageProfileBox->setNoProfileIfEmpty(i18n("No Input Profile Ava= ilable")); = grid->addWidget(label); @@ -785,7 +785,7 @@ void ColorCorrectionDlg::readSettings() = if (!settings.lastSpecifiedAssignProfile.isEmpty()) { - d->otherProfileBox->setCurrentProfile(settings.lastSpecifiedAs= signProfile); + d->otherProfileBox->setCurrentProfile(IccProfile(settings.last= SpecifiedAssignProfile)); } } else if (d->mode =3D=3D MissingProfile) @@ -828,12 +828,12 @@ void ColorCorrectionDlg::readSettings() = if (!settings.lastSpecifiedInputProfile.isEmpty()) { - d->imageProfileBox->setCurrentProfile(settings.lastSpecifiedIn= putProfile); + d->imageProfileBox->setCurrentProfile(IccProfile(settings.last= SpecifiedInputProfile)); } } else if (d->mode =3D=3D UncalibratedColor) { - d->imageProfileBox->setCurrentProfile(settings.lastSpecifiedInputP= rofile); + d->imageProfileBox->setCurrentProfile(IccProfile(settings.lastSpec= ifiedInputProfile)); d->imageProfileBox->setFocus(); } } diff --git a/core/utilities/imageeditor/dialogs/softproofdialog.cpp b/core/= utilities/imageeditor/dialogs/softproofdialog.cpp index f1933d17e9..750a605e17 100644 --- a/core/utilities/imageeditor/dialogs/softproofdialog.cpp +++ b/core/utilities/imageeditor/dialogs/softproofdialog.cpp @@ -210,7 +210,7 @@ void SoftProofDialog::updateOkButtonState() void SoftProofDialog::readSettings() { ICCSettingsContainer settings =3D IccSettings::instance()->settings(); - d->deviceProfileBox->setCurrentProfile(settings.defaultProofProfile); + d->deviceProfileBox->setCurrentProfile(IccProfile(settings.defaultProo= fProfile)); d->proofingIntentBox->setIntent(settings.proofingRenderingIntent); d->gamutCheckBox->setChecked(settings.doGamutCheck); d->maskColorBtn->setColor(settings.gamutCheckMaskColor); diff --git a/core/utilities/imageeditor/editor/editorwindow.cpp b/core/util= ities/imageeditor/editor/editorwindow.cpp index fe914b029d..478362defa 100644 --- a/core/utilities/imageeditor/editor/editorwindow.cpp +++ b/core/utilities/imageeditor/editor/editorwindow.cpp @@ -3444,7 +3444,7 @@ void EditorWindow::slotUpdateColorSpaceMenu() = foreach(const QString& path, favoriteProfilePaths) { - favoriteProfiles << path; + favoriteProfiles << IccProfile(path); } = d->profileMenuAction->addProfiles(favoriteProfiles); diff --git a/core/utilities/imageeditor/editor/imageiface.cpp b/core/utilit= ies/imageeditor/editor/imageiface.cpp index 5d3544c3f7..6f7d8e8632 100644 --- a/core/utilities/imageeditor/editor/imageiface.cpp +++ b/core/utilities/imageeditor/editor/imageiface.cpp @@ -382,7 +382,7 @@ void ImageIface::paint(QPaintDevice* const device, cons= t QRect& rect, QPainter* = if (doSoftProofing) { - monitorICCtrans =3D manager.displaySoftProofingTransform(i= ccSettings.defaultProofProfile); + monitorICCtrans =3D manager.displaySoftProofingTransform(I= ccProfile(iccSettings.defaultProofProfile)); } else { diff --git a/core/utilities/imageeditor/printiface/printoptionspage.cpp b/c= ore/utilities/imageeditor/printiface/printoptionspage.cpp index 716c942785..b13857d6f8 100644 --- a/core/utilities/imageeditor/printiface/printoptionspage.cpp +++ b/core/utilities/imageeditor/printiface/printoptionspage.cpp @@ -326,7 +326,7 @@ void PrintOptionsPage::loadConfig() = d->colorManaged->setChecked(PrintConfig::printColorManaged()); ICCSettingsContainer settings =3D IccSettings::instance()->settings(); - d->outputProfile =3D settings.defaultProofProfile; + d->outputProfile =3D IccProfile(settings.defaultProofProf= ile); d->cmEnabled =3D settings.enableCM; } = diff --git a/core/utilities/imageeditor/tools/colors/profileconversiontool.= cpp b/core/utilities/imageeditor/tools/colors/profileconversiontool.cpp index 5251a303be..42cdd013c4 100644 --- a/core/utilities/imageeditor/tools/colors/profileconversiontool.cpp +++ b/core/utilities/imageeditor/tools/colors/profileconversiontool.cpp @@ -187,7 +187,7 @@ void ProfileConversionTool::readSettings() { KSharedConfig::Ptr config =3D KSharedConfig::openConfig(); KConfigGroup group =3D config->group(d->configGroupName); - d->profilesBox->setCurrentProfile(group.readPathEntry(d->configProfile= Entry, d->currentProfile.filePath())); + d->profilesBox->setCurrentProfile(IccProfile(group.readPathEntry(d->co= nfigProfileEntry, d->currentProfile.filePath()))); d->profilesBox->readSettings(group); } = diff --git a/core/utilities/imageeditor/widgets/imagepreviewitem.cpp b/core= /utilities/imageeditor/widgets/imagepreviewitem.cpp index ac994c3dcb..6438b4f4bd 100644 --- a/core/utilities/imageeditor/widgets/imagepreviewitem.cpp +++ b/core/utilities/imageeditor/widgets/imagepreviewitem.cpp @@ -125,7 +125,7 @@ void ImagePreviewItem::paint(QPainter* painter, const Q= StyleOptionGraphicsItem* = if (doSoftProofing) { - monitorICCtrans =3D manager.displaySoftProofingTransform(i= ccSettings.defaultProofProfile, widget); + monitorICCtrans =3D manager.displaySoftProofingTransform(I= ccProfile(iccSettings.defaultProofProfile), widget); } else { diff --git a/core/utilities/imageeditor/widgets/imageregionitem.cpp b/core/= utilities/imageeditor/widgets/imageregionitem.cpp index 6be69adaf7..182c807e35 100644 --- a/core/utilities/imageeditor/widgets/imageregionitem.cpp +++ b/core/utilities/imageeditor/widgets/imageregionitem.cpp @@ -149,7 +149,7 @@ void ImageRegionItem::paint(QPainter* painter, const QS= tyleOptionGraphicsItem* o = if (doSoftProofing) { - monitorICCtrans =3D manager.displaySoftProofingTransform(i= ccSettings.defaultProofProfile, widget); + monitorICCtrans =3D manager.displaySoftProofingTransform(I= ccProfile(iccSettings.defaultProofProfile), widget); } else { diff --git a/core/utilities/queuemanager/tools/color/iccconvert.cpp b/core/= utilities/queuemanager/tools/color/iccconvert.cpp index d257f258e4..1b84882537 100644 --- a/core/utilities/queuemanager/tools/color/iccconvert.cpp +++ b/core/utilities/queuemanager/tools/color/iccconvert.cpp @@ -85,7 +85,7 @@ BatchToolSettings IccConvert::defaultSettings() void IccConvert::slotAssignSettings2Widget() { QString profPath =3D settings()[QLatin1String("ProfilePath")].toString= (); - m_settingsView->setCurrentProfile(profPath); + m_settingsView->setCurrentProfile(IccProfile(profPath)); } = void IccConvert::slotSettingsChanged() diff --git a/core/utilities/setup/setupicc.cpp b/core/utilities/setup/setup= icc.cpp index cfc0e87371..5322032395 100644 --- a/core/utilities/setup/setupicc.cpp +++ b/core/utilities/setup/setupicc.cpp @@ -689,9 +689,9 @@ void SetupICC::readSettings(bool restore) d->defaultPathKU->setFileDlgPath(settings.iccFolder); fillCombos(false); = - d->workProfilesKC->setCurrentProfile(settings.workspaceProfile); - d->inProfilesKC->setCurrentProfile(settings.defaultInputProfile); - d->proofProfilesKC->setCurrentProfile(settings.defaultProofProfile); + d->workProfilesKC->setCurrentProfile(IccProfile(settings.workspaceProf= ile)); + d->inProfilesKC->setCurrentProfile(IccProfile(settings.defaultInputPro= file)); + d->proofProfilesKC->setCurrentProfile(IccProfile(settings.defaultProof= Profile)); = if (IccSettings::instance()->monitorProfileFromSystem()) { @@ -700,7 +700,7 @@ void SetupICC::readSettings(bool restore) } else { - d->monitorProfilesKC->setCurrentProfile(settings.monitorProfile); + d->monitorProfilesKC->setCurrentProfile(IccProfile(settings.monito= rProfile)); } } =20