smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-05 21:25:46 +01:00
Code Issues Projects Releases Wiki Activity

fix compose mess, and a number of 64 bit printf specs

Browse source 
git-svn-id: svn://localhost/trunk/ardour2@51 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2005-10-06 19:10:57 +00:00
parent 5a52d8fee4
commit 4c50965622
70 changed files with 448 additions and 448 deletions
Download patch file Download diff file Expand all files Collapse all files

6
gtk2_ardour/utils.cc
View file

@ -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);