Fix some more compiler warnings

This commit is contained in:
Lawrence Lee 2024-11-18 23:42:33 -08:00
parent 721d664136
commit 29a344aef1
No known key found for this signature in database
GPG Key ID: F457B4971BE3C53C
6 changed files with 58 additions and 4 deletions

View File

@ -299,6 +299,7 @@ void setUserOnlyPermission(const Glib::RefPtr<Gio::File> file, bool execute)
.grfAccessPermissions = FILE_ALL_ACCESS, .grfAccessPermissions = FILE_ALL_ACCESS,
.grfAccessMode = GRANT_ACCESS, .grfAccessMode = GRANT_ACCESS,
.grfInheritance = NO_INHERITANCE, .grfInheritance = NO_INHERITANCE,
.Trustee = {},
}; };
BuildTrusteeWithSid(&(ea.Trustee), user_sid); BuildTrusteeWithSid(&(ea.Trustee), user_sid);
PACL new_dacl_raw = nullptr; PACL new_dacl_raw = nullptr;

View File

@ -370,7 +370,7 @@ void Options::setDefaults()
maxZoomLimit = MaxZoom::PERCENTS_1600; maxZoomLimit = MaxZoom::PERCENTS_1600;
#ifdef _WIN32 #ifdef _WIN32
// use windows setting for visibility of hidden files/folders // use windows setting for visibility of hidden files/folders
SHELLFLAGSTATE sft = { 0 }; SHELLFLAGSTATE sft = { };
SHGetSettings(&sft, SSF_SHOWALLOBJECTS); SHGetSettings(&sft, SSF_SHOWALLOBJECTS);
fbShowHidden = sft.fShowAllObjects; fbShowHidden = sft.fShowAllObjects;
#else #else

View File

@ -314,7 +314,7 @@ Gtk::TreeIter ProfileStoreComboBox::getRowFromLabel (const Glib::ustring &name)
const ProfileStoreEntry *pse = currRow[methodColumns.profileStoreEntry]; const ProfileStoreEntry *pse = currRow[methodColumns.profileStoreEntry];
if (pse->label == name) { if (pse->label == name) {
return std::move(currRow); return currRow;
} }
} }
} }

View File

