ruby-exiv2 1.3 → 1.5

data/ext/exif.cpp

@@ -1,369 +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::ExifData &data, const char* key, VALUE value) {
-	Exiv2::TypeId type_id;
-	try {
-		Exiv2::ExifKey exif_key(key);
-		type_id = Exiv2::ExifTags::tagType(exif_key.tag(), exif_key.ifdId());
-	}
-	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] = Exiv2::Rational(numerator, denominator);
-				return true;
-			}
-			data[key] = Exiv2::Rational(NUM2INT(value), 1);
-			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 exif tag by name
- *
- * <code>Exiv2::Image.new("a.jpg").exif["Exif.Image.Model"] => "FinePixS2Pro"</code>
- */
-static VALUE exiv2_exif_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::ExifData &exifData = image->image->exifData();
-	
-	if(exifData.empty()) {
-		return Qnil;
-	}
-	
-    Exiv2::ExifKey exifKey(STR(strkey));
-    Exiv2::ExifData::const_iterator pos = exifData.findKey(exifKey);
-    if (pos == exifData.end()) {
-		return Qnil;
-    }
-	
-	return unmarshall_value(pos->value());
-	__NIL_END
-}
-
-
-
-/*
- *  @exif["Exif.Photo.PixelXDimension"] = 3024
- * [] — is a universal accessor
- */
-static VALUE exiv2_exif_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->exifData(), STR(strkey), value)) {
-		THROW("Couldn't write %s", STR(strkey));
-	}
-	
-	image->dirty = true;
-	return value;
-	__NIL_END
-}
-
-/*
- * Iterates through all exif tags in image
- */
-static VALUE exiv2_exif_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::ExifData &exifData = image->image->exifData();
-	if(exifData.empty()) {
-		return Qnil;
-	}
-	
-	Exiv2::ExifData::const_iterator end = exifData.end();
-	for(Exiv2::ExifData::const_iterator i = exifData.begin(); i != end; ++i) {
-		VALUE key = rb_str_new(i->key().c_str(), i->key().length());
-		VALUE val = unmarshall_value(i->value());
-		//VALUE val = rb_str_new(i->toString().c_str(), i->toString().length());
-		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
-}
-
-/*
- * Delete exif value by it's name
- */
-static VALUE exiv2_exif_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::ExifData &exifData = image->image->exifData();
-	
-	if(exifData.empty()) {
-		return Qnil;
-	}
-	
-    Exiv2::ExifKey exifKey(STR(strkey));
-    Exiv2::ExifData::iterator pos = exifData.findKey(exifKey);
-    if (pos == exifData.end()) {
-		return Qnil;
-    }
-	
-	std::string v = pos->toString();
-	exifData.erase(pos);
-	return rb_str_new(v.c_str(), v.length());
-	__NIL_END
-}
-
-/*
- * Clear all exif data in image
- */
-static VALUE exiv2_exif_clear(VALUE self) {
-	__BEGIN
-	rbImage* image;
-	Data_Get_Struct(self, rbImage, image);
-
-	Exiv2::ExifData &exifData = image->image->exifData();
-	
-	if(exifData.empty()) {
-		return Qnil;
-	}
-	exifData.clear();
-	return self;
-	__END
-}
-
-/*
- * Count of exif tags in image
- */
-static VALUE exiv2_exif_count(VALUE self) {
-	__BEGIN
-	rbImage* image;
-	Data_Get_Struct(self, rbImage, image);
-
-	Exiv2::ExifData &exifData = image->image->exifData();
-	
-	return INT2FIX(exifData.count());
-	__END
-}
-
-/*
- * Predicate method. Is exif empty?
- */
-static VALUE exiv2_exif_empty(VALUE self) {
-	__BEGIN
-	rbImage* image;
-	Data_Get_Struct(self, rbImage, image);
-
-	Exiv2::ExifData &exifData = image->image->exifData();
-	
-	return exifData.empty() ? Qtrue : Qfalse;
-	__NIL_END
-}
-
-
-#ifdef HAVE_IFDTAGLIST
-static void tag_leave(Exiv2::TagInfo* info) {
-	
-}
-
-static VALUE create_exiv2_tag(Exiv2::TagInfo* info) {
-	return Data_Wrap_Struct(cTag, 0, tag_leave, info);
-}
-
-static int iterate_tag_collection(const Exiv2::TagInfo* collection, bool to_yield = true) {
-	Exiv2::TagInfo* _collection = const_cast<Exiv2::TagInfo *>(collection);
-	int i;
-    for (i=0; _collection[i].tag_ != 0xffff; ++i) {
-		if(to_yield) {
-			rb_yield(create_exiv2_tag(_collection + i));
-		}
-    }
-	return i;
-}
-
-/*
- * Iterates through all available exif tags, that can be set in the image
- */
-static VALUE exiv2_tags_each(VALUE self) {
-	__BEGIN
-	iterate_tag_collection(Exiv2::ExifTags::ifdTagList());
-	iterate_tag_collection(Exiv2::ExifTags::exifTagList());
-	iterate_tag_collection(Exiv2::ExifTags::iopTagList());
-	iterate_tag_collection(Exiv2::ExifTags::gpsTagList());
-	return self;
-	__END
-}
-
-
-/*
- * Count of all available exif tags
- */
-static VALUE exiv2_tags_count(VALUE self) {
-	__BEGIN
-	return INT2NUM(
-	iterate_tag_collection(Exiv2::ExifTags::ifdTagList(), false) +
-	iterate_tag_collection(Exiv2::ExifTags::exifTagList(), false) +
-	iterate_tag_collection(Exiv2::ExifTags::iopTagList(), false) +
-	iterate_tag_collection(Exiv2::ExifTags::gpsTagList(), false)
-	);
-	__END
-}
-#endif /* HAVE_IFDTAGLIST */
-
-/*
- * Name of exif tag
- */
-static VALUE exiv2_tag_name(VALUE self) {
-	__BEGIN
-	Exiv2::TagInfo* tag;
-	Data_Get_Struct(self, Exiv2::TagInfo, tag);
-	
-	return tag->name_ ? rb_str_new2(tag->name_) : Qnil;
-	__END
-}
-
-/*
- * title of exif tag
- */
-static VALUE exiv2_tag_title(VALUE self) {
-	__BEGIN
-	Exiv2::TagInfo* tag;
-	Data_Get_Struct(self, Exiv2::TagInfo, tag);
-	
-	return tag->title_ ? rb_str_new2(tag->title_) : Qnil;
-	__END
-}
-
-/*
- * description of exif tag
- */
-static VALUE exiv2_tag_desc(VALUE self) {
-	__BEGIN
-	Exiv2::TagInfo* tag;
-	Data_Get_Struct(self, Exiv2::TagInfo, tag);
-	
-	return tag->desc_ ? rb_str_new2(tag->desc_) : Qnil;
-	__END
-}
-
-/*
- * section of exif tag
- */
-static VALUE exiv2_tag_section(VALUE self) {
-	__BEGIN
-	Exiv2::TagInfo* tag;
-	Data_Get_Struct(self, Exiv2::TagInfo, tag);
-	
-	return rb_str_new2(Exiv2::ExifTags::sectionName(tag->sectionId_));
-	__END
-}
-
-/*
- * IFD of exif tag
- */
-static VALUE exiv2_tag_ifd(VALUE self) {
-	__BEGIN
-	Exiv2::TagInfo* tag;
-	Data_Get_Struct(self, Exiv2::TagInfo, tag);
-	
-	return rb_str_new2(Exiv2::ExifTags::ifdName(tag->ifdId_));
-	__END
-}
-
-
-void Init_exif() {
-	cExif = rb_define_class_under(mExiv2, "Exif", rb_cObject);
-	rb_define_method(cExif, "each", VALUEFUNC(exiv2_exif_each), -1);
-	rb_define_method(cExif, "[]", VALUEFUNC(exiv2_exif_get), 1);
-	rb_define_method(cExif, "[]=", VALUEFUNC(exiv2_exif_set), 2);
-	rb_define_method(cExif, "delete", VALUEFUNC(exiv2_exif_delete), 1);
-	rb_define_method(cExif, "clear", VALUEFUNC(exiv2_exif_clear), 0);
-	rb_define_method(cExif, "count", VALUEFUNC(exiv2_exif_count), 0);
-	rb_define_method(cExif, "empty?", VALUEFUNC(exiv2_exif_empty), 0);
-//	rb_define_singleton_method(cExif, "iptc_tags_each", VALUEFUNC(exiv2_iptc_tags_each), 0);
-	
-	cTag = rb_define_class_under(mExiv2, "Tag", rb_cObject);
-#ifdef HAVE_IFDTAGLIST
-	rb_define_singleton_method(cTag, "each", VALUEFUNC(exiv2_tags_each), 0);
-	rb_define_singleton_method(cTag, "count", VALUEFUNC(exiv2_tags_count), 0);
-#endif /* HAVE_IFDTAGLIST */
-	
-	rb_define_method(cTag, "ifd", VALUEFUNC(exiv2_tag_ifd), 0);
-	rb_define_method(cTag, "section", VALUEFUNC(exiv2_tag_section), 0);
-	rb_define_method(cTag, "name", VALUEFUNC(exiv2_tag_name), 0);
-	rb_define_method(cTag, "title", VALUEFUNC(exiv2_tag_title), 0);
-	rb_define_method(cTag, "desc", VALUEFUNC(exiv2_tag_desc), 0);
-}

