From c89b56944f67c8d5c27c961998cccce39fc0bfb0 Mon Sep 17 00:00:00 2001 From: Tilman Sauerbeck Date: Mon, 30 May 2005 20:38:34 +0000 Subject: [PATCH] Code cleanup. --- ChangeLog | 3 ++- ext/ext.c | 20 ++++++++++++-------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5b549a9..58fd35d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,11 +1,12 @@ -- -$Id: ChangeLog 49 2005-05-30 19:52:36Z tilman $ +$Id: ChangeLog 50 2005-05-30 20:38:34Z tilman $ ++ 2005-05-30 Tilman Sauerbeck (tilman at code-monkey de) * lib/eet.rb, ext/ext.c: Re-implemented Chunk#initialize in C * ext/ext.c: Code cleanup * lib/eet.rb, ext/ext.c: Re-implemented Object#to_eet in C + * ext/ext.c: Code cleanup 2005-05-25 Tilman Sauerbeck (tilman at code-monkey de) * test/test_array_sub.rb: Added a test for the :sub format diff --git a/ext/ext.c b/ext/ext.c index a734dfa..aa69823 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 50 2005-05-30 20:38:34Z tilman $ * * Copyright (c) 2005 Tilman Sauerbeck (tilman at code-monkey de) * @@ -46,7 +46,8 @@ static VALUE c_close (VALUE self); static VALUE cStream, cChunk, - eEetError, eNameError, ePropError; + eEetError, eNameError, ePropError, + sym_lossy, sym_level, sym_quality; static ID id_include, id_serialize, id_push, id_empty, 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); } @@ -624,4 +625,7 @@ Init_eet_ext () 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")); } -- 2.30.2