X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=ext%2Fext.c;h=31beceada0ffa392d0459e47069873000b2ebf0a;hb=49e6c8f56d89681f20836a14480959fa89d24e26;hp=1819958b73976137104e2b3f316ac024e0efaab0;hpb=3eb6e149e8a04c8e9571588b1782b31891c70a90;p=ruby-eet.git diff --git a/ext/ext.c b/ext/ext.c index 1819958..31becea 100644 --- a/ext/ext.c +++ b/ext/ext.c @@ -1,5 +1,5 @@ /* - * $Id: ext.c 30 2005-04-12 18:38:31Z tilman $ + * $Id: ext.c 34 2005-04-30 13:15:19Z tilman $ * * Copyright (c) 2005 Tilman Sauerbeck (tilman at code-monkey de) * @@ -27,8 +27,6 @@ #include #define CHECK_KEY(key) \ - StringValue((key)); \ -\ if (rb_funcall (key, rb_intern ("include?"), \ 1, INT2FIX (0)) == Qtrue) \ rb_raise (rb_eArgError, "key must not contain binary zeroes"); @@ -37,6 +35,15 @@ if (!*(ef)) \ rb_raise (rb_eIOError, "closed stream"); +#ifdef WORDS_BIGENDIAN +# define BSWAP32(x) \ + ((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >> 8) | \ + (((x) & 0x0000ff00) << 8) | (((x) & 0x000000ff) << 24)) +#else /* !WORDS_BIGENDIAN */ +# define BSWAP16(x) (x) +# define BSWAP32(x) (x) +#endif /* WORDS_BIGENDIAN */ + static VALUE c_close (VALUE self); static void @@ -108,8 +115,6 @@ c_init (int argc, VALUE *argv, VALUE self) cfile = StringValuePtr (file); if (!NIL_P (mode)) { - StringValue (mode); - tmp = StringValuePtr (mode); if (!strcmp (tmp, "r+")) m = EET_FILE_MODE_READ_WRITE; @@ -221,17 +226,16 @@ static VALUE c_delete (VALUE self, VALUE key) { Eet_File **ef = NULL; - char *tmp; + char *ckey; Data_Get_Struct (self, Eet_File *, ef); CHECK_CLOSED (ef); + ckey = StringValuePtr (key); CHECK_KEY (key); - tmp = StringValuePtr (key); - - if (!eet_delete (*ef, tmp)) - rb_raise (rb_eIOError, "cannot delete entry - %s", tmp); + if (!eet_delete (*ef, ckey)) + rb_raise (rb_eIOError, "cannot delete entry - %s", ckey); return self; } @@ -250,16 +254,18 @@ c_read (VALUE self, VALUE key) VALUE ret; Eet_File **ef = NULL; void *data; + char *ckey; int size = 0; Data_Get_Struct (self, Eet_File *, ef); CHECK_CLOSED (ef); + ckey = StringValuePtr (key); CHECK_KEY (key); - data = eet_read (*ef, StringValuePtr (key), &size); + data = eet_read (*ef, ckey, &size); if (!data) - rb_raise (rb_eIOError, "cannot read entry - %s", key); + rb_raise (rb_eIOError, "cannot read entry - %s", ckey); ret = rb_str_new (data, size); @@ -283,6 +289,7 @@ c_write (int argc, VALUE *argv, VALUE self) { VALUE key = Qnil, buf = Qnil, comp = Qnil; Eet_File **ef = NULL; + char *ckey, *cbuf; int n; Data_Get_Struct (self, Eet_File *, ef); @@ -293,11 +300,12 @@ c_write (int argc, VALUE *argv, VALUE self) if (NIL_P (comp)) comp = Qtrue; + ckey = StringValuePtr (key); CHECK_KEY (key); - StringValue (buf); + cbuf = StringValuePtr (buf); - n = eet_write (*ef, StringValuePtr (key), - StringValuePtr (buf), RSTRING (buf)->len, + n = eet_write (*ef, ckey, + cbuf, RSTRING (buf)->len, comp == Qtrue); if (!n) rb_raise (rb_eIOError, "couldn't write to file"); @@ -323,18 +331,20 @@ c_read_image (VALUE self, VALUE key) VALUE ret, comp; Eet_File **ef = NULL; void *data; + char *ckey; int w = 0, h = 0, has_alpha = 0, level = 0, quality = 0, lossy = 0; Data_Get_Struct (self, Eet_File *, ef); CHECK_CLOSED (ef); + ckey = StringValuePtr (key); CHECK_KEY (key); - data = eet_data_image_read (*ef, StringValuePtr (key), &w, &h, + data = eet_data_image_read (*ef, ckey, &w, &h, &has_alpha, &level, &quality, &lossy); if (!data) - rb_raise (rb_eIOError, "cannot read entry - %s", key); + rb_raise (rb_eIOError, "cannot read entry - %s", ckey); comp = rb_hash_new (); rb_hash_aset (comp, ID2SYM (rb_intern ("lossy")), INT2FIX (lossy)); @@ -371,6 +381,7 @@ c_write_image (int argc, VALUE *argv, VALUE self) VALUE key = Qnil, buf = Qnil, w = Qnil, h = Qnil, has_alpha = Qnil; VALUE comp = Qnil, tmp; Eet_File **ef = NULL; + char *ckey, *cbuf; int n, lossy = 0, level = 9, quality = 100; Data_Get_Struct (self, Eet_File *, ef); @@ -382,8 +393,9 @@ c_write_image (int argc, VALUE *argv, VALUE self) if (NIL_P (has_alpha)) has_alpha = Qfalse; + ckey = StringValuePtr (key); CHECK_KEY (key); - StringValue (buf); + cbuf = StringValuePtr (buf); Check_Type (w, T_FIXNUM); Check_Type (h, T_FIXNUM); @@ -406,8 +418,7 @@ c_write_image (int argc, VALUE *argv, VALUE self) if (!RSTRING (buf)->len) return INT2FIX (0); - n = eet_data_image_write (*ef, StringValuePtr (key), - StringValuePtr (buf), + n = eet_data_image_write (*ef, ckey, cbuf, FIX2INT (w), FIX2INT (h), has_alpha == Qtrue, level, quality, lossy); @@ -417,6 +428,79 @@ c_write_image (int argc, VALUE *argv, VALUE self) return INT2FIX (n); } +static VALUE +stream_serialize (VALUE self) +{ + VALUE ret; + struct RArray *stream; + static ID id_serialize; + long i; + + ret = rb_str_new2 (""); + + stream = RARRAY (self); + if (!stream->len) + return ret; + + if (!id_serialize) + id_serialize = rb_intern ("serialize"); + + for (i = 0; i < stream->len; i++) { + VALUE str = rb_funcall (stream->ptr[i], id_serialize, 0, NULL); + + rb_str_append (ret, str); + } + + return ret; +} + +static VALUE +chunk_serialize (VALUE self) +{ + VALUE tmp, ret; + unsigned int size, buf_len; + unsigned char *buf; + struct RString *tag, *data; + static ID id_tag, id_data; + + if (!id_tag) + id_tag = rb_intern ("@tag"); + + if (!id_data) + id_data = rb_intern ("@data"); + + tmp = rb_ivar_get (self, id_tag); + StringValue (tmp); + tag = RSTRING (tmp); + + tmp = rb_ivar_get (self, id_data); + StringValue (tmp); + data = RSTRING (tmp); + + buf_len = 9 + tag->len + data->len; + ret = rb_str_buf_new (buf_len); + + buf = RSTRING (ret)->ptr; + RSTRING (ret)->len = buf_len; + + memcpy (buf, "CHnK", 4); + buf += 4; + + size = tag->len + data->len + 1; + size = BSWAP32 (size); + memcpy (buf, &size, 4); + buf += 4; + + memcpy (buf, tag->ptr, tag->len); + buf += tag->len; + + *buf++ = 0; + + memcpy (buf, data->ptr, data->len); + + return ret; +} + void Init_eet_ext () { @@ -435,4 +519,10 @@ Init_eet_ext () rb_define_method (c, "write", c_write, -1); rb_define_method (c, "read_image", c_read_image, 1); rb_define_method (c, "write_image", c_write_image, -1); + + c = rb_define_class_under (m, "Stream", rb_cArray); + rb_define_method (c, "serialize", stream_serialize, 0); + + c = rb_define_class_under (m, "Chunk", rb_cObject); + rb_define_method (c, "serialize", chunk_serialize, 0); }