ruby-exiv2 1.3 → 1.5

data/ext/image.cpp

@@ -1,230 +0,0 @@
-#include "exiv2.hpp"
-
-static void image_real_save(rbImage* image);
-
-static void image_delete(rbImage* image) {
-	__BEGIN
-	image_real_save(image);
-	delete image;
-	__VOID_END
-}
-
-static void image_leave(rbImage* image) {
-	
-}
-
-/*
- * Document-class: Exiv2::Image
- * Image is used to access to all exif data of image
- *
- *   @image = Exiv2::Image.new("my.jpg")
- *   puts @image["Iptc.Application2.DateCreated"]
- *   puts @image["Exif.Image.Software"]
- */
-static VALUE exiv2_image_s_allocate(VALUE klass) {
-	__BEGIN
-	rbImage* image = new rbImage();
-	image->dirty = false;
-	return Data_Wrap_Struct(klass, 0, image_delete, image);
-	__END
-}
-
-/*
- *   img = Exiv2::Image.new("IMGP3025.jpg")
- */
-static VALUE exiv2_image_initialize(VALUE self, VALUE file) {
-	__BEGIN
-	rbImage* image;
-	Data_Get_Struct(self, rbImage, image);
-	
-	
-	try {
-		if(rb_respond_to(file, rb_intern("read"))) {
-			VALUE file_content = rb_funcall(file, rb_intern("read"), 0);
-			rb_iv_set(self, "@file_content", file_content);
-			image->image = Exiv2::ImageFactory::open(CBSTR(file_content), LEN(file_content));
-		} else if(TYPE(file) == T_STRING) {
-			image->image = Exiv2::ImageFactory::open(CSTR(file));
-		}
-		image->image->readMetadata();
-	}
-	catch(const Exiv2::AnyError&) {
-		rb_raise(rb_eStandardError, "Cannot open file %s", STR(file));
-    }	
-	return self;
-	__END
-}
-
-/*
- *
- * Load Exiv2::Image from memory string
- *
- *   content = File.open("a.jpg").read
- *   img = Exiv2::Image.load_string(content)
- */
-static VALUE exiv2_image_load_string(VALUE self, VALUE string) {
-	__BEGIN
-	Check_Type(string, T_STRING);
-	rbImage* image = new rbImage();
-	image->dirty = false;
-	VALUE img = Data_Wrap_Struct(self, 0, image_delete, image);
-	
-	image->image = Exiv2::ImageFactory::open(CBSTR(string), LEN(string));
-	return img;
-	__END
-}
-
-
-static void image_real_save(rbImage* image) {
-	if(image->dirty) {
-		image->image->writeMetadata();
-		image->dirty = false;
-	}
-}
-
-/*
- * Save image with changed data
- */
-static VALUE exiv2_image_save(VALUE self) {
-	__BEGIN
-	rbImage* image;
-	Data_Get_Struct(self, rbImage, image);
-	image_real_save(image);
-	return self;
-	__END
-}
-
-/*
- * Clear all metadata in image. Not only exif
- */
-static VALUE exiv2_image_clear(VALUE self) {
-	__BEGIN
-	rbImage* image;
-	Data_Get_Struct(self, rbImage, image);
-	image->image->clearMetadata();
-	image->dirty = true;
-	return self;
-	__END
-}
-
-/*
- * Get comment of image
- */
-static VALUE exiv2_image_get_comment(VALUE self) {
-	__BEGIN
-	rbImage* image;
-	Data_Get_Struct(self, rbImage, image);
-	std::string comment = image->image->comment();
-	return rb_str_new(comment.c_str(), comment.length());
-	__END
-}
-
-/*
- * Set comment in image
- */
-static VALUE exiv2_image_set_comment(VALUE self, VALUE comment) {
-	__BEGIN
-	rbImage* image;
-	Data_Get_Struct(self, rbImage, image);
-	switch(TYPE(comment)) {
-		case T_STRING: {
-			image->image->setComment(CSTR(comment));
-			image->dirty = true;
-			break;
-		}
-		case T_NIL: {
-			image->image->clearComment();
-			image->dirty = true;
-			break;
-		}
-		default: {
-			rb_raise(rb_eStandardError, "Can only set comment to string, or clear it with nil value");
-		}
-	}
-	return comment;
-	__END
-}
-
-/*
- * Access to exif data of image
- */
-static VALUE exiv2_image_exif(VALUE self) {
-	__BEGIN
-	rbImage* image;
-	Data_Get_Struct(self, rbImage, image);
-	VALUE exif = Data_Wrap_Struct(cExif, 0, image_leave, image);
-	rb_iv_set(exif, "@image", self);
-	return exif;
-	__END
-}
-
-/*
- * Access to iptc data of image
- */
-static VALUE exiv2_image_iptc(VALUE self) {
-	__BEGIN
-	rbImage* image;
-	Data_Get_Struct(self, rbImage, image);
-	VALUE iptc = Data_Wrap_Struct(cIptc, 0, image_leave, image);
-	rb_iv_set(iptc, "@image", self);
-	return iptc;
-	__END
-}
-
-
-/*
- * Dump thumbnail to file.
- * @img.thumbnail("my_image")
- */
-static VALUE exiv2_image_thumbnail(VALUE self, VALUE file_name) {
-	__BEGIN
-	Check_Type(file_name, T_STRING);
-	
-	rbImage* image;
-	Data_Get_Struct(self, rbImage, image);
-
-	Exiv2::ExifData &exifData = image->image->exifData();
-	exifData.writeThumbnail(STR(file_name));
-	if(rb_block_given_p()) {
-		rb_yield(file_name);
-	}
-	return self;
-	__END
-}
-
-/*
- * Set image thumbnail to contents of passed file
- * @img.thumbnail = "my_image.jpg"
- */
-static VALUE exiv2_image_thumbnail_set(VALUE self, VALUE file_name) {
-	__BEGIN
-	Check_Type(file_name, T_STRING);
-	
-	rbImage* image;
-	Data_Get_Struct(self, rbImage, image);
-
-	Exiv2::ExifData &exifData = image->image->exifData();
-	exifData.setJpegThumbnail(STR(file_name));
-	return self;
-	__END
-}
-
-
-void Init_image() {
-	cImage = rb_define_class_under(mExiv2, "Image", rb_cObject);
-	rb_define_alloc_func(cImage, exiv2_image_s_allocate);
-	rb_define_method(cImage, "initialize", VALUEFUNC(exiv2_image_initialize), 1);
-	rb_define_singleton_method(cImage, "load_string", VALUEFUNC(exiv2_image_load_string), 1);
-	
-	rb_define_method(cImage, "exif", VALUEFUNC(exiv2_image_exif), 0);
-	rb_define_method(cImage, "Exif", VALUEFUNC(exiv2_image_exif), 0);
-	rb_define_method(cImage, "iptc", VALUEFUNC(exiv2_image_iptc), 0);
-
-	rb_define_method(cImage, "thumbnail", VALUEFUNC(exiv2_image_thumbnail), 1);
-	rb_define_method(cImage, "thumbnail=", VALUEFUNC(exiv2_image_thumbnail_set), 1);
-
-	rb_define_method(cImage, "save", VALUEFUNC(exiv2_image_save), 0);
-	rb_define_method(cImage, "clear", VALUEFUNC(exiv2_image_clear), 0);
-	rb_define_method(cImage, "comment", VALUEFUNC(exiv2_image_get_comment), 0);
-	rb_define_method(cImage, "comment=", VALUEFUNC(exiv2_image_set_comment), 1);
-}

