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

18
rtgui/inspector.cc
View File

@@ -59,7 +59,7 @@ InspectorBuffer::~InspectorBuffer() {
int InspectorBuffer::infoFromImage (const Glib::ustring& fname)
{
rtengine::ImageMetaData* idata = rtengine::ImageMetaData::fromFile (fname, NULL);
rtengine::ImageMetaData* idata = rtengine::ImageMetaData::fromFile (fname, nullptr);
if (!idata) {
return 0;
@@ -81,7 +81,7 @@ int InspectorBuffer::infoFromImage (const Glib::ustring& fname)
return deg;
}
Inspector::Inspector () : currImage(NULL), zoom(0.0), active(false)
Inspector::Inspector () : currImage(nullptr), zoom(0.0), active(false)
{
Glib::RefPtr<Gtk::StyleContext> style = get_style_context();
style->add_class(GTK_STYLE_CLASS_BACKGROUND);
@@ -216,7 +216,7 @@ void Inspector::switchImage (const Glib::ustring &fullPath)
// deleting the last entries
for (size_t i = images.size() - 1; i > size_t(options.maxInspectorBuffers - 1); --i) {
delete images.at(i);
images.at(i) = NULL;
images.at(i) = nullptr;
}
// resizing down
@@ -224,14 +224,14 @@ void Inspector::switchImage (const Glib::ustring &fullPath)
}
if (fullPath.empty()) {
currImage = NULL;
currImage = nullptr;
queue_draw();
return;
} else {
bool found = false;
for (size_t i = 0; i < images.size(); ++i) {
if (images.at(i) != NULL && images.at(i)->imgPath == fullPath) {
if (images.at(i) != nullptr && images.at(i)->imgPath == fullPath) {
currImage = images.at(i);
// rolling the list 1 step to the beginning
@@ -260,7 +260,7 @@ void Inspector::switchImage (const Glib::ustring &fullPath)
images.push_back(iBuffer);
currImage = images.at(images.size() - 1);
} else {
currImage = NULL;
currImage = nullptr;
}
}
}
@@ -269,14 +269,14 @@ void Inspector::switchImage (const Glib::ustring &fullPath)
void Inspector::deleteBuffers ()
{
for (size_t i = 0; i < images.size(); ++i) {
if (images.at(i) != NULL) {
if (images.at(i) != nullptr) {
delete images.at(i);
images.at(i) = NULL;
images.at(i) = nullptr;
}
}
images.resize(0);
currImage = NULL;
currImage = nullptr;
}
void Inspector::flushBuffers ()