diff options
| author | Constantin Kaplinsky <const@tightvnc.com> | 2006-04-16 06:53:44 +0000 |
|---|---|---|
| committer | Constantin Kaplinsky <const@tightvnc.com> | 2006-04-16 06:53:44 +0000 |
| commit | de179d4ed74239bb64d6651fd24a39bbc29bd5d1 (patch) | |
| tree | 368e0c2e675f017d92ecf92da93bf1a20ef2f417 /rfb/hextileEncode.h | |
| parent | 32d0d68a5304d7a461e9c34da1dae124a467a98a (diff) | |
| download | tigervnc-de179d4ed74239bb64d6651fd24a39bbc29bd5d1.tar.gz tigervnc-de179d4ed74239bb64d6651fd24a39bbc29bd5d1.zip | |
The "rfb" library merged with VNC 4.1.1 code.
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/branches/merge-with-vnc-4.1.1@522 3789f03b-4d11-0410-bbf8-ca57d06f2519
Diffstat (limited to 'rfb/hextileEncode.h')
| -rw-r--r-- | rfb/hextileEncode.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/rfb/hextileEncode.h b/rfb/hextileEncode.h index 27c7e01f..9f8bd558 100644 --- a/rfb/hextileEncode.h +++ b/rfb/hextileEncode.h @@ -1,6 +1,6 @@ -/* Copyright (C) 2002-2003 RealVNC Ltd. All Rights Reserved. +/* Copyright (C) 2002-2005 RealVNC Ltd. All Rights Reserved. * Copyright (C) 2005 Constantin Kaplinsky. All Rights Reserved. - * + * * This is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -61,11 +61,11 @@ void HEXTILE_ENCODE(const Rect& r, rdr::OutStream* os for (t.tl.y = r.tl.y; t.tl.y < r.br.y; t.tl.y += 16) { - t.br.y = vncmin(r.br.y, t.tl.y + 16); + t.br.y = __rfbmin(r.br.y, t.tl.y + 16); for (t.tl.x = r.tl.x; t.tl.x < r.br.x; t.tl.x += 16) { - t.br.x = vncmin(r.br.x, t.tl.x + 16); + t.br.x = __rfbmin(r.br.x, t.tl.x + 16); GET_IMAGE_INTO_BUF(t,buf); |