… | |
… | |
229 | if (len >= MAX_FACE_SETS) |
229 | if (len >= MAX_FACE_SETS) |
230 | { |
230 | { |
231 | LOG (llevError, "To high a setnum in image_info file: %d > %d\n", len, MAX_FACE_SETS); |
231 | LOG (llevError, "To high a setnum in image_info file: %d > %d\n", len, MAX_FACE_SETS); |
232 | abort (); |
232 | abort (); |
233 | } |
233 | } |
234 | facesets[len].prefix = strdup_local (cps[1]); |
234 | facesets[len].prefix = strdup (cps[1]); |
235 | facesets[len].fullname = strdup_local (cps[2]); |
235 | facesets[len].fullname = strdup (cps[2]); |
236 | facesets[len].fallback = atoi (cps[3]); |
236 | facesets[len].fallback = atoi (cps[3]); |
237 | facesets[len].size = strdup_local (cps[4]); |
237 | facesets[len].size = strdup (cps[4]); |
238 | facesets[len].extension = strdup_local (cps[5]); |
238 | facesets[len].extension = strdup (cps[5]); |
239 | facesets[len].comment = strdup_local (cps[6]); |
239 | facesets[len].comment = strdup (cps[6]); |
240 | } |
240 | } |
241 | } |
241 | } |
242 | close_and_delete (infile, compressed); |
242 | close_and_delete (infile, compressed); |
243 | for (i = 0; i < MAX_FACE_SETS; i++) |
243 | for (i = 0; i < MAX_FACE_SETS; i++) |
244 | { |
244 | { |
… | |
… | |
385 | sl << uint8 (fallback); |
385 | sl << uint8 (fallback); |
386 | |
386 | |
387 | sl << uint32 (facesets[fallback].faces[face_num].checksum) |
387 | sl << uint32 (facesets[fallback].faces[face_num].checksum) |
388 | << new_faces[face_num].name; |
388 | << new_faces[face_num].name; |
389 | |
389 | |
390 | Send_With_Handling (ns, &sl); |
390 | ns->send_packet (sl); |
391 | } |
391 | } |
392 | else |
392 | else |
393 | { |
393 | { |
394 | sl << (ns->image2 ? "image2 " : "image ") |
394 | sl << (ns->image2 ? "image2 " : "image ") |
395 | << uint32 (face_num); |
395 | << uint32 (face_num); |
… | |
… | |
398 | sl << uint8 (fallback); |
398 | sl << uint8 (fallback); |
399 | |
399 | |
400 | sl << uint32 (facesets[fallback].faces[face_num].datalen) |
400 | sl << uint32 (facesets[fallback].faces[face_num].datalen) |
401 | << data (facesets[fallback].faces[face_num].data, facesets[fallback].faces[face_num].datalen); |
401 | << data (facesets[fallback].faces[face_num].data, facesets[fallback].faces[face_num].datalen); |
402 | |
402 | |
403 | Send_With_Handling (ns, &sl); |
403 | ns->send_packet (sl); |
404 | } |
404 | } |
405 | |
405 | |
406 | ns->faces_sent[face_num] |= NS_FACESENT_FACE; |
406 | ns->faces_sent[face_num] |= NS_FACESENT_FACE; |
407 | } |
407 | } |
408 | |
408 | |
… | |
… | |
423 | if (facesets[i].prefix) |
423 | if (facesets[i].prefix) |
424 | sl.printf ("%d:%s:%s:%d:%s:%s:%s", |
424 | sl.printf ("%d:%s:%s:%d:%s:%s:%s", |
425 | i, facesets[i].prefix, facesets[i].fullname, facesets[i].fallback, |
425 | i, facesets[i].prefix, facesets[i].fullname, facesets[i].fallback, |
426 | facesets[i].size, facesets[i].extension, facesets[i].comment); |
426 | facesets[i].size, facesets[i].extension, facesets[i].comment); |
427 | |
427 | |
428 | Send_With_Handling (ns, &sl); |
428 | ns->send_packet (sl); |
429 | } |
429 | } |
430 | |
430 | |
431 | /** |
431 | /** |
432 | * Sends requested face information. |
432 | * Sends requested face information. |
433 | * \param ns socket to send to |
433 | * \param ns socket to send to |
… | |
… | |
482 | { |
482 | { |
483 | LOG (llevError, "send_image_send: buffer overrun, %d > %d\n", sl.length (), MAXSOCKBUF); |
483 | LOG (llevError, "send_image_send: buffer overrun, %d > %d\n", sl.length (), MAXSOCKBUF); |
484 | abort (); |
484 | abort (); |
485 | } |
485 | } |
486 | |
486 | |
487 | Send_With_Handling (ns, &sl); |
487 | ns->send_packet (sl); |
488 | } |
488 | } |
489 | |
489 | |