exif 2.2.0 → 2.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8d658dd771d13abedfe7ab02bfede763a0021132
-  data.tar.gz: 56327a0dade4446064ffbed2a849836598b891dd
+SHA256:
+  metadata.gz: 0de28879ec8434fe5be0f9d0991d964800ea0add8600d405bc6865005185666c
+  data.tar.gz: 39f9aa6a21e95d82b801f59e7453d650335ac8b19141c487640ccae6ac9c7a5b
 SHA512:
-  metadata.gz: a1e5a4b2d2826d24dcb5d5e2e59a6f1f4df7a2753ed17526b83c236f164d74139f4037833e55f913a5a3dc77f6e32398c9bdf48893f701647305b36ed22980c2
-  data.tar.gz: dd5a25648daaa66665ccc0c3ad9b3da78a2f02b1ee2b77c016ad45d082293c61b4df75590f82584722b7806b08add02c98cd8e1aaee13aa9b32dd9d40788645d
+  metadata.gz: adb933cbd6ab8b5487346c4e8f3348df2337176f35b07eeef6bfa79c23ea1c619c0909e804577d2ceb2180796052a8d82e52c6fe33f147a1607ae8628be5a441
+  data.tar.gz: 6f9c748c4f7266f6f4de038cd60cc09fb92f69ceac2ad9faaa2c60c5295c20d2e04ab04463f41f2242f4369a3f31e4f33840eb027020e7f4cbae051850093977

data/ext/exif/data.c

@@ -1,9 +1,9 @@
 #include "data.h"
 #include "ruby.h"
 
-#include <libexif/exif-log.h>
 #include <libexif/exif-data.h>
 #include <libexif/exif-loader.h>
+#include <libexif/exif-log.h>
 #include <stdint.h>
 #include <time.h>
 
@@ -181,7 +181,7 @@ static void exif_corrupt_log_func(ExifLog *log, ExifLogCode code,
   }
 }
 
