diff options
| author | Alexander Larsson <alexl@redhat.com> | 2010-03-09 11:10:00 +0100 |
|---|---|---|
| committer | Alexander Larsson <alexl@redhat.com> | 2010-03-09 11:10:00 +0100 |
| commit | 90c5766caf16e35cb871116a4655a106a3c272dc (patch) | |
| tree | ddc2ea976240a3f8f9c3294b41492256e6eb3f82 /client/cursor.cpp | |
| parent | 5cb99e12c6817592f49ca153a3081dd6b5995cf2 (diff) | |
| download | spice-90c5766caf16e35cb871116a4655a106a3c272dc.tar.gz spice-90c5766caf16e35cb871116a4655a106a3c272dc.tar.xz spice-90c5766caf16e35cb871116a4655a106a3c272dc.zip | |
Use macros from <spice/macros.h> rather than duplicate them
Diffstat (limited to 'client/cursor.cpp')
| -rw-r--r-- | client/cursor.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/client/cursor.cpp b/client/cursor.cpp index 7babdb90..60dc1dd7 100644 --- a/client/cursor.cpp +++ b/client/cursor.cpp @@ -34,29 +34,29 @@ CursorData::CursorData(SpiceCursor& cursor, int data_size) expected_size = (_header.width << 2) * _header.height; break; case SPICE_CURSOR_TYPE_MONO: - expected_size = (ALIGN(_header.width, 8) >> 2) * _header.height; + expected_size = (SPICE_ALIGN(_header.width, 8) >> 2) * _header.height; break; case SPICE_CURSOR_TYPE_COLOR4: - expected_size = (ALIGN(_header.width, 2) >> 1) * _header.height; - expected_size += (ALIGN(_header.width, 8) >> 3) * _header.height; + expected_size = (SPICE_ALIGN(_header.width, 2) >> 1) * _header.height; + expected_size += (SPICE_ALIGN(_header.width, 8) >> 3) * _header.height; expected_size += 16 * sizeof(uint32_t); break; case SPICE_CURSOR_TYPE_COLOR8: expected_size = _header.width * _header.height; - expected_size += (ALIGN(_header.width, 8) >> 3) * _header.height; + expected_size += (SPICE_ALIGN(_header.width, 8) >> 3) * _header.height; expected_size += 256 * sizeof(uint32_t); break; case SPICE_CURSOR_TYPE_COLOR16: expected_size = (_header.width << 1) * _header.height; - expected_size += (ALIGN(_header.width, 8) >> 3) * _header.height; + expected_size += (SPICE_ALIGN(_header.width, 8) >> 3) * _header.height; break; case SPICE_CURSOR_TYPE_COLOR24: expected_size = (_header.width * 3) * _header.height; - expected_size += (ALIGN(_header.width, 8) >> 3) * _header.height; + expected_size += (SPICE_ALIGN(_header.width, 8) >> 3) * _header.height; break; case SPICE_CURSOR_TYPE_COLOR32: expected_size = (_header.width << 2) * _header.height; - expected_size += (ALIGN(_header.width, 8) >> 3) * _header.height; + expected_size += (SPICE_ALIGN(_header.width, 8) >> 3) * _header.height; break; } @@ -92,10 +92,10 @@ int LocalCursor::get_size_bits(const SpiceCursorHeader& header, int& size) size = (header.width << 2) * header.height; return 32; case SPICE_CURSOR_TYPE_MONO: - size = (ALIGN(header.width, 8) >> 3) * header.height; + size = (SPICE_ALIGN(header.width, 8) >> 3) * header.height; return 1; case SPICE_CURSOR_TYPE_COLOR4: - size = (ALIGN(header.width, 2) >> 1) * header.height; + size = (SPICE_ALIGN(header.width, 2) >> 1) * header.height; return 4; case SPICE_CURSOR_TYPE_COLOR8: size = header.width * header.height; |