Changeset 3511Tweet

Timestamp:

May 22, 2009, 3:22:57 PM (14 years ago)

Author:

Sam Hocevar

Message:

Fix import/export related stuff I forgot to update in the Ruby and PHP bindings.

Location:

libcaca/trunk

Files:

• caca-php/php_caca.c (modified) (4 diffs)
• ruby/ruby-caca.dox (modified) (3 diffs)
• ruby/t/tc_canvas.rb (modified) (2 diffs)

libcaca/trunk/caca-php/php_caca.c

@@ -1551 +1551 @@
         caca_file_read(file, buffer, len);
 
-        RETURN_STRINGL(buffer, len, 1cac);
+        RETURN_STRINGL(buffer, len, 1);
 }
 
@@ -1609 +1609 @@
         ZEND_FETCH_RESOURCE(canvas, caca_canvas_t*, &_zval, -1, PHP_CACA_CANVAS_RES_NAME, le_caca_canvas);
 
-        RETURN_LONG(caca_import_memory(canvas, src, src_len, format));
+        RETURN_LONG(caca_import_canvas_from_memory(canvas, src, src_len, format));
 }
 
@@ -1622 +1622 @@
         ZEND_FETCH_RESOURCE(canvas, caca_canvas_t*, &_zval, -1, PHP_CACA_CANVAS_RES_NAME, le_caca_canvas);
 
-        RETURN_LONG(caca_import_file(canvas, filename, format));
+        RETURN_LONG(caca_import_canvas_from_file(canvas, filename, format));
 }
 
@@ -1648 +1648 @@
         void *buffer;
         size_t len = 0;
-        buffer = caca_export_memory(canvas, type, &len);
+        buffer = caca_export_canvas_to_memory(canvas, type, &len);
         if (!buffer) {
                 RETURN_FALSE;

libcaca/trunk/ruby/ruby-caca.dox

@@ -57 +57 @@
 "draw_line","draw_polyline", "draw_thin_box", "draw_thin_ellipse",
 "draw_thin_line","draw_thin_polyline", "draw_thin_triangle",
-"draw_triangle","export_memory", "fill_box", "fill_ellipse",
+"draw_triangle","export_to_memory", "fill_box", "fill_ellipse",
 "fill_triangle","flip", "flop", "frame=", "frame_count", "frame_name",
 "frame_name=","free_frame", "get_attr", "get_char", "gotoxy",
 "handle_x","handle_y", "height", "height=", "import_file",
-"import_memory","invert", "printf", "put_attr", "put_char", "put_str",
+"import_from_memory","invert", "printf", "put_attr", "put_char", "put_str",
 "rotate_180","rotate_left", "rotate_right", "set_attr",
 "set_boundaries","set_color_ansi", "set_color_argb", "set_frame",
@@ -123 +123 @@
 $ruby -rcaca -e 'c=Caca::Canvas.new(6, 3).fill_box(0,0,2,2,"#"[0]);
 c2=Caca::Canvas.new(1,1).put_str(0,0,"x"); c.blit(1,1,c2); puts
-c.export_memory("irc")'
+c.export_to_memory("irc")'
 ###
 #x#
@@ -131 +131 @@
 \code
 $ruby -e 'puts Caca::Canvas.new(6,3).draw_thin_polyline([[0,0], [0,2],
-[5,2],[0,0]]).export_memory("irc")'
+[5,2],[0,0]]).export_to_memory("irc")'
 -.
 | `.

libcaca/trunk/ruby/t/tc_canvas.rb

@@ -27 +27 @@
     end
     def test_import
-        @c.import_memory("foo", "")
-        assert_equal("foo\r\n", @c.export_memory("irc"), "Import/Export failed")
+        @c.import_from_memory("foo", "")
+        assert_equal("foo\r\n", @c.export_to_memory("irc"), "Import/Export failed")
     end
     def test_cursor
@@ -38 +38 @@
         @c.put_char(1, 1, 64)
         @c.clear
-        assert_equal("", @c.export_memory("irc").strip, "Failed to clear canvas")
+        assert_equal("", @c.export_to_memory("irc").strip, "Failed to clear canvas")
     end
     def test_char