Merge branch 'master' into 'gtk3'
This commit is contained in:
@@ -22,14 +22,13 @@
|
||||
#include "cursormanager.h"
|
||||
#include "guiutils.h"
|
||||
#include "options.h"
|
||||
#include "../rtengine/safegtk.h"
|
||||
#include "../rtengine/previewimage.h"
|
||||
|
||||
extern Options options;
|
||||
|
||||
InspectorBuffer::InspectorBuffer(const Glib::ustring &imagePath) : currTransform(0), fromRaw(false)
|
||||
{
|
||||
if (!imagePath.empty() && safe_file_test(imagePath, Glib::FILE_TEST_EXISTS) && !safe_file_test(imagePath, Glib::FILE_TEST_IS_DIR)) {
|
||||
if (!imagePath.empty() && Glib::file_test(imagePath, Glib::FILE_TEST_EXISTS) && !Glib::file_test(imagePath, Glib::FILE_TEST_IS_DIR)) {
|
||||
imgPath = imagePath;
|
||||
|
||||
// generate thumbnail image
|
||||
|
Reference in New Issue
Block a user