Changeset 2979 for cacamoo/trunk
- Timestamp:
- Oct 18, 2008, 11:24:58 PM (14 years ago)
- Location:
- cacamoo/trunk
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
cacamoo/trunk/configure.ac
r2441 r2979 36 36 37 37 CACA="no" 38 PKG_CHECK_MODULES(C UCUL, cucul,38 PKG_CHECK_MODULES(CACA, caca >= 0.99.beta15, 39 39 [CACA="yes"], 40 40 [AC_MSG_RESULT(no) 41 AC_MSG_ERROR([you need libc ucul version 0.99or later])])41 AC_MSG_ERROR([you need libcaca version 0.99.beta15 or later])]) 42 42 43 43 # Optimizations -
cacamoo/trunk/src/Makefile.am
r1448 r2979 3 3 4 4 cacamoo_SOURCES = main.c cacamoo.h 5 cacamoo_CFLAGS = @C UCUL_CFLAGS@6 cacamoo_LDADD = @C UCUL_LIBS@5 cacamoo_CFLAGS = @CACA_CFLAGS@ 6 cacamoo_LDADD = @CACA_LIBS@ 7 7 -
cacamoo/trunk/src/cacamoo.h
r1457 r2979 13 13 */ 14 14 15 #ifndef _CACA SAY_H_16 #define _CACA SAY_H_15 #ifndef _CACAMOO_H_ 16 #define _CACAMOO_H_ 17 17 18 18 #include <stdio.h> … … 24 24 25 25 26 #include <c ucul.h>26 #include <caca.h> 27 27 28 28 static void version(void); … … 39 39 #endif 40 40 41 #endif /* _CACA SAY_H_ */41 #endif /* _CACAMOO_H_ */ -
cacamoo/trunk/src/main.c
r1457 r2979 27 27 28 28 #include "cacamoo.h" 29 #include <c ucul.h>29 #include <caca.h> 30 30 31 31 char const *cacamoo_export = "utf8"; … … 73 73 char *initial = NULL; 74 74 unsigned int no_wrap = 0; 75 cucul_buffer_t* input_buffer; 76 cucul_buffer_t* output_buffer; 77 cucul_canvas_t* canvas; 78 int buf_size; 75 caca_canvas_t* canvas; 76 size_t buf_size; 79 77 char *buf_data; 80 78 … … 251 249 } 252 250 253 254 251 /* Import our buffer as an ansi (color) one */ 255 input_buffer = cucul_load_memory(buffer, buffer_size-1); 256 if(input_buffer == NULL) 257 { 258 printf("Can't load file in libcucul !\n"); 252 canvas = caca_create_canvas(0, 0); 253 if(caca_import_memory(canvas, buffer, buffer_size - 1, 254 unicode ? "utf8" : "ansi") < 0) 255 { 256 printf("Can't load file in libcaca !\n"); 259 257 return -1; 260 258 } 261 canvas = cucul_import_canvas (input_buffer, unicode?"utf8":"ansi"); 262 if(canvas == NULL) 263 { 264 printf("Can't load file in libcucul !\n"); 265 return -1; 266 } 259 267 260 /* Export given canvas to format we want */ 268 output_buffer = cucul_export_canvas(canvas, "utf8");269 if( output_buffer== NULL)261 buf_data = caca_export_memory(canvas, "utf8", &buf_size); 262 if(buf_data == NULL) 270 263 { 271 264 printf("Can't export file to text !\n"); … … 273 266 } 274 267 275 buf_size = cucul_get_buffer_size(output_buffer); 276 buf_data = cucul_get_buffer_data(output_buffer); 277 278 for(i = 0; i < buf_size; i++) 279 printf("%c", buf_data[i]); 268 fwrite(buf_data, buf_size, 1, stdout); 280 269 281 270 if(string) … … 284 273 free(buffer); 285 274 286 cucul_free_buffer(input_buffer); 287 cucul_free_buffer(output_buffer); 288 cucul_free_canvas(canvas); 289 275 free(buf_data); 276 caca_free_canvas(canvas); 290 277 291 278 return 0;
Note: See TracChangeset
for help on using the changeset viewer.