exif 2.2.2 → 2.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99fc8c3352a6b7fb6ed711235a8e591ad67e886002e553cce0adf99985fc6cf3
-  data.tar.gz: '0815653149598f32ab68d4c06a7cf08038f83a47bbc2ce2190b3b726d128933c'
+  metadata.gz: 94166b206954d71046f6efdc63da23894aac94d69880d3c54370a78eb8e9f2fc
+  data.tar.gz: bebff85412e1f9efabbcee638f48e74b4ce2b68e81e1783d62eac2a8c0fc8258
 SHA512:
-  metadata.gz: a0d12c8de1440301baa8f5e6d7c26f0a3b1b91565869ff58628f6552288d46fd264eae9ae73569c24c1fffd4f06c702b9ca031061bebf5d8cab34190ca841f11
-  data.tar.gz: 9919292d1b0c6e33a0ca5e883f715c6ff801a5c9ac3fd9e736893ab5d8ac7bbb2a58104952975a006789e714bd850f1226b208840660b44774b80f8d7f213e81
+  metadata.gz: c5f19c8fdbfb4cc0b0bf0112c881b93cadf5abf76f98a4100ae03aa4ee31457f9e6c163a8efe00c22d4cec263cf4aab4a9a5297afe1756cebdb1251aad987040
+  data.tar.gz: af9cbecf6b07dd72f721eea8eb8ee7a56ac84cb94dc4b015dfd366648b3cf24c5e1f943d79aac8e3c0ddc2b8d5144a50915a1f11298b294525b2bddcb8e38ded

data/ext/exif/data.c

@@ -161,7 +161,27 @@ static const char *attr_readers[] = {"ifds",
                                      "y_resolution",
                                      "ycbcr_coefficients",
                                      "ycbcr_positioning",
-                                     "ycbcr_sub_sampling"};
+                                     "ycbcr_sub_sampling"
+                                     "body_serial_number",
+                                     "camera_owner_name",
+                                     "composite_image",
+                                     "gps_h_positioning_error",
+                                     "image_depth",
+                                     "iso_speed",
+                                     "iso_speedlatitudeyyy",
+                                     "iso_speedlatitudezzz",
+                                     "lens_make",
+                                     "lens_model",
+                                     "lens_serial_number",
+                                     "lens_specification",
+                                     "offset_time",
+                                     "offset_time_digitized",
+                                     "offset_time_original",
+                                     "recommended_exposure_index",
+                                     "sensitivity_type",
+                                     "source_exposure_times_of_composite_image",
+                                     "source_image_number_of_composite_image",
+                                     "standard_output_sensitivity"};
 
 static VALUE new (VALUE self, VALUE input);
 static VALUE dump(VALUE self);
