gphoto4ruby 0.3.2 → 0.3.3

data/CHANGELOG.rdoc

@@ -1,11 +1,14 @@
+== 0.3.3
+
+* Removed fake unknown type event catch when receiving file or folder created evt
+* Fixed bug of segmentation fault when raising exception in wait
+
 == 0.3.2
 
 * Added setting and getting of GP_WIDGET_DATE type configs. Behavior is strange
-  though. In nikon D80 config name "time":
-  * libgphoto 2.4.2 -- able to read, but unable to set
-  * libgphoto 2.4.6 -- able to set, but when reading keep getting value 3 hours
-                       earlier. For any camera time zone. But the value set is
-                       correctly applied to exif. So can be used somehow
+  though. In nikon D80 config name "time" can be set, but when reading keep
+  getting value 3 hours earlier. For any camera time zone. But the value set is
+  correctly applied to exif. So can be used somehow
 
 == 0.3.1
 

data/Rakefile

@@ -1,3 +1,5 @@
+#!/usr/bin/env ruby
+
 require "rubygems"
 require "rake"
 require "rake/rdoctask"
@@ -14,3 +16,9 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
     rdoc.options << "--charset=UTF-8"
     rdoc.options << "--webcvs=http://github.com/lonelyelk/gphoto4ruby/tree/master"
 end
+
+desc "Upload rdoc to RubyForge."
+
+task :publish_rdoc => [:rdoc] do
+  exec "scp -r rdoc/* lonelyelk@rubyforge.org:/var/www/gforge-projects/gphoto4ruby"
+end

data/ext/gphoto2camera.c

@@ -42,6 +42,13 @@ VALUE rb_cGPhoto2ConfigurationError;
     }                                   \
 }
 
+#define RESULT_CHECK_EVENT(r,e) { \
+    if (r < 0) {                        \
+        free(e);                        \
+        rb_raise_gp_result(r);          \
+    }                                   \
+}
+
 void camera_mark(GPhoto2Camera *c) {
 }
 
@@ -1107,10 +1114,19 @@ VALUE camera_create_folder(VALUE self, VALUE folder) {
  * Waits for an event from camera for specified amount of milliseconds.
  * Returns an instance of GPhoto2::CameraEvent. When capturing image manually
  * with camera connected through USB, images are not saved on memory card
- * until you call this method. During tests EVENT_TYPE_FILE_ADDED event
+ * until you call this method.
+ *
+ * NOTE: During tests on Nikon D80 EVENT_TYPE_FILE_ADDED event
  * was always followed by EVENT_TYPE_UNKNOWN. So in the case of 
- * EVENT_TYPE_FILE_ADDED or EVENT_TYPE_FOLDER_ADDED, an extra call is made
- * with 100ms timeout which result is ignored.
+ * EVENT_TYPE_FILE_ADDED, an extra call should be
+ * made with 100ms timeout which result is ignored.
+ *
+ * NOTE: During tests on Nikon D80, when captured each 1000 images, there are
+ * two EVENT_TYPE_FILE_ADDED events: one with new folder name and another with
+ * file name. Also each of them is followed by EVENT_TYPE_UNKNOWN.
+ *
+ * NOTE: Base C function gp_camera_wait_for_event is considered in development 
+ * and may change its behavior, so will this function.
  *
  * When image is captured manually and then event is caught, camera virtual
  * folder is changed to the one where files are saved.
@@ -1131,8 +1147,7 @@ VALUE camera_create_folder(VALUE self, VALUE folder) {
 VALUE camera_wait(int argc, VALUE *argv, VALUE self) {
     GPhoto2Camera *c;
     GPhoto2CameraEvent *ce;
-    CameraEventType fakeType;
-    void *evtData, *fakeData;
+    void *evtData;
     int to;
     
     switch (argc) {
@@ -1150,18 +1165,16 @@ VALUE camera_wait(int argc, VALUE *argv, VALUE self) {
     Data_Get_Struct(self, GPhoto2Camera, c);
     ce = (GPhoto2CameraEvent*) malloc(sizeof(GPhoto2CameraEvent));
     
-    gp_result_check(gp_filesystem_reset(c->camera->fs));
-    gp_result_check(gp_camera_wait_for_event(c->camera, to, &(ce->type), &evtData, c->context));
+//    RESULT_CHECK_EVENT(gp_filesystem_reset(c->camera->fs), ce);
+    RESULT_CHECK_EVENT(gp_camera_wait_for_event(c->camera, to, &(ce->type), &evtData, c->context), ce);
     
     switch (ce->type) {
         case GP_EVENT_FILE_ADDED:
         case GP_EVENT_FOLDER_ADDED:
             ce->path = (CameraFilePath*)evtData;
             strcpy(c->virtFolder, ce->path->folder);
-            gp_result_check(gp_camera_wait_for_event(c->camera, 100, &fakeType, &fakeData, c->context));
             break;
         case GP_EVENT_UNKNOWN:
-            gp_result_check(gp_camera_wait_for_event(c->camera, 100, &fakeType, &fakeData, c->context));
             break;
         default:
             break;

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification 
 name: gphoto4ruby
 version: !ruby/object:Gem::Version 
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors: 
-- heq4 company
+- neq4 company
 - Sergey Kruk
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-06-11 00:00:00 +04:00
+date: 2009-06-15 00:00:00 +04:00
 default_executable: 
 dependencies: []
 
@@ -34,11 +34,9 @@ files:
 - LICENSE
 - README.rdoc
 - Rakefile
-- docs
 - docs/COPYING
 - docs/COPYING.LESSER
 - example.rb
-- ext
 - ext/extconf.rb
 - ext/gphoto4ruby.c
 - ext/gphoto2camera.c
@@ -49,6 +47,8 @@ files:
 - ext/gphoto2camera_utilities.h
 has_rdoc: true
 homepage: http://github.com/lonelyelk/gphoto4ruby
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --main
@@ -74,9 +74,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: gphoto4ruby
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: GPhoto4Ruby is Ruby wrapping around gphoto2 C library
 test_files: []