data/ext/exiv2.cpp

@@ -1,78 +0,0 @@
-// ***************************************************************** -*- C++ -*-
-/*
- * Copyright (C) 2006 Max Lapshin <max@maxidoors.ru>
- *
- * This program is part of the ruby-exiv2 distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA.
- */
-/*
-  Abstract:  Driver for using exiv2 library (http://www.exiv2.org/) in ruby language
-
-  File:      exiv2.cpp
-  Version:   $Rev: 1 $
-  Author(s): Max Lapshin <max@maxidoors.ru>
- */
-// *****************************************************************************
-#include "exiv2.hpp"
-
-
-VALUE mExiv2, cImage, cExif, cTag, cIptc, cThumbnail, eError;
-
-void rb_exiv2_throw(const char *file, long unsigned int line, const char *fmt, ...) {
-	char* message;
-	va_list ap;
-	va_start(ap, fmt);
-	vasprintf(&message, fmt, ap);
-	va_end(ap);
-	
-	char error_message[strlen(message) + 80];
-	snprintf(error_message, sizeof(error_message), "%s. File: %s, line: %lu", message, file, line);
-	free(message);
-	rb_raise(eError, error_message);
-}
-
-
-#ifdef __cplusplus
-extern "C"
-#endif
-
-/*
- * Document-module: Exiv2
- *
- * Namespace for all exiv stuff
- */
-
-/*
- * Document-class: Exiv2::Error
- * error, thrown if anything goes wrong inside in exiv2
- */
-
-void Init_exiv2_bin() {
-	mExiv2 = rb_define_module("Exiv2");
-	
-	eError = rb_define_class_under(mExiv2, "Error", rb_eStandardError);
-	
-	Init_image();
-	Init_exif();
-	Init_iptc();
-	//cThumbnail = rb_define_class_under(mExiv2, "Thumbnail", rb_cObject);
-	//rb_define_method(cThumbnail, "extension", VALUEFUNC(exiv2_thumb_ext), 0);
-	//rb_define_method(cThumbnail, "format", VALUEFUNC(exiv2_thumb_format), 0);
-	//rb_define_method(cThumbnail, "clear", VALUEFUNC(exiv2_thumb_clear), 0);
-	//rb_define_method(cThumbnail, "to_s", VALUEFUNC(exiv2_thumb_read), 0);
-	//rb_define_method(cThumbnail, "read", VALUEFUNC(exiv2_thumb_read), 0);
-	//rb_define_method(cThumbnail, "write", VALUEFUNC(exiv2_thumb_write), 1);
-}