@@ -185,6 +205,7 @@ void init_data(void) {
   int length;
 
   rb_cExifData = rb_define_class_under(rb_mExif, "Data", rb_cObject);
+  rb_undef_alloc_func(rb_cExifData);
   length = sizeof(attr_readers) / sizeof(char *);
   for (int i = 0; i < length; ++i)
     rb_define_attr(rb_cExifData, attr_readers[i], 1, 0);

data/ext/exif/exif.c

@@ -24,5 +24,6 @@ void Init_exif(void) {
       rb_define_class_under(rb_mExif, "UnknownDataType", rb_eError);
   rb_define_singleton_method(rb_mExif, "const_missing", rb_exif_const_missing,
                              1);
+  rb_define_const(rb_mExif, "LIBEXIF_VERSION", rb_str_new2(LIBEXIF_VERSION));
   init_data();
 }

data/ext/exif/exif_entry_to_ivar.c

@@ -447,6 +447,7 @@ const char *exif_entry_to_ivar(ExifEntry *ee) {
   case EXIF_TAG_GPS_DIFFERENTIAL:
     return "@gps_differential";
     break;
+  #ifdef LIBEXIF_0_6_22_OR_HIGHER
   case EXIF_TAG_BODY_SERIAL_NUMBER:
     return "@body_serial_number";
     break;
@@ -459,18 +460,6 @@ const char *exif_entry_to_ivar(ExifEntry *ee) {
   case EXIF_TAG_GPS_H_POSITIONING_ERROR:
     return "@gps_h_positioning_error";
     break;
-  case EXIF_TAG_IMAGE_DEPTH:
-    return "@image_depth";
-    break;
-  case EXIF_TAG_ISO_SPEED:
-    return "@iso_speed";
-    break;
-  case EXIF_TAG_ISO_SPEEDLatitudeYYY:
-    return "@iso_speedlatitudeyyy";
-    break;
-  case EXIF_TAG_ISO_SPEEDLatitudeZZZ:
-    return "@iso_speedlatitudezzz";
-    break;
   case EXIF_TAG_LENS_MAKE:
     return "@lens_make";
     break;
@@ -483,6 +472,26 @@ const char *exif_entry_to_ivar(ExifEntry *ee) {
   case EXIF_TAG_LENS_SPECIFICATION:
     return "@lens_specification";
     break;
+  case EXIF_TAG_SOURCE_EXPOSURE_TIMES_OF_COMPOSITE_IMAGE:
+    return "@source_exposure_times_of_composite_image";
+    break;
+  case EXIF_TAG_SOURCE_IMAGE_NUMBER_OF_COMPOSITE_IMAGE:
+    return "@source_image_number_of_composite_image";
+    break;
+  #endif
+  #ifdef LIBEXIF_0_6_23_OR_HIGHER
+  case EXIF_TAG_IMAGE_DEPTH:
+    return "@image_depth";
+    break;
+  case EXIF_TAG_ISO_SPEED:
+    return "@iso_speed";
+    break;
+  case EXIF_TAG_ISO_SPEEDLatitudeYYY:
+    return "@iso_speedlatitudeyyy";
+    break;
+  case EXIF_TAG_ISO_SPEEDLatitudeZZZ:
+    return "@iso_speedlatitudezzz";
+    break;
   case EXIF_TAG_OFFSET_TIME:
     return "@offset_time";
     break;
@@ -498,15 +507,10 @@ const char *exif_entry_to_ivar(ExifEntry *ee) {
   case EXIF_TAG_SENSITIVITY_TYPE:
     return "@sensitivity_type";
     break;
-  case EXIF_TAG_SOURCE_EXPOSURE_TIMES_OF_COMPOSITE_IMAGE:
-    return "@source_exposure_times_of_composite_image";
-    break;
-  case EXIF_TAG_SOURCE_IMAGE_NUMBER_OF_COMPOSITE_IMAGE:
-    return "@source_image_number_of_composite_image";
-    break;
   case EXIF_TAG_STANDARD_OUTPUT_SENSITIVITY:
     return "@standard_output_sensitivity";
     break;
+  #endif
   }
   return 0;
 }

data/ext/exif/extconf.rb

@@ -5,4 +5,20 @@ $CFLAGS << ' -std=c99 '
 pkg_config('libexif')
 have_library('exif')
 have_header('libexif/exif-data.h')
+
+checking_for 'libexif >= 0.6.22' do
+  if try_const(%w[EXIF_TAG_LENS_SPECIFICATION ExifTag], 'libexif/exif-tag.h')
+    append_cflags('-D LIBEXIF_0_6_22_OR_HIGHER')
+  end
+end
+
+checking_for 'libexif >= 0.6.23' do
+  if try_const(%w[EXIF_TAG_IMAGE_DEPTH ExifTag], 'libexif/exif-tag.h')
+    append_cflags('-D LIBEXIF_0_6_23_OR_HIGHER')
+  end
+end
+
+libexif_version = pkg_config('libexif', 'modversion') || 'unknown'
+append_cflags("-D LIBEXIF_VERSION='\"#{libexif_version}\"'")
+
 create_makefile('exif/exif')

data/lib/exif/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Exif
-  VERSION = '2.2.2'
+  VERSION = '2.2.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: exif
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.2.4
 platform: ruby
 authors:
 - Jian Weihang
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-11 00:00:00.000000000 Z
+date: 2023-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -85,7 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.2
 signing_key:
 specification_version: 4
 summary: Ruby EXIF reader written in C extension.