diff options
| author | Sakari Bergen <sakari.bergen@beatwaves.net> | 2010-12-11 15:09:47 +0000 |
|---|---|---|
| committer | Sakari Bergen <sakari.bergen@beatwaves.net> | 2010-12-11 15:09:47 +0000 |
| commit | 80c61db0cda63e565197abcbbc11b504c9a76c17 (patch) | |
| tree | 7c332032dcefa82fb92a080e1eee7807a548030f /gtk2_ardour | |
| parent | 680a3f2b865348a3a4d9c54cccc5155016ff4a98 (diff) | |
Fix compiler warnings
git-svn-id: svn://localhost/ardour2/branches/3.0@8246 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/group_tabs.cc | 2 | ||||
| -rw-r--r-- | gtk2_ardour/mixer_strip.cc | 1 | ||||
| -rw-r--r-- | gtk2_ardour/rgb_macros.h | 28 |
3 files changed, 15 insertions, 16 deletions
diff --git a/gtk2_ardour/group_tabs.cc b/gtk2_ardour/group_tabs.cc index 560d1f7c11..a1aedc6c5b 100644 --- a/gtk2_ardour/group_tabs.cc +++ b/gtk2_ardour/group_tabs.cc @@ -279,7 +279,7 @@ GroupTabs::click_to_tab (double c, list<Tab>::iterator* prev, list<Tab>::iterato *next = i; if (under) { - *next++; + (*next)++; } } diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index 7f1391a640..324f36cf91 100644 --- a/gtk2_ardour/mixer_strip.cc +++ b/gtk2_ardour/mixer_strip.cc @@ -1033,7 +1033,6 @@ MixerStrip::update_io_button (boost::shared_ptr<ARDOUR::Route> route, Width widt ostringstream label; string label_string; - char * label_cstr; bool have_label = false; bool each_io_has_one_connection = true; diff --git a/gtk2_ardour/rgb_macros.h b/gtk2_ardour/rgb_macros.h index 8252349452..352585bea8 100644 --- a/gtk2_ardour/rgb_macros.h +++ b/gtk2_ardour/rgb_macros.h @@ -133,10 +133,10 @@ UINT_TO_RGB((i), ((guchar*)p), ((guchar*)p)+1, ((guchar*)p)+2) gint ph_a0, ph_a1; \ gint ph_colr=(colr), ph_colg=(colg), ph_colb=(colb); \ \ - ph_a0 = MAX(ph_buf->rect.x0, (ptx0)); \ - ph_a1 = MIN(ph_buf->rect.x1, (ptx1)); \ + ph_a0 = MAX(ph_buf->rect.x0, (gint)(ptx0)); \ + ph_a1 = MIN(ph_buf->rect.x1, (gint)(ptx1)); \ \ - if (ph_a0 < ph_a1 && BUF_INBOUNDS_Y(ph_buf, pty)) { \ + if (ph_a0 < ph_a1 && BUF_INBOUNDS_Y(ph_buf, (gint)(pty))) { \ ph_p = BUF_PTR(ph_buf, ph_a0, pty); \ while (ph_a0 < ph_a1) { \ PIXEL_RGB(ph_p, ph_colr, ph_colg, ph_colb); \ @@ -152,10 +152,10 @@ UINT_TO_RGB((i), ((guchar*)p), ((guchar*)p)+1, ((guchar*)p)+2) gint ph_a0, ph_a1; \ gint ph_colr=(colr), ph_colg=(colg), ph_colb=(colb); \ \ - ph_a0 = MAX(ph_buf->rect.x0, (ptx0)); \ - ph_a1 = MIN(ph_buf->rect.x1, (ptx1)); \ + ph_a0 = MAX(ph_buf->rect.x0, (gint)(ptx0)); \ + ph_a1 = MIN(ph_buf->rect.x1, (gint)(ptx1)); \ \ - if (ph_a0 < ph_a1 && BUF_INBOUNDS_Y(ph_buf, pty)) { \ + if (ph_a0 < ph_a1 && BUF_INBOUNDS_Y(ph_buf, (gint)(pty))) { \ ph_p = BUF_PTR(ph_buf, ph_a0, pty); \ while (ph_a0 < ph_a1) { \ PIXEL_RGB(ph_p, ph_colr, ph_colg, ph_colb); \ @@ -171,10 +171,10 @@ UINT_TO_RGB((i), ((guchar*)p), ((guchar*)p)+1, ((guchar*)p)+2) gint ph_a0, ph_a1; \ gint ph_colr=(colr), ph_colg=(colg), ph_colb=(colb), ph_cola=(cola); \ \ - ph_a0 = MAX(ph_buf->rect.x0, (ptx0)); \ - ph_a1 = MIN(ph_buf->rect.x1, (ptx1)); \ + ph_a0 = MAX(ph_buf->rect.x0, (gint)(ptx0)); \ + ph_a1 = MIN(ph_buf->rect.x1, (gint)(ptx1)); \ \ - if (ph_a0 < ph_a1 && BUF_INBOUNDS_Y(ph_buf, pty)) { \ + if (ph_a0 < ph_a1 && BUF_INBOUNDS_Y(ph_buf, (gint)(pty))) { \ ph_p = BUF_PTR(ph_buf, ph_a0, pty); \ while (ph_a0 < ph_a1) { \ PIXEL_RGBA(ph_p, ph_colr, ph_colg, ph_colb, ph_cola); \ @@ -190,10 +190,10 @@ UINT_TO_RGB((i), ((guchar*)p), ((guchar*)p)+1, ((guchar*)p)+2) gint pv_b0, pv_b1; \ gint pv_colr=(colr), pv_colg=(colg), pv_colb=(colb);\ \ - pv_b0 = MAX(pv_buf->rect.y0, (pty0)); \ - pv_b1 = MIN(pv_buf->rect.y1, (pty1)); \ + pv_b0 = MAX(pv_buf->rect.y0, (gint)(pty0)); \ + pv_b1 = MIN(pv_buf->rect.y1, (gint)(pty1)); \ \ - if (pv_b0 < pv_b1 && BUF_INBOUNDS_X(pv_buf, ptx)) { \ + if (pv_b0 < pv_b1 && BUF_INBOUNDS_X(pv_buf, (gint)(ptx))) { \ pv_p = BUF_PTR(pv_buf, ptx, pv_b0); \ while (pv_b0 < pv_b1) { \ PIXEL_RGB(pv_p, pv_colr, pv_colg, pv_colb); \ @@ -208,8 +208,8 @@ UINT_TO_RGB((i), ((guchar*)p), ((guchar*)p)+1, ((guchar*)p)+2) guchar* fpv_p; \ gint fpv_b0, fpv_b1; \ \ - fpv_b0 = MAX(fpv_buf->rect.y0, (pty0)); \ - fpv_b1 = MIN(fpv_buf->rect.y1, (pty1)); \ + fpv_b0 = MAX(fpv_buf->rect.y0, (gint)(pty0)); \ + fpv_b1 = MIN(fpv_buf->rect.y1, (gint)(pty1)); \ \ fpv_p = BUF_PTR(fpv_buf, ptx, fpv_b0); \ \ |