X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=ext%2Fext.c;h=674220f1d968f3288f2f4fb4bae1650f2ce4ab11;hb=8e881f67984232c0a116ce0cda57d828a2b49b7b;hp=a734dfad6da6370ae878b0b82b3903dca2f6356a;hpb=6289e751f9a1a7c0a46345503da94f64426a71fe;p=ruby-eet.git

diff --git a/ext/ext.c b/ext/ext.c
index a734dfa..674220f 100644
--- a/ext/ext.c
+++ b/ext/ext.c
@@ -1,5 +1,5 @@
 /*
- * $Id: ext.c 49 2005-05-30 19:52:36Z tilman $
+ * $Id: ext.c 54 2005-06-02 20:05:38Z tilman $
  *
  * Copyright (c) 2005 Tilman Sauerbeck (tilman at code-monkey de)
  *
@@ -46,8 +46,9 @@
 static VALUE c_close (VALUE self);
 
 static VALUE cStream, cChunk,
-             eEetError, eNameError, ePropError;
-static ID id_include, id_serialize, id_push, id_empty,
+             eEetError, eNameError, ePropError,
+             sym_lossy, sym_level, sym_quality;
+static ID id_include, id_serialize, id_push, id_keys,
           id_to_eet_chunks, id_to_eet_name, id_to_eet_properties,
           id_tag, id_data;
 
@@ -352,9 +353,9 @@ c_read_image (VALUE self, VALUE key)
 		rb_raise (rb_eIOError, "cannot read entry - %s", ckey);
 
 	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));
+	rb_hash_aset (comp, sym_lossy, INT2FIX (lossy));
+	rb_hash_aset (comp, sym_level, INT2FIX (level));
+	rb_hash_aset (comp, sym_quality, INT2FIX (quality));
 
 	ret = rb_ary_new3 (5, rb_str_new (data, w * h * 4),
 		               INT2FIX (w), INT2FIX (h),
@@ -407,15 +408,15 @@ c_write_image (int argc, VALUE *argv, VALUE self)
 	if (!NIL_P (comp)) {
 		Check_Type (comp, T_HASH);
 
-		tmp = rb_hash_aref (comp, ID2SYM (rb_intern ("lossy")));
+		tmp = rb_hash_aref (comp, sym_lossy);
 		if (!NIL_P (tmp))
 			lossy = FIX2INT (tmp);
 
-		tmp = rb_hash_aref (comp, ID2SYM (rb_intern ("level")));
+		tmp = rb_hash_aref (comp, sym_level);
 		if (!NIL_P (tmp))
 			level = FIX2INT (tmp);
 
-		tmp = rb_hash_aref (comp, ID2SYM (rb_intern ("quality")));
+		tmp = rb_hash_aref (comp, sym_quality);
 		if (!NIL_P (tmp))
 			quality = FIX2INT (tmp);
 	}
@@ -544,7 +545,7 @@ for_each_prop (VALUE tag, VALUE arg, VALUE stream)
 }
 
 /*
- * :call-seq:
+ * call-seq:
  *  object.to_eet -> string
  *
  * Serializes the receiver to EET format.
@@ -553,23 +554,36 @@ static VALUE
 c_to_eet (VALUE self)
 {
 	VALUE props, name, stream, chunk, args[2];
+#ifndef HAVE_RB_HASH_FOREACH
+	struct RArray *keys;
+	long i;
+#endif
 
 	props = rb_funcall (self, id_to_eet_properties, 0);
 
 	if (rb_obj_is_kind_of (props, rb_cHash) == Qfalse ||
-	    rb_funcall (props, id_empty, 0) == Qtrue)
+	    !RHASH (props)->tbl->num_entries)
 		rb_raise (ePropError, "invalid EET properties");
 
 	name = rb_funcall (self, id_to_eet_name, 0);
 	StringValue (name);
 
-	if (rb_funcall (name, id_include, 1, INT2FIX (0)) == Qtrue ||
-	    rb_funcall (name, id_empty, 0) == Qtrue)
+	if (!RSTRING (name)->len ||
+	    rb_funcall (name, id_include, 1, INT2FIX (0)))
 		rb_raise (eNameError, "invalid EET name");
 
 	stream = rb_class_new_instance (0, NULL, cStream);
 
+#ifdef HAVE_RB_HASH_FOREACH
 	rb_hash_foreach (props, for_each_prop, stream);
+#else
+	keys = RARRAY (rb_funcall (props, id_keys, 0));
+
+	for (i = 0; i < keys->len; i++)
+		for_each_prop (keys->ptr[i],
+		               rb_hash_aref (props, keys->ptr[i]),
+		               stream);
+#endif
 
 	args[0] = name;
 	args[1] = rb_funcall (stream, id_serialize, 0);
@@ -618,10 +632,13 @@ Init_eet_ext ()
 	id_include = rb_intern ("include?");
 	id_serialize = rb_intern ("serialize");
 	id_push = rb_intern ("push");
-	id_empty = rb_intern ("empty?");
+	id_keys = rb_intern ("keys");
 	id_to_eet_chunks = rb_intern ("to_eet_chunks");
 	id_to_eet_name = rb_intern ("to_eet_name");
 	id_to_eet_properties = rb_intern ("to_eet_properties");
 	id_tag = rb_intern ("@tag");
 	id_data = rb_intern ("@data");
+	sym_lossy = ID2SYM (rb_intern ("lossy"));
+	sym_level = ID2SYM (rb_intern ("level"));
+	sym_quality =  ID2SYM (rb_intern ("quality"));
 }