X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=ext%2Fext.c;h=02ddba9454dd2789c3e08b86cb7bd9f5747a492a;hb=2c5f0577496dbb429a327fc85e72e7f4dcf4250c;hp=f7860d6d2f2ff0c23799ea2868c1f7ab6f4f4aee;hpb=f54bec7b431be7885c49b2077e9116898298d2dd;p=ruby-eet.git diff --git a/ext/ext.c b/ext/ext.c index f7860d6..02ddba9 100644 --- a/ext/ext.c +++ b/ext/ext.c @@ -1,5 +1,5 @@ /* - * $Id: ext.c 1 2005-03-26 01:45:38Z tilman $ + * $Id: ext.c 35 2005-05-10 18:58:49Z tilman $ * * Copyright (c) 2005 Tilman Sauerbeck (tilman at code-monkey de) * @@ -27,13 +27,26 @@ #include #define CHECK_KEY(key) \ - Check_Type ((key), T_STRING); \ - if (rb_funcall ((key), rb_intern ("include?"), \ - 1, INT2FIX (0)) == Qtrue) \ + if (rb_funcall (key, id_include, 1, INT2FIX (0)) == Qtrue) \ rb_raise (rb_eArgError, "key must not contain binary zeroes"); +#define CHECK_CLOSED(ef) \ + 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 VALUE id_include; + static void c_free (Eet_File **ef) { @@ -94,17 +107,15 @@ c_init (int argc, VALUE *argv, VALUE self) VALUE file = Qnil, mode = Qnil; Eet_File **ef = NULL; Eet_File_Mode m = EET_FILE_MODE_READ; - const char *tmp; + const char *tmp, *cfile; Data_Get_Struct (self, Eet_File *, ef); rb_scan_args (argc, argv, "11", &file, &mode); - Check_Type (file, T_STRING); + cfile = StringValuePtr (file); if (!NIL_P (mode)) { - Check_Type (mode, T_STRING); - tmp = StringValuePtr (mode); if (!strcmp (tmp, "r+")) m = EET_FILE_MODE_READ_WRITE; @@ -116,7 +127,7 @@ c_init (int argc, VALUE *argv, VALUE self) eet_init (); - *ef = eet_open (StringValuePtr (file), m); + *ef = eet_open (cfile, m); if (!*ef) { switch (m) { case EET_FILE_MODE_READ_WRITE: @@ -128,7 +139,7 @@ c_init (int argc, VALUE *argv, VALUE self) break; } - rb_raise (rb_eRuntimeError, tmp, file); + rb_raise (rb_eRuntimeError, tmp, cfile); } return self; @@ -151,15 +162,12 @@ c_close (VALUE self) Eet_File **ef = NULL; Data_Get_Struct (self, Eet_File *, ef); + CHECK_CLOSED (ef); - if (!*ef) - rb_raise (rb_eIOError, "closed stream"); - else { - eet_close (*ef); - *ef = NULL; + eet_close (*ef); + *ef = NULL; - eet_shutdown (); - } + eet_shutdown (); return self; } @@ -180,9 +188,7 @@ c_list (int argc, VALUE *argv, VALUE self) int i, count = 0; Data_Get_Struct (self, Eet_File *, ef); - - if (!*ef) - rb_raise (rb_eIOError, "closed stream"); + CHECK_CLOSED (ef); switch (eet_mode_get (*ef)) { case EET_FILE_MODE_READ: @@ -194,10 +200,8 @@ c_list (int argc, VALUE *argv, VALUE self) rb_scan_args (argc, argv, "01", &glob); - if (!NIL_P (glob)) { - Check_Type (glob, T_STRING); + if (!NIL_P (glob)) tmp = StringValuePtr (glob); - } ret = rb_ary_new (); @@ -223,19 +227,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); - if (!*ef) - rb_raise (rb_eIOError, "closed stream"); - + 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; } @@ -254,18 +255,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); - if (!*ef) - rb_raise (rb_eIOError, "closed stream"); - + 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); @@ -289,23 +290,23 @@ 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); - - if (!*ef) - rb_raise (rb_eIOError, "closed stream"); + CHECK_CLOSED (ef); rb_scan_args (argc, argv, "21", &key, &buf, &comp); if (NIL_P (comp)) comp = Qtrue; + ckey = StringValuePtr (key); CHECK_KEY (key); - Check_Type (buf, T_STRING); + 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"); @@ -320,32 +321,40 @@ c_write (int argc, VALUE *argv, VALUE self) * Reads an image entry from _ef_ that is stored as _key_. * If the data cannot be read, an +IOError+ is raised, * otherwise an Array is returned that contains the image data, - * the image width, the image height and a boolean that indicates - * whether the image has an alpha channel or not. + * the image width, the image height, a boolean that indicates + * whether the image has an alpha channel or not and a hash + * that contains the compression options that were used to store + * the image (see Eet::File#write_image). */ static VALUE c_read_image (VALUE self, VALUE key) { - VALUE ret; + VALUE ret, comp; Eet_File **ef = NULL; void *data; - int w = 0, h = 0, has_alpha = 0; + 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); - if (!*ef) - rb_raise (rb_eIOError, "closed stream"); - + ckey = StringValuePtr (key); CHECK_KEY (key); - data = eet_data_image_read (*ef, StringValuePtr (key), &w, &h, - &has_alpha, NULL, NULL, NULL); + 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); - ret = rb_ary_new3 (4, rb_str_new (data, w * h * 4), + comp = rb_hash_new (); + rb_hash_aset (comp, ID2SYM (rb_intern ("lossy")), INT2FIX (lossy)); + rb_hash_aset (comp, ID2SYM (rb_intern ("level")), INT2FIX (level)); + rb_hash_aset (comp, ID2SYM (rb_intern ("quality")), INT2FIX (quality)); + + ret = rb_ary_new3 (5, rb_str_new (data, w * h * 4), INT2FIX (w), INT2FIX (h), - has_alpha ? Qtrue : Qfalse); + has_alpha ? Qtrue : Qfalse, comp); free (data); return ret; @@ -353,10 +362,17 @@ c_read_image (VALUE self, VALUE key) /* * call-seq: - * ef.write_image(key, image_data, w, h [, alpha] ) -> integer + * ef.write_image(key, image_data, w, h [, alpha] [, comp] ) -> integer * * Stores _image_data_ with width _w_ and height _h_ in _ef_ as _key_. * Pass true for _alpha_ if the image contains an alpha channel. + * You can control how the image is compressed by passing _comp_, which + * is a hash whose :lossy entry is true if the image should be + * compressed lossily. If :lossy is true, the :quality entry + * (0-100, default 100) sets the compression quality. + * If :lossy is false, the :level entry (0-9, default 9) sets the + * compression level. If _comp_ isn't passed, then the + * image is stored losslessly. * If the data cannot be written, an +IOError+ is raised, * otherwise a the number of bytes written is returned. */ @@ -364,37 +380,128 @@ static VALUE 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; - int n; + char *ckey, *cbuf; + int n, lossy = 0, level = 9, quality = 100; Data_Get_Struct (self, Eet_File *, ef); + CHECK_CLOSED (ef); - if (!*ef) - rb_raise (rb_eIOError, "closed stream"); - - rb_scan_args (argc, argv, "41", &key, &buf, &w, &h, &has_alpha); + rb_scan_args (argc, argv, "42", &key, &buf, &w, &h, &has_alpha, + &comp); if (NIL_P (has_alpha)) has_alpha = Qfalse; + ckey = StringValuePtr (key); CHECK_KEY (key); - Check_Type (buf, T_STRING); + cbuf = StringValuePtr (buf); Check_Type (w, T_FIXNUM); Check_Type (h, T_FIXNUM); + if (!NIL_P (comp)) { + Check_Type (comp, T_HASH); + + tmp = rb_hash_aref (comp, ID2SYM (rb_intern ("lossy"))); + if (!NIL_P (tmp)) + lossy = FIX2INT (tmp); + + tmp = rb_hash_aref (comp, ID2SYM (rb_intern ("level"))); + if (!NIL_P (tmp)) + level = FIX2INT (tmp); + + tmp = rb_hash_aref (comp, ID2SYM (rb_intern ("quality"))); + if (!NIL_P (tmp)) + quality = FIX2INT (tmp); + } + 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, 9, 0, 0); + has_alpha == Qtrue, + level, quality, lossy); if (!n) rb_raise (rb_eIOError, "couldn't write to file"); else 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 () { @@ -413,4 +520,12 @@ 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); + + id_include = rb_intern ("include?"); }