Changeset 3495
- Timestamp:
- May 21, 2009, 10:55:21 PM (13 years ago)
- Location:
- libcaca/trunk
- Files:
-
- 24 edited
Legend:
- Unmodified
- Added
- Removed
-
libcaca/trunk/caca/caca.h
r3494 r3495 426 426 * 427 427 * @{ */ 428 __extern ssize_t caca_import_memory(caca_canvas_t *, void const *, 429 size_t, char const *); 430 __extern ssize_t caca_import_file(caca_canvas_t *, char const *, 431 char const *); 428 __extern ssize_t caca_import_canvas_from_memory(caca_canvas_t *, void const *, 429 size_t, char const *); 430 __extern ssize_t caca_import_canvas_from_file(caca_canvas_t *, char const *, 431 char const *); 432 __extern ssize_t caca_import_area_from_memory(caca_canvas_t *, int, int, 433 void const *, size_t, 434 char const *); 435 __extern ssize_t caca_import_area_from_file(caca_canvas_t *, int, int, 436 char const *, char const *); 432 437 __extern char const * const * caca_get_import_list(void); 433 __extern void *caca_export_memory(caca_canvas_t const *, char const *, 434 size_t *); 438 __extern void *caca_export_canvas_to_memory(caca_canvas_t const *, 439 char const *, size_t *); 440 __extern void *caca_export_area_to_memory(caca_canvas_t const *, int, int, 441 int, int, char const *, size_t *); 435 442 __extern char const * const * caca_get_export_list(void); 436 443 /* @} */ … … 523 530 __extern caca_canvas_t * cucul_import_canvas(cucul_buffer_t *, 524 531 char const *) CACA_DEPRECATED; 532 __extern ssize_t caca_import_memory(caca_canvas_t *, void const *, size_t, 533 char const *) CACA_DEPRECATED; 534 __extern ssize_t caca_import_file(caca_canvas_t *, char const *, 535 char const *) CACA_DEPRECATED; 536 __extern void *caca_export_memory(caca_canvas_t const *, char const *, 537 size_t *) CACA_DEPRECATED; 525 538 __extern int cucul_rotate(caca_canvas_t *) CACA_DEPRECATED; 526 539 __extern int cucul_set_dither_invert(caca_dither_t *, int) CACA_DEPRECATED; -
libcaca/trunk/caca/caca0.c
r2858 r3495 1 1 /* 2 2 * libcaca Colour ASCII-Art library 3 * Copyright (c) 2002-200 6 Sam Hocevar <sam@zoy.org>3 * Copyright (c) 2002-2009 Sam Hocevar <sam@hocevar.net> 4 4 * All Rights Reserved 5 5 * … … 216 216 217 217 cv = caca_create_canvas(0, 0);; 218 if(caca_import_ file(cv, file, "") < 0)218 if(caca_import_canvas_from_file(cv, file, "") < 0) 219 219 { 220 220 caca_free_canvas(cv); -
libcaca/trunk/caca/codec/export.c
r3492 r3495 81 81 * \return A pointer to the exported memory area, or NULL in case of error. 82 82 */ 83 void *caca_export_ memory(caca_canvas_t const *cv, char const *format,84 size_t *bytes)83 void *caca_export_canvas_to_memory(caca_canvas_t const *cv, char const *format, 84 size_t *bytes) 85 85 { 86 86 if(!strcasecmp("caca", format)) … … 119 119 seterrno(EINVAL); 120 120 return NULL; 121 } 122 123 /** \brief Export a canvas portion into a foreign format. 124 * 125 * This function exports a portion of a \e libcaca canvas into various 126 * formats. For more information, see caca_export_canvas_to_memory(). 127 * 128 * If an error occurs, NULL is returned and \b errno is set accordingly: 129 * - \c EINVAL Unsupported format requested or invalid coordinates. 130 * - \c ENOMEM Not enough memory to allocate output buffer. 131 * 132 * \param cv A libcaca canvas 133 * \param x The leftmost coordinate of the area to export. 134 * \param y The topmost coordinate of the area to export. 135 * \param w The width of the area to export. 136 * \param h The height of the area to export. 137 * \param format A string describing the requested output format. 138 * \param bytes A pointer to a size_t where the number of allocated bytes 139 * will be written. 140 * \return A pointer to the exported memory area, or NULL in case of error. 141 */ 142 void *caca_export_area_to_memory(caca_canvas_t const *cv, int x, int y, int w, 143 int h, char const *format, size_t *bytes) 144 { 145 caca_canvas_t *tmp; 146 void *ret; 147 148 if(w < 0 || h < 0 || x < 0 || y < 0 149 || x + w >= cv->width || y + h >= cv->height) 150 { 151 seterrno(EINVAL); 152 return NULL; 153 } 154 155 /* TODO: we need to spare the blit here by exporting the area we want. */ 156 tmp = caca_create_canvas(w, h); 157 caca_blit(tmp, -x, -y, cv, NULL); 158 159 ret = caca_export_canvas_to_memory(tmp, format, bytes); 160 161 caca_free_canvas(tmp); 162 163 return ret; 121 164 } 122 165 … … 938 981 939 982 void *cucul_export_memory(cucul_canvas_t const *, char const *, 940 size_t *) CACA_ALIAS(caca_export_memory); 983 size_t *) CACA_ALIAS(caca_export_canvas_to_memory); 984 void *caca_export_memory(caca_canvas_t const *, char const *, 985 size_t *) CACA_ALIAS(caca_export_canvas_to_memory); 941 986 char const * const * cucul_get_export_list(void) 942 987 CACA_ALIAS(caca_get_export_list); -
libcaca/trunk/caca/codec/import.c
r3492 r3495 72 72 * or -1 if an error occurred. 73 73 */ 74 ssize_t caca_import_ memory(caca_canvas_t *cv, void const *data,75 size_t len, char const *format)74 ssize_t caca_import_canvas_from_memory(caca_canvas_t *cv, void const *data, 75 size_t len, char const *format) 76 76 { 77 77 if(!strcasecmp("caca", format)) … … 137 137 * or -1 if an error occurred. 138 138 */ 139 ssize_t caca_import_ file(caca_canvas_t *cv, char const *filename,140 char const *format)139 ssize_t caca_import_canvas_from_file(caca_canvas_t *cv, char const *filename, 140 char const *format) 141 141 { 142 142 #if defined __KERNEL__ … … 168 168 caca_file_close(f); 169 169 170 ret = caca_import_ memory(cv, data, size, format);170 ret = caca_import_canvas_from_memory(cv, data, size, format); 171 171 free(data); 172 172 173 173 return ret; 174 174 #endif 175 } 176 177 /** \brief Import a memory buffer into a canvas area 178 * 179 * Import a memory buffer into the given libcaca canvas's current 180 * frame, at the specified position. For more information, see 181 * caca_import_canvas_from_memory(). 182 * 183 * If an error occurs, -1 is returned and \b errno is set accordingly: 184 * - \c EINVAL Unsupported format requested or invalid coordinates. 185 * - \c ENOMEM Not enough memory to allocate canvas. 186 * 187 * \param cv A libcaca canvas in which to import the file. 188 * \param x The leftmost coordinate of the area to import to. 189 * \param y The topmost coordinate of the area to import to. 190 * \param data A memory area containing the data to be loaded into the canvas. 191 * \param len The size in bytes of the memory area. 192 * \param format A string describing the input format. 193 * \return The number of bytes read, or 0 if there was not enough data, 194 * or -1 if an error occurred. 195 */ 196 ssize_t caca_import_area_from_memory(caca_canvas_t *cv, int x, int y, 197 void const *data, size_t len, 198 char const *format) 199 { 200 caca_canvas_t *tmp; 201 ssize_t ret; 202 203 tmp = caca_create_canvas(0, 0); 204 ret = caca_import_canvas_from_memory(tmp, data, len, format); 205 206 if(ret > 0) 207 caca_blit(cv, x, y, tmp, NULL); 208 209 caca_free_canvas(tmp); 210 211 return ret; 212 } 213 214 /** \brief Import a file into a canvas area 215 * 216 * Import a file into the given libcaca canvas's current frame, at the 217 * specified position. For more information, see 218 * caca_import_canvas_from_file(). 219 * 220 * If an error occurs, -1 is returned and \b errno is set accordingly: 221 * - \c ENOSYS File access is not implemented on this system. 222 * - \c ENOMEM Not enough memory to allocate canvas. 223 * - \c EINVAL Unsupported format requested or invalid coordinates. 224 * caca_import_file() may also fail and set \b errno for any of the 225 * errors specified for the routine fopen(). 226 * 227 * \param cv A libcaca canvas in which to import the file. 228 * \param x The leftmost coordinate of the area to import to. 229 * \param y The topmost coordinate of the area to import to. 230 * \param filename The name of the file to load. 231 * \param format A string describing the input format. 232 * \return The number of bytes read, or 0 if there was not enough data, 233 * or -1 if an error occurred. 234 */ 235 ssize_t caca_import_area_from_file(caca_canvas_t *cv, int x, int y, 236 char const *filename, char const *format) 237 { 238 caca_canvas_t *tmp; 239 ssize_t ret; 240 241 tmp = caca_create_canvas(0, 0); 242 ret = caca_import_canvas_from_file(tmp, filename, format); 243 244 if(ret > 0) 245 caca_blit(cv, x, y, tmp, NULL); 246 247 caca_free_canvas(tmp); 248 249 return ret; 175 250 } 176 251 … … 330 405 ssize_t cucul_import_file(cucul_canvas_t *, char const *, 331 406 char const *) CACA_ALIAS(caca_import_file); 407 ssize_t caca_import_memory(caca_canvas_t *, void const *, size_t, char const *) 408 CACA_ALIAS(caca_import_canvas_from_memory); 409 ssize_t caca_import_file(caca_canvas_t *, char const *, char const *) 410 CACA_ALIAS(caca_import_canvas_from_file); 332 411 char const * const * cucul_get_import_list(void) 333 412 CACA_ALIAS(caca_get_import_list); -
libcaca/trunk/caca/driver/raw.c
r2962 r3495 1 1 /* 2 2 * libcaca Colour ASCII-Art library 3 * Copyright (c) 2002-200 6 Sam Hocevar <sam@zoy.org>3 * Copyright (c) 2002-2009 Sam Hocevar <sam@hocevar.net> 4 4 * All Rights Reserved 5 5 * … … 71 71 size_t len; 72 72 73 buffer = caca_export_ memory(dp->cv, "caca", &len);73 buffer = caca_export_canvas_to_memory(dp->cv, "caca", &len); 74 74 if(!buffer) 75 75 return; -
libcaca/trunk/caca/figfont.c
r3484 r3495 1 1 /* 2 2 * libcaca Colour ASCII-Art library 3 * Copyright (c) 200 6-2007 Sam Hocevar <sam@zoy.org>3 * Copyright (c) 2002-2009 Sam Hocevar <sam@hocevar.net> 4 4 * All Rights Reserved 5 5 * … … 449 449 /* Import buffer into canvas */ 450 450 ff->fontcv = caca_create_canvas(0, 0); 451 caca_import_ memory(ff->fontcv, data, i, "utf8");451 caca_import_canvas_from_memory(ff->fontcv, data, i, "utf8"); 452 452 free(data); 453 453 -
libcaca/trunk/caca/legacy.c
r2821 r3495 1 1 /* 2 2 * libcaca Colour ASCII-Art library 3 * Copyright (c) 2002-200 6 Sam Hocevar <sam@zoy.org>3 * Copyright (c) 2002-2009 Sam Hocevar <sam@hocevar.net> 4 4 * All Rights Reserved 5 5 * … … 99 99 { 100 100 caca_canvas_t *cv = caca_create_canvas(0, 0); 101 int ret = caca_import_memory(cv, (unsigned char const *)buf->data, 102 buf->size, format); 101 int ret = caca_import_canvas_from_memory(cv, 102 (unsigned char const *)buf->data, 103 buf->size, format); 103 104 if(ret < 0) 104 105 { … … 125 126 } 126 127 127 ex->data = caca_export_ memory(cv, format, &ex->size);128 ex->data = caca_export_canvas_to_memory(cv, format, &ex->size); 128 129 if(!ex->data) 129 130 { -
libcaca/trunk/cxx/caca++.cpp
r2822 r3495 292 292 } 293 293 294 long int Canvas::import Memory(void const *buf, size_t len, char const *fmt)295 { 296 return caca_import_ memory(cv, buf, len, fmt);297 } 298 299 long int Canvas::importF ile(char const *file, char const *fmt)300 { 301 return caca_import_ file(cv, file, fmt);294 long int Canvas::importFromMemory(void const *buf, size_t len, char const *fmt) 295 { 296 return caca_import_canvas_from_memory(cv, buf, len, fmt); 297 } 298 299 long int Canvas::importFromFile(char const *file, char const *fmt) 300 { 301 return caca_import_canvas_from_file(cv, file, fmt); 302 302 } 303 303 … … 307 307 } 308 308 309 void *Canvas::export Memory(char const *fmt, size_t *len)310 { 311 return caca_export_ memory(cv, fmt, len);309 void *Canvas::exportToMemory(char const *fmt, size_t *len) 310 { 311 return caca_export_canvas_to_memory(cv, fmt, len); 312 312 } 313 313 -
libcaca/trunk/cxx/caca++.h
r2822 r3495 138 138 139 139 char const * const * getImportList(void); 140 long int import Memory(void const *, size_t, char const *);141 long int importF ile(char const *, char const *);140 long int importFromMemory(void const *, size_t, char const *); 141 long int importFromFile(char const *, char const *); 142 142 char const * const * getExportList(void); 143 void *export Memory(char const *, size_t *);143 void *exportToMemory(char const *, size_t *); 144 144 145 145 static int Rand(int, int); -
libcaca/trunk/cxx/cxxtest.cpp
r2824 r3495 65 65 pig = new Canvas(); 66 66 pig->setColorANSI(CACA_LIGHTMAGENTA, CACA_TRANSPARENT); 67 pig->import Memory(pigstring, strlen(pigstring), "text");67 pig->importFromMemory(pigstring, strlen(pigstring), "text"); 68 68 } 69 69 catch(int e) { -
libcaca/trunk/examples/blit.c
r2821 r3495 1 1 /* 2 2 * blit libcaca blit test program 3 * Copyright (c) 2006 Sam Hocevar <sam@zoy.org>3 * Copyright (c) 2006-2009 Sam Hocevar <sam@hocevar.net> 4 4 * All Rights Reserved 5 5 * … … 59 59 sprite = caca_create_canvas(0, 0); 60 60 caca_set_color_ansi(sprite, CACA_LIGHTRED, CACA_BLACK); 61 caca_import_ memory(sprite, pig, strlen(pig), "text");61 caca_import_canvas_from_memory(sprite, pig, strlen(pig), "text"); 62 62 caca_set_canvas_handle(sprite, caca_get_canvas_width(sprite) / 2, 63 63 caca_get_canvas_height(sprite) / 2); -
libcaca/trunk/examples/export.c
r2821 r3495 1 1 /* 2 2 * export libcaca export test program 3 * Copyright (c) 2006 Sam Hocevar <sam@zoy.org>3 * Copyright (c) 2006-2009 Sam Hocevar <sam@hocevar.net> 4 4 * All Rights Reserved 5 5 * … … 77 77 { 78 78 cv = caca_create_canvas(0, 0); 79 if(caca_import_ file(cv, file, "") < 0)79 if(caca_import_canvas_from_file(cv, file, "") < 0) 80 80 { 81 81 fprintf(stderr, "%s: `%s' has unknown format\n", argv[0], file); … … 149 149 } 150 150 151 buffer = caca_export_ memory(cv, format, &len);151 buffer = caca_export_canvas_to_memory(cv, format, &len); 152 152 fwrite(buffer, len, 1, stdout); 153 153 free(buffer); -
libcaca/trunk/examples/figfont.c
r2821 r3495 1 1 /* 2 2 * figfont libcaca FIGfont test program 3 * Copyright (c) 2007 Sam Hocevar <sam@zoy.org>3 * Copyright (c) 2007-2009 Sam Hocevar <sam@hocevar.net> 4 4 * All Rights Reserved 5 5 * … … 48 48 } 49 49 50 buffer = caca_export_ memory(cv, "utf8", &len);50 buffer = caca_export_canvas_to_memory(cv, "utf8", &len); 51 51 fwrite(buffer, len, 1, stdout); 52 52 free(buffer); -
libcaca/trunk/examples/font2tga.c
r2821 r3495 1 1 /* 2 2 * font2tga libcaca font test program 3 * Copyright (c) 2006 Sam Hocevar <sam@zoy.org>3 * Copyright (c) 2006-2009 Sam Hocevar <sam@hocevar.net> 4 4 * All Rights Reserved 5 5 * … … 75 75 caca_free_font(f); 76 76 77 buffer = caca_export_ memory(cv, "tga", &len);77 buffer = caca_export_canvas_to_memory(cv, "tga", &len); 78 78 fwrite(buffer, len, 1, stdout); 79 79 free(buffer); -
libcaca/trunk/examples/import.c
r2821 r3495 41 41 } 42 42 43 if(caca_import_ file(cv, argv[1], argc >= 3 ? argv[2] : "") < 0)43 if(caca_import_canvas_from_file(cv, argv[1], argc >= 3 ? argv[2] : "") < 0) 44 44 { 45 45 fprintf(stderr, "%s: could not open `%s'.\n", argv[0], argv[1]); -
libcaca/trunk/examples/spritedit.c
r2821 r3495 1 1 /* 2 2 * spritedit sprite editor for libcaca 3 * Copyright (c) 2003 Sam Hocevar <sam@zoy.org>3 * Copyright (c) 2003-2009 Sam Hocevar <sam@hocevar.net> 4 4 * All Rights Reserved 5 5 * … … 62 62 { 63 63 caca_set_frame(sprite, i); 64 caca_import_ memory(sprite, guy[i], strlen(guy[i]), "utf8");64 caca_import_canvas_from_memory(sprite, guy[i], strlen(guy[i]), "utf8"); 65 65 } 66 66 67 67 /* Export our sprite in a memory buffer. We could save this to 68 68 * disk afterwards. */ 69 buffer = caca_export_ memory(sprite, "caca", &len);69 buffer = caca_export_canvas_to_memory(sprite, "caca", &len); 70 70 71 71 /* Free our sprite and reload it from the memory buffer. We could … … 73 73 caca_free_canvas(sprite); 74 74 sprite = caca_create_canvas(0, 0); 75 caca_import_ memory(sprite, buffer, len, "caca");75 caca_import_canvas_from_memory(sprite, buffer, len, "caca"); 76 76 free(buffer); 77 77 … … 81 81 caca_set_frame(sprite, i); 82 82 printf("Frame #%i\n", i); 83 buffer = caca_export_ memory(sprite, "utf8", &len);83 buffer = caca_export_canvas_to_memory(sprite, "utf8", &len); 84 84 fwrite(buffer, len, 1, stdout); 85 85 free(buffer); -
libcaca/trunk/examples/swallow.c
r2821 r3495 1 1 /* 2 2 * swallow swallow another libcaca application 3 * Copyright (c) 2006 Sam Hocevar <sam@zoy.org>3 * Copyright (c) 2006-2009 Sam Hocevar <sam@hocevar.net> 4 4 * All Rights Reserved 5 5 * … … 88 88 for(i = 0; i < 4; i++) 89 89 { 90 bytes[i] = caca_import_memory(app, buf[i], total[i], "caca"); 90 bytes[i] = caca_import_canvas_from_memory(app, buf[i], 91 total[i], "caca"); 91 92 92 93 if(bytes[i] > 0) -
libcaca/trunk/examples/text.c
r2821 r3495 1 1 /* 2 2 * text canvas text import/export 3 * Copyright (c) 2006 Sam Hocevar <sam@zoy.org>3 * Copyright (c) 2006-2009 Sam Hocevar <sam@hocevar.net> 4 4 * All Rights Reserved 5 5 * … … 42 42 43 43 pig = caca_create_canvas(0, 0); 44 caca_import_ memory(pig, STRING, strlen(STRING), "text");44 caca_import_canvas_from_memory(pig, STRING, strlen(STRING), "text"); 45 45 46 46 cv = caca_create_canvas(caca_get_canvas_width(pig) * 2, … … 77 77 } 78 78 79 buffer = caca_export_ memory(cv, "utf8", &len);79 buffer = caca_export_canvas_to_memory(cv, "utf8", &len); 80 80 fwrite(buffer, len, 1, stdout); 81 81 free(buffer); 82 82 83 83 caca_rotate_left(cv); 84 buffer = caca_export_ memory(cv, "utf8", &len);84 buffer = caca_export_canvas_to_memory(cv, "utf8", &len); 85 85 fwrite(buffer, len, 1, stdout); 86 86 free(buffer); -
libcaca/trunk/examples/transform.c
r2821 r3495 1 1 /* 2 2 * unicode libcaca Unicode rendering test program 3 * Copyright (c) 2006 Sam Hocevar <sam@zoy.org>3 * Copyright (c) 2006-2009 Sam Hocevar <sam@hocevar.net> 4 4 * All Rights Reserved 5 5 * … … 60 60 61 61 caca_set_color_ansi(sprite, CACA_LIGHTMAGENTA, CACA_BLACK); 62 caca_import_ memory(sprite, pig, strlen(pig), "text");62 caca_import_canvas_from_memory(sprite, pig, strlen(pig), "text"); 63 63 caca_blit(image, 55, 0, sprite, NULL); 64 64 65 65 caca_set_color_ansi(sprite, CACA_LIGHTGREEN, CACA_BLACK); 66 caca_import_ memory(sprite, duck, strlen(duck), "text");66 caca_import_canvas_from_memory(sprite, duck, strlen(duck), "text"); 67 67 caca_blit(image, 30, 1, sprite, NULL); 68 68 -
libcaca/trunk/ruby/caca-canvas.c
r2829 r3495 22 22 static VALUE x (VALUE self) \ 23 23 { \ 24 if( caca_##x (_SELF) <0) \24 if( caca_##x (_SELF) <0) \ 25 25 rb_raise(rb_eRuntimeError, strerror(errno)); \ 26 26 \ … … 31 31 static VALUE get_##x (VALUE self) \ 32 32 { \ 33 return INT2NUM(caca_get_##x (_SELF)); \33 return INT2NUM(caca_get_##x (_SELF)); \ 34 34 } 35 35 … … 41 41 static VALUE canvas_alloc(VALUE klass) 42 42 { 43 VALUE obj; 43 VALUE obj; 44 44 obj = Data_Wrap_Struct(klass, NULL, canvas_free, NULL); 45 45 return obj; … … 535 535 } 536 536 537 static VALUE import_ memory(VALUE self, VALUE data, VALUE format)537 static VALUE import_from_memory(VALUE self, VALUE data, VALUE format) 538 538 { 539 539 long int bytes; 540 bytes = caca_import_ memory (_SELF, StringValuePtr(data), RSTRING(StringValue(data))->len, StringValuePtr(format));540 bytes = caca_import_canvas_from_memory (_SELF, StringValuePtr(data), RSTRING(StringValue(data))->len, StringValuePtr(format)); 541 541 if(bytes <= 0) 542 542 rb_raise(rb_eRuntimeError, strerror(errno)); … … 545 545 } 546 546 547 static VALUE import_f ile(VALUE self, VALUE filename, VALUE format)547 static VALUE import_from_file(VALUE self, VALUE filename, VALUE format) 548 548 { 549 549 long int bytes; 550 bytes = caca_import_ file (_SELF, StringValuePtr(filename), StringValuePtr(format));550 bytes = caca_import_canvas_from_file (_SELF, StringValuePtr(filename), StringValuePtr(format)); 551 551 if(bytes <= 0) 552 552 rb_raise(rb_eRuntimeError, strerror(errno)); … … 555 555 } 556 556 557 static VALUE export_ memory(VALUE self, VALUE format)557 static VALUE export_to_memory(VALUE self, VALUE format) 558 558 { 559 559 size_t bytes; 560 560 void *result; 561 561 VALUE ret; 562 result = caca_export_ memory (_SELF, StringValuePtr(format), &bytes);562 result = caca_export_canvas_to_memory (_SELF, StringValuePtr(format), &bytes); 563 563 ret = rb_str_new(result, bytes); 564 564 free(result); … … 644 644 645 645 rb_define_method(cCanvas, "render", render_canvas, 4); 646 rb_define_method(cCanvas, "import_ memory", import_memory, 2);647 rb_define_method(cCanvas, "import_f ile", import_file, 2);648 rb_define_method(cCanvas, "export_ memory", export_memory, 1);646 rb_define_method(cCanvas, "import_from_memory", import_from_memory, 2); 647 rb_define_method(cCanvas, "import_from_file", import_from_file, 2); 648 rb_define_method(cCanvas, "export_to_memory", export_to_memory, 1); 649 649 rb_define_singleton_method(cCanvas, "export_list", export_list, 0); 650 650 rb_define_singleton_method(cCanvas, "import_list", import_list, 0); 651 652 } 653 651 } 652 -
libcaca/trunk/src/cacadraw.c
r2821 r3495 1 1 /* 2 2 * event event lister for libcaca 3 * Copyright (c) 2004 Sam Hocevar <sam@zoy.org>3 * Copyright (c) 2004-2009 Sam Hocevar <sam@hocevar.net> 4 4 * All Rights Reserved 5 5 * … … 56 56 { 57 57 image = caca_create_canvas(0, 0); 58 if(caca_import_ file(image, argv[file], "ansi") < 0)58 if(caca_import_canvas_from_file(image, argv[file], "ansi") < 0) 59 59 { 60 60 fprintf(stderr, "%s: invalid file `%s'.\n", argv[0], argv[1]); -
libcaca/trunk/src/cacaplay.c
r3474 r3495 1 1 /* 2 2 * cacaplay caca file player 3 * Copyright (c) 2006 Sam Hocevar <sam@zoy.org>3 * Copyright (c) 2006-2009 Sam Hocevar <sam@hocevar.net> 4 4 * All Rights Reserved 5 5 * … … 90 90 } 91 91 92 bytes = caca_import_ memory(app, buf, total, "caca");92 bytes = caca_import_canvas_from_memory(app, buf, total, "caca"); 93 93 94 94 if(bytes > 0) -
libcaca/trunk/src/cacaserver.c
r3412 r3495 2 2 * cacaserver Colour ASCII-Art library 3 3 * Copyright (c) 2006 Jean-Yves Lamoureux <jylam@lnxscene.org> 4 * 2006 Sam Hocevar <sam@zoy.org>4 * 2006-2009 Sam Hocevar <sam@hocevar.net> 5 5 * All Rights Reserved 6 6 * … … 214 214 } 215 215 216 while(caca_import_ memory(server->canvas, server->input,217 server->read, "caca") < 0)216 while(caca_import_canvas_from_memory(server->canvas, server->input, 217 server->read, "caca") < 0) 218 218 { 219 219 memmove(server->input, server->input + 1, server->read - 1); … … 225 225 ssize_t needed, wanted; 226 226 227 needed = caca_import_memory(server->canvas, server->input, 228 server->read, "caca"); 227 needed = caca_import_canvas_from_memory(server->canvas, 228 server->input, 229 server->read, "caca"); 229 230 if(needed < 0) 230 231 goto restart; … … 253 254 /* Get ANSI representation of the image and skip the end-of buffer 254 255 * linefeed ("\r\n", 2 byte) */ 255 server->buffer = caca_export_ memory(server->canvas, "utf8cr",256 &server->buflen);256 server->buffer = caca_export_canvas_to_memory(server->canvas, "utf8cr", 257 &server->buflen); 257 258 server->buflen -= 2; 258 259 -
libcaca/trunk/src/img2txt.c
r2833 r3495 1 1 /* 2 2 * img2txt image to text converter 3 * Copyright (c) 2006 Sam Hocevar <sam@zoy.org>3 * Copyright (c) 2006-2009 Sam Hocevar <sam@hocevar.net> 4 4 * 2007 Jean-Yves Lamoureux <jylam@lnxscene.org> 5 5 * All Rights Reserved … … 82 82 printf( 83 83 "img2txt Copyright 2006-2007 Sam Hocevar and Jean-Yves Lamoureux\n" 84 "Internet: <sam@ zoy.org> <jylam@lnxscene.org> Version: %s, date: %s\n"84 "Internet: <sam@hocevar.net> <jylam@lnxscene.org> Version: %s, date: %s\n" 85 85 "\n" 86 86 "img2txt, along with its documentation, may be freely copied and distributed.\n" … … 225 225 unload_image(i); 226 226 227 export = caca_export_ memory(cv, format?format:"ansi", &len);227 export = caca_export_canvas_to_memory(cv, format?format:"ansi", &len); 228 228 if(!export) 229 229 {
Note: See TracChangeset
for help on using the changeset viewer.