-void init_data() {
+void init_data(void) {
   int length;
 
   rb_cExifData = rb_define_class_under(rb_mExif, "Data", rb_cObject);
@@ -208,7 +208,7 @@ VALUE new (VALUE self, VALUE input) {
     ed = exif_data_new();
     exif_data_log(ed, log);
     exif_data_load_data(ed, (unsigned char *)RSTRING_PTR(input),
-                        RSTRING_LEN(input));
+                        (uint32_t)RSTRING_LEN(input));
     exif_log_unref(log);
     if (corrupt) {
       exif_data_free(ed);
@@ -222,7 +222,7 @@ VALUE new (VALUE self, VALUE input) {
       if (TYPE(buffer) == T_NIL)
         break;
       if (!exif_loader_write(loader, (unsigned char *)RSTRING_PTR(buffer),
-                             RSTRING_LEN(buffer)))
+                             (uint32_t)RSTRING_LEN(buffer)))
         break;
     }
     ed = exif_loader_get_data(loader);
@@ -249,7 +249,6 @@ static VALUE brackets(VALUE self, VALUE ifd_symbol) {
 }
 
 static void each_content(ExifContent *ec, void *self_ptr) {
-  VALUE *self;
   ExifIfd ifd;
 
   ifd = exif_content_get_ifd(ec);
@@ -266,6 +265,12 @@ static void each_entry(ExifEntry *entry, void *self_ptr) {
 
   ivar_name = exif_entry_to_ivar(entry);
   value = exif_entry_to_rb_value(entry);
+
+  if (ivar_name == 0x00) {
+    rb_warning("Unsupported tag %x", entry->tag);
+    return;
+  }
+
   rb_hash_aset(rb_hash_aref(rb_iv_get(*(VALUE *)self_ptr, "@ifds"),
                             ID2SYM(rb_intern(
                                 ifd_name_mapping[exif_entry_get_ifd(entry)]))),
@@ -296,10 +301,8 @@ static void each_entry(ExifEntry *entry, void *self_ptr) {
 static VALUE exif_entry_to_rb_value(ExifEntry *entry) {
   ExifData *data;
   ExifByteOrder order;
-  ExifRational rational;
-  ExifSRational srational;
   VALUE ret;
-  size_t len, i;
+  size_t i;
   unsigned char size;
 
   data = entry->parent->parent;

data/ext/exif/data.h

@@ -1,3 +1,3 @@
 #pragma once
 
-void init_data();
+void init_data(void);

data/ext/exif/exif.c

@@ -1,12 +1,14 @@
 #include "data.h"
 #include "ruby.h"
 
-VALUE rb_mExif, rb_eError, rb_eNotReadable, rb_eIFDNotFound, rb_eUnknownDataType;
+VALUE rb_mExif, rb_eError, rb_eNotReadable, rb_eIFDNotFound,
+    rb_eUnknownDataType;
 
 VALUE rb_exif_const_missing(VALUE klass, VALUE name) {
   const char not_readble[] = "NotReadble";
-  if(strcmp(rb_id2name(SYM2ID(name)), not_readble) == 0) {
-    rb_warn("constant NotReadble is deprecated and will be removed in the future, use NotReadable instead.");
+  if (strcmp(rb_id2name(SYM2ID(name)), not_readble) == 0) {
+    rb_warn("constant NotReadble is deprecated and will be removed in the "
+            "future, use NotReadable instead.");
     return rb_eNotReadable;
   }
   return rb_call_super(1, &name);
@@ -20,6 +22,8 @@ void Init_exif(void) {
   rb_eIFDNotFound = rb_define_class_under(rb_mExif, "IFDNotFound", rb_eError);
   rb_eUnknownDataType =
       rb_define_class_under(rb_mExif, "UnknownDataType", rb_eError);
-  rb_define_singleton_method(rb_mExif, "const_missing", rb_exif_const_missing, 1);
+  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,70 @@ 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;
+  case EXIF_TAG_CAMERA_OWNER_NAME:
+    return "@camera_owner_name";
+    break;
+  case EXIF_TAG_COMPOSITE_IMAGE:
+    return "@composite_image";
+    break;
+  case EXIF_TAG_GPS_H_POSITIONING_ERROR:
+    return "@gps_h_positioning_error";
+    break;
+  case EXIF_TAG_LENS_MAKE:
+    return "@lens_make";
+    break;
+  case EXIF_TAG_LENS_MODEL:
+    return "@lens_model";
+    break;
+  case EXIF_TAG_LENS_SERIAL_NUMBER:
+    return "@lens_serial_number";
+    break;
+  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;
+  case EXIF_TAG_OFFSET_TIME_DIGITIZED:
+    return "@offset_time_digitized";
+    break;
+  case EXIF_TAG_OFFSET_TIME_ORIGINAL:
+    return "@offset_time_original";
+    break;
+  case EXIF_TAG_RECOMMENDED_EXPOSURE_INDEX:
+    return "@recommended_exposure_index";
+    break;
+  case EXIF_TAG_SENSITIVITY_TYPE:
+    return "@sensitivity_type";
+    break;
+  case EXIF_TAG_STANDARD_OUTPUT_SENSITIVITY:
+    return "@standard_output_sensitivity";
+    break;
+  #endif
   }
   return 0;
 }

data/ext/exif/extconf.rb

@@ -2,6 +2,23 @@
 
 require 'mkmf'
 $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.0'
+  VERSION = '2.2.3'
 end

metadata

@@ -1,43 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: exif
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.3
 platform: ruby
 authors:
 - Jian Weihang
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-10-28 00:00:00.000000000 Z
+date: 2022-03-15 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.15.4
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.15.4
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 12.0.0
+        version: 0.8.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 12.0.0
+        version: 0.8.1
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.10.3
+        version: 5.11.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.10.3
+        version: 5.11.3
 description: Ruby EXIF reader written in C extension.
 email: tonytonyjan@gmail.com
 executables: []
@@ -84,7 +70,7 @@ homepage: https://github.com/tonytonyjan/exif
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -99,9 +85,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: Ruby EXIF reader written in C extension.
 test_files: []