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

Merge master into gtk3

Browse Source
This commit is contained in:
heckflosse
2016-10-28 17:59:47 +02:00
parent 5244c44420 3a346d919d
commit b16ef8d1f5
259 changed files with 5061 additions and 3654 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rtgui/exifpanel.cc
View File

@@ -25,7 +25,7 @@ using namespace rtengine;
using namespace rtengine::procparams;
using namespace rtexif;
ExifPanel::ExifPanel () : idata(NULL)
ExifPanel::ExifPanel () : idata(nullptr)
{
recursiveOp = true;
@@ -175,7 +175,7 @@ void ExifPanel::setImageData (const ImageMetaData* id)
idata = id;
exifTreeModel->clear ();
const std::vector<Tag*> defTags = ExifManager::getDefaultTIFFTags (NULL);
const std::vector<Tag*> defTags = ExifManager::getDefaultTIFFTags (nullptr);
for (size_t i = 0; i < defTags.size(); i++) {
Tag* defTag = defTags[i];
@@ -601,7 +601,7 @@ void ExifPanel::updateChangeList (Gtk::TreeModel::Children root, std::string pre
Gtk::TreeModel::iterator iter;
for (iter = root.begin(); iter != root.end(); ++iter) {
if (iter->get_value (exifColumns.edited) == true) {
if (iter->get_value (exifColumns.edited)) {
changeList[ prefix + iter->get_value (exifColumns.field_nopango) ] = iter->get_value (exifColumns.value_nopango);
} else if (iter->get_value (exifColumns.action) == AC_WRITE && iter->get_value (exifColumns.icon) == delicon) {
changeList[ prefix + iter->get_value (exifColumns.field_nopango) ] = "#delete";