ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/socket/image.C
(Generate patch)

Comparing deliantra/server/socket/image.C (file contents):
Revision 1.3 by root, Sun Sep 10 13:43:33 2006 UTC vs.
Revision 1.5 by root, Sun Oct 8 16:51:51 2006 UTC

1
2/*
3 * static char *rcsid_init_c =
4 * "$Id: image.C,v 1.3 2006/09/10 13:43:33 root Exp $";
5 */
6
7/* 1/*
8 CrossFire, A Multiplayer game for X-windows 2 CrossFire, A Multiplayer game for X-windows
9 3
10 Copyright (C) 2001 Mark Wedel 4 Copyright (C) 2001 Mark Wedel
11 Copyright (C) 1992 Frank Tore Johansen 5 Copyright (C) 1992 Frank Tore Johansen
22 16
23 You should have received a copy of the GNU General Public License 17 You should have received a copy of the GNU General Public License
24 along with this program; if not, write to the Free Software 18 along with this program; if not, write to the Free Software
25 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
26 20
27 The author can be reached via e-mail to crossfire-devel@real-time.com 21 The author can be reached via e-mail to <crossfire@schmorp.de>
28*/ 22*/
29 23
30/** \file 24/** \file
31 * Image related communication 25 * Image related communication
32 * 26 *
289 if (len == 0 || len > MAX_IMAGE_SIZE) 283 if (len == 0 || len > MAX_IMAGE_SIZE)
290 { 284 {
291 LOG (llevError, "read_client_images: length not valid: %d > %d \n%s", len, MAX_IMAGE_SIZE, buf); 285 LOG (llevError, "read_client_images: length not valid: %d > %d \n%s", len, MAX_IMAGE_SIZE, buf);
292 abort (); 286 abort ();
293 } 287 }
294 /* We don't actualy care about the name if the image that 288 /* We don't actualy care about the name of the image that
295 * is embedded in the image file, so just ignore it. 289 * is embedded in the image file, so just ignore it.
296 */ 290 */
297 facesets[fileno].faces[num].datalen = len; 291 facesets[fileno].faces[num].datalen = len;
298 facesets[fileno].faces[num].data = (uint8 *) malloc (len); 292 facesets[fileno].faces[num].data = (uint8 *) malloc (len);
299 if ((i = fread (facesets[fileno].faces[num].data, len, 1, infile)) != 1) 293 if ((i = fread (facesets[fileno].faces[num].data, len, 1, infile)) != 1)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines