diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2005-10-06 19:10:57 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2005-10-06 19:10:57 +0000 |
| commit | 4c509656223d3ed1f0fab504cb483090d38972f9 (patch) | |
| tree | 540f207b81f957fa78101d67da3094ff1e1f9456 /gtk2_ardour/utils.cc | |
| parent | 5a52d8fee4c9abac7ffb1f1e6464785d979acd68 (diff) | |
fix compose mess, and a number of 64 bit printf specs
git-svn-id: svn://localhost/trunk/ardour2@51 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/utils.cc')
| -rw-r--r-- | gtk2_ardour/utils.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gtk2_ardour/utils.cc b/gtk2_ardour/utils.cc index 62d7706e77..21a8233d44 100644 --- a/gtk2_ardour/utils.cc +++ b/gtk2_ardour/utils.cc @@ -219,7 +219,7 @@ xpm2rgb (const char** xpm, uint32_t& w, uint32_t& h) // PARSE HEADER if ( sscanf(xpm[0], "%u%u%u%u", &w, &h, &colors, &cpp) != 4 ) { - error << compose (_("bad XPM header %1"), xpm[0]) + error << string_compose (_("bad XPM header %1"), xpm[0]) << endmsg; return 0; } @@ -262,7 +262,7 @@ xpm2rgba (const char** xpm, uint32_t& w, uint32_t& h) // PARSE HEADER if ( sscanf(xpm[0], "%u%u%u%u", &w, &h, &colors, &cpp) != 4 ) { - error << compose (_("bad XPM header %1"), xpm[0]) + error << string_compose (_("bad XPM header %1"), xpm[0]) << endmsg; return 0; } @@ -513,7 +513,7 @@ rgba_from_style (string style, uint32_t r, uint32_t g, uint32_t b, uint32_t a) a = waverc->fg[GTK_STATE_ACTIVE].red / 257; } else { - warning << compose (_("missing RGBA style for \"%1\""), style) << endl; + warning << string_compose (_("missing RGBA style for \"%1\""), style) << endl; } return (uint32_t) RGBA_TO_UINT(r,g,b,a); |