@ -87,7 +87,7 @@ Cairo::RefPtr<Cairo::ImageSurface> RTScalable::loadSurfaceFromIcon(const Glib::u
// Create surface from corresponding icon // Create surface from corresponding icon
const auto pos = iconPath.find_last_of('.'); const auto pos = iconPath.find_last_of('.');
if (pos >= 0 && pos < iconPath.length()) { if (pos < iconPath.length()) {
const auto fext = iconPath.substr(pos + 1, iconPath.length()).lowercase(); const auto fext = iconPath.substr(pos + 1, iconPath.length()).lowercase();
// Case where iconPath is a PNG file // Case where iconPath is a PNG file

View File

@ -57,7 +57,7 @@ RTSurface::RTSurface(const Glib::ustring &fname) :
// Create surface based on file extension // Create surface based on file extension
const auto pos = fname.find_last_of('.'); const auto pos = fname.find_last_of('.');
if (pos >= 0 && pos < fname.length()) { if (pos < fname.length()) {
const auto fext = fname.substr(pos + 1, fname.length()).lowercase(); const auto fext = fname.substr(pos + 1, fname.length()).lowercase();
// Case where fname is a PNG file // Case where fname is a PNG file

View File

@ -40,126 +40,161 @@ using ToolTree = ToolPanelCoordinator::ToolTree;
const std::vector<ToolTree> EXPOSURE_PANEL_TOOLS = { const std::vector<ToolTree> EXPOSURE_PANEL_TOOLS = {
{ {
.id = Tool::TONE_CURVE, .id = Tool::TONE_CURVE,
.children = {},
}, },
{ {
.id = Tool::SHADOWS_HIGHLIGHTS, .id = Tool::SHADOWS_HIGHLIGHTS,
.children = {},
}, },
{ {
.id = Tool::TONE_EQUALIZER, .id = Tool::TONE_EQUALIZER,
.children = {},
}, },
{ {
.id = Tool::EPD, .id = Tool::EPD,
.children = {},
}, },
{ {
.id = Tool::FATTAL, .id = Tool::FATTAL,
.children = {},
}, },
{ {
.id = Tool::PC_VIGNETTE, .id = Tool::PC_VIGNETTE,
.children = {},
}, },
{ {
.id = Tool::GRADIENT, .id = Tool::GRADIENT,
.children = {},
}, },
{ {
.id = Tool::L_CURVE, .id = Tool::L_CURVE,
.children = {},
}, },
}; };
const std::vector<ToolTree> DETAILS_PANEL_TOOLS = { const std::vector<ToolTree> DETAILS_PANEL_TOOLS = {
{ {
.id = Tool::SPOT, .id = Tool::SPOT,
.children = {},
}, },
{ {
.id = Tool::SHARPENING_TOOL, .id = Tool::SHARPENING_TOOL,
.children = {},
}, },
{ {
.id = Tool::LOCAL_CONTRAST, .id = Tool::LOCAL_CONTRAST,
.children = {},
}, },
{ {
.id = Tool::SHARPEN_EDGE, .id = Tool::SHARPEN_EDGE,
.children = {},
}, },
{ {
.id = Tool::SHARPEN_MICRO, .id = Tool::SHARPEN_MICRO,
.children = {},
}, },
{ {
.id = Tool::IMPULSE_DENOISE, .id = Tool::IMPULSE_DENOISE,
.children = {},
}, },
{ {
.id = Tool::DIR_PYR_DENOISE, .id = Tool::DIR_PYR_DENOISE,
.children = {},
}, },
{ {
.id = Tool::DEFRINGE_TOOL, .id = Tool::DEFRINGE_TOOL,
.children = {},
}, },
{ {
.id = Tool::DIR_PYR_EQUALIZER, .id = Tool::DIR_PYR_EQUALIZER,
.children = {},
}, },
{ {
.id = Tool::DEHAZE, .id = Tool::DEHAZE,
.children = {},
}, },
}; };
const std::vector<ToolTree> COLOR_PANEL_TOOLS = { const std::vector<ToolTree> COLOR_PANEL_TOOLS = {
{ {
.id = Tool::WHITE_BALANCE, .id = Tool::WHITE_BALANCE,
.children = {},
}, },
{ {
.id = Tool::VIBRANCE, .id = Tool::VIBRANCE,
.children = {},
}, },
{ {
.id = Tool::CH_MIXER, .id = Tool::CH_MIXER,
.children = {},
}, },
{ {
.id = Tool::BLACK_WHITE, .id = Tool::BLACK_WHITE,
.children = {},
}, },
{ {
.id = Tool::HSV_EQUALIZER, .id = Tool::HSV_EQUALIZER,
.children = {},
}, },
{ {
.id = Tool::FILM_SIMULATION, .id = Tool::FILM_SIMULATION,
.children = {},
}, },
{ {
.id = Tool::FILM_NEGATIVE, .id = Tool::FILM_NEGATIVE,
.children = {},
}, },
{ {
.id = Tool::SOFT_LIGHT, .id = Tool::SOFT_LIGHT,
.children = {},
}, },
{ {
.id = Tool::RGB_CURVES, .id = Tool::RGB_CURVES,
.children = {},
}, },
{ {
.id = Tool::COLOR_TONING, .id = Tool::COLOR_TONING,
.children = {},
}, },
{ {
.id = Tool::ICM, .id = Tool::ICM,
.children = {},
}, },
}; };
const std::vector<ToolTree> ADVANCED_PANEL_TOOLS = { const std::vector<ToolTree> ADVANCED_PANEL_TOOLS = {
{ {
.id = Tool::RETINEX_TOOL, .id = Tool::RETINEX_TOOL,
.children = {},
}, },
{ {
.id = Tool::COLOR_APPEARANCE, .id = Tool::COLOR_APPEARANCE,
.children = {},
}, },
{ {
.id = Tool::WAVELET, .id = Tool::WAVELET,
.children = {},
}, },
}; };
const std::vector<ToolTree> LOCALLAB_PANEL_TOOLS = { const std::vector<ToolTree> LOCALLAB_PANEL_TOOLS = {
{ {
.id = Tool::LOCALLAB, .id = Tool::LOCALLAB,
.children = {},
}, },
}; };
const std::vector<ToolTree> TRANSFORM_PANEL_TOOLS = { const std::vector<ToolTree> TRANSFORM_PANEL_TOOLS = {
{ {
.id = Tool::CROP_TOOL, .id = Tool::CROP_TOOL,
.children = {},
}, },
{ {
.id = Tool::RESIZE_TOOL, .id = Tool::RESIZE_TOOL,
.children = { .children = {
{ {
.id = Tool::PR_SHARPENING, .id = Tool::PR_SHARPENING,
.children = {},
}, },
}, },
}, },
@ -168,21 +203,27 @@ const std::vector<ToolTree> TRANSFORM_PANEL_TOOLS = {
.children = { .children = {
{ {
.id = Tool::ROTATE, .id = Tool::ROTATE,
.children = {},
}, },
{ {
.id = Tool::PERSPECTIVE, .id = Tool::PERSPECTIVE,
.children = {},
}, },
{ {
.id = Tool::LENS_PROF, .id = Tool::LENS_PROF,
.children = {},
}, },
{ {
.id = Tool::DISTORTION, .id = Tool::DISTORTION,
.children = {},
}, },
{ {
.id = Tool::CA_CORRECTION, .id = Tool::CA_CORRECTION,
.children = {},
}, },
{ {
.id = Tool::VIGNETTING, .id = Tool::VIGNETTING,
.children = {},
}, },
}, },
}, },
@ -195,15 +236,19 @@ const std::vector<ToolTree> RAW_PANEL_TOOLS = {
{ {
{ {
.id = Tool::BAYER_PROCESS, .id = Tool::BAYER_PROCESS,
.children = {},
}, },
{ {
.id = Tool::BAYER_RAW_EXPOSURE, .id = Tool::BAYER_RAW_EXPOSURE,
.children = {},
}, },
{ {
.id = Tool::BAYER_PREPROCESS, .id = Tool::BAYER_PREPROCESS,
.children = {},
}, },
{ {
.id = Tool::RAW_CA_CORRECTION, .id = Tool::RAW_CA_CORRECTION,
.children = {},
}, },
}, },
}, },
@ -214,30 +259,38 @@ const std::vector<ToolTree> RAW_PANEL_TOOLS = {
{ {
{ {
.id = Tool::XTRANS_PROCESS, .id = Tool::XTRANS_PROCESS,
.children = {},
}, },
{ {
.id = Tool::XTRANS_RAW_EXPOSURE, .id = Tool::XTRANS_RAW_EXPOSURE,
.children = {},
}, },
}, },
}, },
}, },
{ {
.id = Tool::RAW_EXPOSURE, .id = Tool::RAW_EXPOSURE,
.children = {},
}, },
{ {
.id = Tool::PREPROCESS_WB, .id = Tool::PREPROCESS_WB,
.children = {},
}, },
{ {
.id = Tool::PREPROCESS, .id = Tool::PREPROCESS,
.children = {},
}, },
{ {
.id = Tool::DARKFRAME_TOOL, .id = Tool::DARKFRAME_TOOL,
.children = {},
}, },
{ {
.id = Tool::FLATFIELD_TOOL, .id = Tool::FLATFIELD_TOOL,
.children = {},
}, },
{ {
.id = Tool::PD_SHARPENING, .id = Tool::PD_SHARPENING,
.children = {},
}, },
}; };