[gimp/gimp-2-10] app, meson.build: fix a bunch of warnings in C++ files
- From: Ell <ell src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/gimp-2-10] app, meson.build: fix a bunch of warnings in C++ files
- Date: Thu, 12 Sep 2019 17:06:49 +0000 (UTC)
commit d3e1f50b1347b1d6c3e6bccf04915d758f5af824
Author: Ell <ell_se yahoo com>
Date: Thu Sep 12 19:51:04 2019 +0300
app, meson.build: fix a bunch of warnings in C++ files
(cherry picked from commit 4fc345183bff212ee9f7ab9abbad81d730403122)
app/core/gimp-parallel.cc | 4 ++--
app/core/gimppickable-contiguous-region.cc | 1 -
app/gegl/gimp-gegl-loops.cc | 2 ++
app/paint/gimpbrushcore-loops.cc | 4 +---
4 files changed, 5 insertions(+), 6 deletions(-)
---
diff --git a/app/core/gimp-parallel.cc b/app/core/gimp-parallel.cc
index 46002c9334..1a31a5552e 100644
--- a/app/core/gimp-parallel.cc
+++ b/app/core/gimp-parallel.cc
@@ -227,8 +227,8 @@ gimp_parallel_run_async_independent_full (gint priority,
#elif defined (HAVE_UNISTD_H) && defined (__gnu_linux__)
if (task->priority)
{
- nice (task->priority) != -1;
- /* ^-- avoid "unused result" warning */
+ (nice (task->priority) != -1);
+ /* ^-- avoid "unused result" warning */
}
#endif
diff --git a/app/core/gimppickable-contiguous-region.cc b/app/core/gimppickable-contiguous-region.cc
index 14c0509d1a..ea30d0cf61 100644
--- a/app/core/gimppickable-contiguous-region.cc
+++ b/app/core/gimppickable-contiguous-region.cc
@@ -1005,7 +1005,6 @@ find_contiguous_region (GeglBuffer *src_buffer,
const Babl *mask_format = babl_format ("Y float");
GeglSampler *src_sampler;
const GeglRectangle *src_extent;
- gint x1, x2;
gint old_y;
gint start, end;
gint new_start, new_end;
diff --git a/app/gegl/gimp-gegl-loops.cc b/app/gegl/gimp-gegl-loops.cc
index 1cfd42460d..4564bcd07c 100644
--- a/app/gegl/gimp-gegl-loops.cc
+++ b/app/gegl/gimp-gegl-loops.cc
@@ -628,8 +628,10 @@ gimp_gegl_smudge_with_paint (GeglBuffer *accum_buffer,
GeglAccessMode paint_buffer_access_mode = (brush_color ?
GEGL_ACCESS_WRITE :
GEGL_ACCESS_READWRITE);
+#if COMPILE_SSE2_INTRINISICS
gboolean sse2 = (gimp_cpu_accel_get_support () &
GIMP_CPU_ACCEL_X86_SSE2);
+#endif
if (! accum_rect)
accum_rect = gegl_buffer_get_extent (accum_buffer);
diff --git a/app/paint/gimpbrushcore-loops.cc b/app/paint/gimpbrushcore-loops.cc
index d517377f75..31b4afb52d 100644
--- a/app/paint/gimpbrushcore-loops.cc
+++ b/app/paint/gimpbrushcore-loops.cc
@@ -435,7 +435,7 @@ public:
{
gint i;
- for (i = 0; i < G_N_ELEMENTS (map); i++)
+ for (i = 0; i < (gint) G_N_ELEMENTS (map); i++)
map[i] = pressure (T (i));
}
@@ -485,7 +485,6 @@ gimp_brush_core_pressurize_mask (GimpBrushCore *core,
{
const GimpTempBuf *subsample_mask;
const Babl *subsample_mask_format;
- gint i;
/* Get the raw subsampled mask */
subsample_mask = gimp_brush_core_subsample_mask (core,
@@ -542,7 +541,6 @@ gimp_brush_core_solidify_mask_impl (const GimpTempBuf *mask,
gint mask_width = gimp_temp_buf_get_width (mask);
gint mask_height = gimp_temp_buf_get_height (mask);
gint dest_width = gimp_temp_buf_get_width (dest);
- gint dest_height = gimp_temp_buf_get_height (dest);
gegl_parallel_distribute_area (
GEGL_RECTANGLE (0, 0, mask_width, mask_height),
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]