Merge remote-tracking branch 'origin/fix-warnings-5.9' into fix-warnings-5.12

This commit is contained in:
Lawrence Lee
2024-11-16 22:27:29 -08:00
9 changed files with 115 additions and 111 deletions

View File

@@ -273,6 +273,7 @@ int processLineParams ( int argc, char **argv )
case 'O':
copyParamsFile = true;
// fall through
case 'o': // outputfile or dir
if ( iArg + 1 < argc ) {
@@ -324,6 +325,7 @@ int processLineParams ( int argc, char **argv )
case 'S':
skipIfNoSidecar = true;
// fall through
case 's': // Processing params next to file (file extension appended)
sideProcParams = true;

View File

@@ -149,7 +149,7 @@ int processLineParams ( int argc, char **argv )
break;
}
// no break here on purpose
// fall through
case 'h':
case '?':

View File

@@ -1598,7 +1598,8 @@ void MyFlatCurve::movePoint(bool moveX, bool moveY, bool pipetteDrag)
void MyFlatCurve::getCursorPosition(Gdk::EventType evType, bool isHint, int evX, int evY, Gdk::ModifierType modifierKey)
{
int tx, ty;
int prevCursorX, prevCursorY;
int prevCursorX = cursorX;
int prevCursorY = cursorY;
double incrementX = 1. / double(graphW);
double incrementY = 1. / double(graphH);
@@ -1627,11 +1628,6 @@ void MyFlatCurve::getCursorPosition(Gdk::EventType evType, bool isHint, int evX,
break;
}
if (editedHandle != FCT_EditedHandle_None) {
prevCursorX = cursorX;
prevCursorY = cursorY;
}
cursorX = tx - graphX;
cursorY = graphY - ty;

View File

@@ -56,6 +56,8 @@ void RTImageCache::updateCache()
RTImage::RTImage () {}
RTImage::RTImage (const Glib::ustring& iconName, const Gtk::IconSize iconSize) :
sigc::trackable(),
Glib::ObjectBase(),
Gtk::Image(),
size(iconSize),
icon_name(iconName),

View File

@@ -220,7 +220,7 @@ Cairo::RefPtr<Cairo::ImageSurface> RTScalable::loadSurfaceFromSVG(const Glib::us
return surf;
}
rsvg_handle_free(handle);
g_object_unref(handle);
// Set device scale to avoid blur effect
cairo_surface_set_device_scale(surf->cobj(),