diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2009-07-28 16:49:10 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-07-28 16:49:10 +0000 |
| commit | 21e0eb0db9fd47aa24ce2c3606a5c582b92b4fb7 (patch) | |
| tree | 271f714ba27ad3933d27b6bacfb45ef1aec4ffe7 /libs/surfaces | |
| parent | 894e4500a0da1d9044975631ec5b7c3baed7ef63 (diff) | |
use DIST_LIBDIR to allow override of LIBDIR ; gcc4.4 patches from debian (once again, those guys don't send upstream, they think their own bug DB is where this stuff belongs, sigh ... thanks adi for the notice)
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@5429 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/surfaces')
| -rw-r--r-- | libs/surfaces/tranzport/lcd.cc | 4 | ||||
| -rw-r--r-- | libs/surfaces/tranzport/screen.cc | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/libs/surfaces/tranzport/lcd.cc b/libs/surfaces/tranzport/lcd.cc index 88f9ea36d6..29c20aee2e 100644 --- a/libs/surfaces/tranzport/lcd.cc +++ b/libs/surfaces/tranzport/lcd.cc @@ -30,7 +30,7 @@ bool TranzportControlProtocol::lcd_damage() bool TranzportControlProtocol::lcd_damage (int row, int col, int length) { - std::bitset<ROWS*COLUMNS> mask1(0); + std::bitset<ROWS*COLUMNS> mask1(0ul); // there's an intrinsic to do this fast, darn it, or I'm just sleepy for (int i = 0; i < length; i++) { mask1[i] = 1; } std::bitset<ROWS*COLUMNS> mask(mask1 << (row*COLUMNS+col)); @@ -55,7 +55,7 @@ bool TranzportControlProtocol::lcd_isdamaged () bool TranzportControlProtocol::lcd_isdamaged (int row, int col, int length) { // there's an intrinsic to do this fast, darn it - std::bitset<ROWS*COLUMNS> mask1(0); + std::bitset<ROWS*COLUMNS> mask1(0ul); for (int i = 0; i < length; i++) { mask1[i] = 1; } std::bitset<ROWS*COLUMNS> mask(mask1 << (row*COLUMNS+col)); mask &= screen_invalid; diff --git a/libs/surfaces/tranzport/screen.cc b/libs/surfaces/tranzport/screen.cc index 0ca9419bd6..b32d2faf13 100644 --- a/libs/surfaces/tranzport/screen.cc +++ b/libs/surfaces/tranzport/screen.cc @@ -21,6 +21,8 @@ #include <cstring> #include <tranzport_control_protocol.h> +#include <cstring> + void TranzportControlProtocol::screen_clear () { |