liz/rawTherapee
liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

do not save IPTC tags in the arp if they are unchanged

Browse Source 
(cherry picked from commit c4c642794868c2b03fd824acc0a7db962162c16f)
This commit is contained in:
Alberto Griggio 2021-11-17 05:22:00 -08:00 committed by Lawrence Lee
parent 2ce81cccc5
commit a0e9a59606
No known key found for this signature in database
GPG Key ID: 048FF2B76A63895F
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
rtgui/iptcpanel.cc
View File

@ -461,34 +461,41 @@ IPTCPanel::IPTCPanel():
show_all(); show_all();
} }
void IPTCPanel::read (const ProcParams* pp, const ParamsEdited* pedited) void IPTCPanel::read (const ProcParams* pp, const ParamsEdited* pedited)
{ {
disableListener(); disableListener();
changeList->clear(); changeList->clear();
if (!pp->metadata.iptc.empty()) { if (!pp->metadata.iptc.empty()) {
*changeList = pp->metadata.iptc; *changeList = pp->metadata.iptc;
changelist_valid_ = true;
} else { } else {
*changeList = *embeddedData; *changeList = *embeddedData;
changelist_valid_ = false;
} }
applyChangeList(); applyChangeList();
enableListener(); enableListener();
} }
void IPTCPanel::write (ProcParams* pp, ParamsEdited* pedited) void IPTCPanel::write (ProcParams* pp, ParamsEdited* pedited)
{ {
if (changelist_valid_) {
pp->metadata.iptc = *changeList; pp->metadata.iptc = *changeList;
} else {
pp->metadata.iptc.clear();
} }
}
void IPTCPanel::setDefaults (const ProcParams* defParams, const ParamsEdited* pedited) void IPTCPanel::setDefaults (const ProcParams* defParams, const ParamsEdited* pedited)
{ {
*defChangeList = defParams->metadata.iptc; *defChangeList = defParams->metadata.iptc;
} }
void IPTCPanel::setImageData(const FramesMetaData* id) void IPTCPanel::setImageData(const FramesMetaData* id)
{ {
embeddedData->clear(); embeddedData->clear();
@ -510,9 +517,9 @@ void IPTCPanel::setImageData(const FramesMetaData* id)
file->set_sensitive(!embeddedData->empty()); file->set_sensitive(!embeddedData->empty());
} }
void IPTCPanel::notifyListener() void IPTCPanel::notifyListener()
{ {
if (listener) { if (listener) {
listener->panelChanged(EvIPTC, M("HISTORY_CHANGED")); listener->panelChanged(EvIPTC, M("HISTORY_CHANGED"));
} }
@ -628,7 +635,7 @@ void IPTCPanel::delSuppCategory()
void IPTCPanel::updateChangeList() void IPTCPanel::updateChangeList()
{ {
changelist_valid_ = true;
changeList->clear(); changeList->clear();
(*changeList)[CAPTION].push_back(captionText->get_text()); (*changeList)[CAPTION].push_back(captionText->get_text());
(*changeList)[CAPTION_WRITER].push_back(captionWriter->get_text()); (*changeList)[CAPTION_WRITER].push_back(captionWriter->get_text());
@ -756,9 +763,9 @@ void IPTCPanel::applyChangeList()
void IPTCPanel::resetClicked() void IPTCPanel::resetClicked()
{ {
disableListener(); disableListener();
*changeList = *defChangeList; *changeList = *defChangeList;
changelist_valid_ = false;
applyChangeList(); applyChangeList();
enableListener(); enableListener();
notifyListener(); notifyListener();

1
rtgui/iptcpanel.h
View File

@ -34,6 +34,7 @@ private:
const std::unique_ptr<rtengine::procparams::IPTCPairs> changeList; const std::unique_ptr<rtengine::procparams::IPTCPairs> changeList;
const std::unique_ptr<rtengine::procparams::IPTCPairs> defChangeList; const std::unique_ptr<rtengine::procparams::IPTCPairs> defChangeList;
const std::unique_ptr<rtengine::procparams::IPTCPairs> embeddedData; const std::unique_ptr<rtengine::procparams::IPTCPairs> embeddedData;
bool changelist_valid_;
Gtk::TextView* captionView; Gtk::TextView* captionView;
Glib::RefPtr<Gtk::TextBuffer> captionText; Glib::RefPtr<Gtk::TextBuffer> captionText;