data/ext/iptc.cpp

@@ -1,253 +0,0 @@
-#include "exiv2.hpp"
-
-/*
- * First, I have to get out type by key. If such key is forbidden, I will refuse to marshall it.
- * Then, I will cast ruby VALUE to C++ value, according to type_id
- * then I will just set apropreciated hash entry to this casted value
- */
-static bool marshall_value(Exiv2::IptcData &data, const char* key, VALUE value) {
-	Exiv2::TypeId type_id;
-	try {
-		Exiv2::IptcKey iptcKey(key);
-		type_id = Exiv2::IptcDataSets::dataSetType(iptcKey.tag(), iptcKey.record());
-	}
-	catch(Exiv2::Error& e) {
-		rb_raise(eError, "Cannot set tag %s because it doesn't exists. Look at http://www.exiv2.org/tags.html for list of supported tags", key);
-	}
-	switch(type_id) {
-		case Exiv2::invalidTypeId:
-		{
-			rb_warn("Trying to marshall invalid type id");
-			return Qnil;
-		}
-		
-		case Exiv2::unsignedByte:
-		case Exiv2::unsignedShort:
-		case Exiv2::unsignedLong:
-		case Exiv2::signedShort:
-		case Exiv2::signedLong: 
-		{
-			data[key] = NUM2INT(value);
-			return true;
-		}
-		
-		case Exiv2::asciiString:
-		case Exiv2::string: 
-		case Exiv2::undefined:
-		{
-			data[key] = std::string(STR(value));
-			return true;
-		}
-		
-		case Exiv2::unsignedRational:
-		case Exiv2::signedRational: 
-		{
-			if(rb_respond_to(value, rb_intern("numerator"))) {
-				int numerator = NUM2INT(rb_funcall(value, rb_intern("numerator"), 0));
-				int denominator = NUM2INT(rb_funcall(value, rb_intern("denominator"), 0));
-				data[key] = numerator / denominator;
-				return true;
-			}
-			data[key] = int(NUM2INT(value));
-			return true;
-		}
-		
-		case Exiv2::date:
-		{
-			int year = NUM2INT(rb_funcall(value, rb_intern("year"), 0));
-			int month = NUM2INT(rb_funcall(value, rb_intern("month"), 0));
-			int day = NUM2INT(rb_funcall(value, rb_intern("day"), 0));
-			data[key] = Exiv2::DateValue(year, month, day);
-			return true;
-		}
-		case Exiv2::time: {
-			int hour = NUM2INT(rb_funcall(value, rb_intern("hour"), 0));
-			int minute = NUM2INT(rb_funcall(value, rb_intern("min"), 0));
-			int second = NUM2INT(rb_funcall(value, rb_intern("sec"), 0));
-			data[key] = Exiv2::TimeValue(hour, minute, second);
-			return true;
-		}
-		
-		case Exiv2::invalid6:
-		case Exiv2::comment:
-		case Exiv2::directory:
-		case Exiv2::lastTypeId:
-		{
-			data[key] = std::string(STR(value));
-			return true;
-		}
-	}
-	return false;
-}
-
-
-/*
- * Access iptc tag by name
- *
- * <code>Exiv2::Image.new("test/data/smiley.jpg").iptc["Iptc.Application2.ObjectName"] => "GreeenDude"</code>
- */
-static VALUE exiv2_iptc_get(VALUE self, VALUE key) {
-	__BEGIN
-	rbImage* image;
-	Data_Get_Struct(self, rbImage, image);
-
-	VALUE strkey = rb_funcall(key, rb_intern("to_s"), 0);
-	Exiv2::IptcData &iptcData = image->image->iptcData();
-	
-	if(iptcData.empty()) {
-		return Qnil;
-	}
-	
-    Exiv2::IptcKey iptcKey(STR(strkey));
-    Exiv2::IptcData::const_iterator pos = iptcData.findKey(iptcKey);
-    if (pos == iptcData.end()) {
-		return Qnil;
-    }
-	
-	return unmarshall_value(pos->value());
-	__NIL_END
-}
-
-#if 1
-/*
- *  @iptc["Iptc.Application2.ObjectName"] = "GreeenDude"
- * [] — is a universal accessor
- */
-static VALUE exiv2_iptc_set(VALUE self, VALUE key, VALUE value) {
-	__BEGIN
-	rbImage* image;
-	Data_Get_Struct(self, rbImage, image);
-
-	VALUE strkey = rb_funcall(key, rb_intern("to_s"), 0);
-
-	if(!marshall_value(image->image->iptcData(), STR(strkey), value)) {
-		THROW("Couldn't write %s", STR(strkey));
-	}
-	
-	image->dirty = true;
-	return value;
-	__NIL_END
-	
-}
-#endif
-
-/*
- * Iterates through all iptc tags in image
- */
-static VALUE exiv2_iptc_each(int argc, VALUE *argv, VALUE self) {
-	__BEGIN
-	rbImage* image;
-	Data_Get_Struct(self, rbImage, image);
-
-	VALUE prefix;
-	rb_scan_args(argc, argv, "01", &prefix);
-	
-	Exiv2::IptcData &iptcData = image->image->iptcData();
-	if(iptcData.empty()) {
-		return Qnil;
-	}
-	
-	Exiv2::IptcData::const_iterator end = iptcData.end();
-	for(Exiv2::IptcData::const_iterator i = iptcData.begin(); i != end; ++i) {
-		VALUE key = rb_str_new(i->key().c_str(), i->key().length());
-		VALUE val = unmarshall_value(i->value());
-		if(prefix != Qnil && INT2FIX(0) != rb_funcall(key, rb_intern("index"), 1, prefix)) {
-			continue;
-		}
-		rb_yield(rb_ary_new3(2, key, val));
-	}
-	return self;
-	__END
-}
-
-#if 1
-/*
- * Delete iptc value by it's name
- */
-static VALUE exiv2_iptc_delete(VALUE self, VALUE key) {
-	__BEGIN
-	rbImage* image;
-	Data_Get_Struct(self, rbImage, image);
-
-	VALUE strkey = rb_funcall(key, rb_intern("to_s"), 0);
-	Exiv2::IptcData &iptcData = image->image->iptcData();
-	
-	if(iptcData.empty()) {
-		return Qnil;
-	}
-	
-    Exiv2::IptcKey iptcKey(STR(strkey));
-    Exiv2::IptcData::iterator pos = iptcData.findKey(iptcKey);
-    if (pos == iptcData.end()) {
-		return Qnil;
-    }
-	
-	std::string v = pos->toString();
-	iptcData.erase(pos);
-	return rb_str_new(v.c_str(), v.length());
-	__NIL_END
-}
-#endif
-
-/*
- * Clear all iptc data in image
- */
-static VALUE exiv2_iptc_clear(VALUE self) {
-	__BEGIN
-	rbImage* image;
-	Data_Get_Struct(self, rbImage, image);
-
-	Exiv2::IptcData &iptcData = image->image->iptcData();
-	
-	if(iptcData.empty()) {
-		return Qnil;
-	}
-	iptcData.clear();
-	return self;
-	__END
-}
-
-/*
- * Count of iptc tags in image
- */
-static VALUE exiv2_iptc_count(VALUE self) {
-	__BEGIN
-	rbImage* image;
-	Data_Get_Struct(self, rbImage, image);
-
-	Exiv2::IptcData &iptcData = image->image->iptcData();
-	
-	return INT2FIX(iptcData.count());
-	__END
-}
-
-/*
- * Predicate method. Is iptc empty?
- */
-static VALUE exiv2_iptc_empty(VALUE self) {
-	__BEGIN
-	rbImage* image;
-	Data_Get_Struct(self, rbImage, image);
-
-	Exiv2::IptcData &iptcData = image->image->iptcData();
-	
-	return iptcData.empty() ? Qtrue : Qfalse;
-	__NIL_END
-}
-
-
-
-
-
-void Init_iptc() {
-	cIptc = rb_define_class_under(mExiv2, "Iptc", rb_cObject);
-	rb_define_method(cIptc, "each", VALUEFUNC(exiv2_iptc_each), -1);
-	rb_define_method(cIptc, "[]", VALUEFUNC(exiv2_iptc_get), 1);
-#if 1
-	rb_define_method(cIptc, "[]=", VALUEFUNC(exiv2_iptc_set), 2);
-	rb_define_method(cIptc, "delete", VALUEFUNC(exiv2_iptc_delete), 1);
-#endif
-	rb_define_method(cIptc, "clear", VALUEFUNC(exiv2_iptc_clear), 0);
-	rb_define_method(cIptc, "count", VALUEFUNC(exiv2_iptc_count), 0);
-	rb_define_method(cIptc, "empty?", VALUEFUNC(exiv2_iptc_empty), 0);
-}