data/ext/extconf.rb

@@ -1,75 +0,0 @@
-#!/usr/bin/env ruby
-
-require "mkmf"
-require 'optparse'
-CONFIG["CPP"] = "g++ -E "
-CONFIG["CC"] = "g++  "
-CONFIG["LDSHARED"].gsub!(/^cc /,"g++ ")
-
-
-$CPPFLAGS << " -Wall -I/usr/include/exiv2 "
-$LDFLAGS << " -lstdc++ "
-
-OptionParser.new do |opts|
-  opts.on("-E PATH", "--exiv2-dir=PATH", "Prefix, where libexiv2 is installed: /usr/local") do |path|
-    $LDFLAGS << "-L" + path + "/lib "
-    $CPPFLAGS << "-I" + path + "/include "
-    $CPPFLAGS << "-I" + path + "/include/exiv2 "
-  end
-  opts.parse!(ARGV.include?("--") ? ARGV[ARGV.index("--")+1..-1] : ARGV.clone)
-end
-
-
-have_header "exif.hpp"
-
-
-image_factory_open = "Exiv2::ImageFactory::open"
-def image_factory_open.upcase
-  "IMGFACTORYOPEN"
-end
-have_library "exiv2", image_factory_open do  <<-SRC
-  #include <image.hpp>
-  #include <exif.hpp>
-
-
-  #include <string>
-  #include <vector>
-  #include <iostream>
-  #include <fstream>
-  #include <iomanip>
-  #include <cstring>
-  #include <cassert>
-
-  #include <stdarg.h>
-int main(void) {
-  #{image_factory_open}("a");
-}
- SRC
-end
-
-
-ifd_tag_list = "Exiv2::ExifTags::ifdTagList"
-def ifd_tag_list.upcase
-  "IFDTAGLIST"
-end
-have_func ifd_tag_list do <<-SRC
-  #include <image.hpp>
-  #include <exif.hpp>
-
-
-  #include <string>
-  #include <vector>
-  #include <iostream>
-  #include <fstream>
-  #include <iomanip>
-  #include <cstring>
-  #include <cassert>
-
-  #include <stdarg.h>
-int main(void) {
-  #{ifd_tag_list}();
-}
- SRC
- end
-create_makefile 'exiv2_bin'
-