exif 1.0.1 → 2.0.0

data/ext/exif/libjpeg/jpeg-data.h

@@ -0,0 +1,92 @@
+/* jpeg-data.h
+ *
+ * Copyright � 2001 Lutz M�ller <lutz@users.sourceforge.net>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details. 
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA  02110-1301  USA.
+ */
+
+#ifndef __JPEG_DATA_H__
+#define __JPEG_DATA_H__
+
+#include "libjpeg/jpeg-marker.h"
+
+#include <libexif/exif-data.h>
+#include <libexif/exif-log.h>
+
+typedef ExifData * JPEGContentAPP1;
+
+typedef struct _JPEGContentGeneric JPEGContentGeneric;
+struct _JPEGContentGeneric
+{
+	unsigned char *data;
+	unsigned int size;
+};
+
+typedef union _JPEGContent JPEGContent;
+union _JPEGContent
+{
+	JPEGContentGeneric generic;
+	JPEGContentAPP1    app1;
+};
+
+typedef struct _JPEGSection JPEGSection;
+struct _JPEGSection
+{
+	JPEGMarker marker;
+	JPEGContent content;
+};
+
+typedef struct _JPEGData        JPEGData;
+typedef struct _JPEGDataPrivate JPEGDataPrivate;
+
+struct _JPEGData
+{
+	JPEGSection *sections;
+	unsigned int count;
+
+	unsigned char *data;
+	unsigned int size;
+
+	JPEGDataPrivate *priv;
+};
+
+JPEGData *jpeg_data_new           (void);
+JPEGData *jpeg_data_new_from_file (const char *path);
+JPEGData *jpeg_data_new_from_data (const unsigned char *data,
+				   unsigned int size);
+
+void      jpeg_data_ref   (JPEGData *data);
+void      jpeg_data_unref (JPEGData *data);
+void      jpeg_data_free  (JPEGData *data);
+
+void      jpeg_data_load_data     (JPEGData *data, const unsigned char *d,
+				   unsigned int size);
+void      jpeg_data_save_data     (JPEGData *data, unsigned char **d,
+				   unsigned int *size);
+
+void      jpeg_data_load_file     (JPEGData *data, const char *path);
+int       jpeg_data_save_file     (JPEGData *data, const char *path);
+
+void      jpeg_data_set_exif_data (JPEGData *data, ExifData *exif_data);
+ExifData *jpeg_data_get_exif_data (JPEGData *data);
+
+void      jpeg_data_dump (JPEGData *data);
+
+void      jpeg_data_append_section (JPEGData *data);
+
+void      jpeg_data_log (JPEGData *data, ExifLog *log);
+
+#endif /* __JPEG_DATA_H__ */

data/ext/exif/libjpeg/jpeg-marker.c

@@ -0,0 +1,122 @@
+/* jpeg-marker.c
+ *
+ * Copyright � 2001-2008 Lutz M�ller <lutz@users.sourceforge.net>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details. 
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA  02110-1301  USA.
+ */
+#include "config.h"
+#include "jpeg-marker.h"
+
+#include <stdlib.h>
+
+static const struct {
+        JPEGMarker marker;
+        const char *name;
+        const char *description;
+} JPEGMarkerTable[] = {
+        {JPEG_MARKER_SOF0, "SOF0", "Encoding (baseline)"},
+        {JPEG_MARKER_SOF1, "SOF1", "Encoding (extended sequential)"},
+        {JPEG_MARKER_SOF2, "SOF2", "Encoding (progressive)"},
+        {JPEG_MARKER_SOF3, "SOF3", "Encoding (lossless)"},
+        {JPEG_MARKER_SOF5, "SOF5", "Encoding (differential sequential)"},
+        {JPEG_MARKER_SOF6, "SOF6", "Encoding (differential progressive)"},
+        {JPEG_MARKER_SOF7, "SOF7", "Encoding (differential lossless)"},
+        {JPEG_MARKER_SOF9, "SOF9",
+		"Encoding (extended sequential, arithmetic)"},
+        {JPEG_MARKER_SOF10, "SOF10", "Encoding (progressive, arithmetic)"},
+        {JPEG_MARKER_SOF11, "SOF11", "Encoding (lossless, arithmetic)"},
+        {JPEG_MARKER_SOF13, "SOF13",
+		"Encoding (differential sequential, arithmetic)"},
+        {JPEG_MARKER_SOF14, "SOF14",
+		"Encoding (differential progressive, arithmetic)"},
+        {JPEG_MARKER_SOF15, "SOF15",
+		"Encoding (differential lossless, arithmetic)"},
+	{JPEG_MARKER_SOI, "SOI", "Start of image"},
+	{JPEG_MARKER_EOI, "EOI", "End of image"},
+	{JPEG_MARKER_SOS, "SOS", "Start of scan"},
+	{JPEG_MARKER_COM, "COM", "Comment"},
+	{JPEG_MARKER_DHT, "DHT", "Define Huffman table"},
+	{JPEG_MARKER_JPG, "JPG", "Extension"},
+	{JPEG_MARKER_DAC, "DAC", "Define arithmetic coding conditioning"},
+	{JPEG_MARKER_RST1, "RST1", "Restart 1"},
+	{JPEG_MARKER_RST2, "RST2", "Restart 2"},
+	{JPEG_MARKER_RST3, "RST3", "Restart 3"},
+	{JPEG_MARKER_RST4, "RST4", "Restart 4"},
+	{JPEG_MARKER_RST5, "RST5", "Restart 5"},
+	{JPEG_MARKER_RST6, "RST6", "Restart 6"},
+	{JPEG_MARKER_RST7, "RST7", "Restart 7"},
+	{JPEG_MARKER_DQT, "DQT", "Define quantization table"},
+	{JPEG_MARKER_DNL, "DNL", "Define number of lines"},
+	{JPEG_MARKER_DRI, "DRI", "Define restart interval"},
+	{JPEG_MARKER_DHP, "DHP", "Define hierarchical progression"},
+	{JPEG_MARKER_EXP, "EXP", "Expand reference component"},
+	{JPEG_MARKER_APP0, "APP0", "Application segment 0"},
+	{JPEG_MARKER_APP1, "APP1", "Application segment 1"},
+	{JPEG_MARKER_APP2, "APP2", "Application segment 2"},
+	{JPEG_MARKER_APP3, "APP3", "Application segment 3"},
+	{JPEG_MARKER_APP4, "APP4", "Application segment 4"},
+	{JPEG_MARKER_APP5, "APP5", "Application segment 5"},
+	{JPEG_MARKER_APP6, "APP6", "Application segment 6"},
+	{JPEG_MARKER_APP7, "APP7", "Application segment 7"},
+	{JPEG_MARKER_APP8, "APP8", "Application segment 8"},
+	{JPEG_MARKER_APP9, "APP9", "Application segment 9"},
+	{JPEG_MARKER_APP10, "APP10", "Application segment 10"},
+	{JPEG_MARKER_APP11, "APP11", "Application segment 11"},
+	{JPEG_MARKER_APP12, "APP12", "Application segment 12"},
+	{JPEG_MARKER_APP13, "APP13", "Application segment 13"},
+	{JPEG_MARKER_APP14, "APP14", "Application segment 14"},
+	{JPEG_MARKER_APP15, "APP15", "Application segment 15"},
+	{JPEG_MARKER_JPG0, "JPG0", "Extension 0"},
+	{JPEG_MARKER_JPG1, "JPG1", "Extension 1"},
+	{JPEG_MARKER_JPG2, "JPG2", "Extension 2"},
+	{JPEG_MARKER_JPG3, "JPG3", "Extension 3"},
+	{JPEG_MARKER_JPG4, "JPG4", "Extension 4"},
+	{JPEG_MARKER_JPG5, "JPG5", "Extension 5"},
+	{JPEG_MARKER_JPG6, "JPG6", "Extension 6"},
+	{JPEG_MARKER_JPG7, "JPG7", "Extension 7"},
+	{JPEG_MARKER_JPG8, "JPG8", "Extension 8"},
+	{JPEG_MARKER_JPG9, "JPG9", "Extension 9"},
+	{JPEG_MARKER_JPG10, "JPG10", "Extension 10"},
+	{JPEG_MARKER_JPG11, "JPG11", "Extension 11"},
+	{JPEG_MARKER_JPG12, "JPG12", "Extension 12"},
+	{JPEG_MARKER_JPG13, "JPG13", "Extension 13"},
+	{0, NULL, NULL}
+};
+
+const char *
+jpeg_marker_get_name (JPEGMarker marker)
+{
+	unsigned int i;
+
+	for (i = 0; JPEGMarkerTable[i].name; i++)
+		if (JPEGMarkerTable[i].marker == marker)
+			break;
+
+	return (JPEGMarkerTable[i].name);
+}
+
+const char *
+jpeg_marker_get_description (JPEGMarker marker)
+{
+	unsigned int i;
+
+	for (i = 0; JPEGMarkerTable[i].description; i++)
+		if (JPEGMarkerTable[i].marker == marker)
+			break;
+
+	return (JPEGMarkerTable[i].description);
+}
+

data/ext/exif/libjpeg/jpeg-marker.h

@@ -0,0 +1,103 @@
+/* jpeg-marker.h
+ *
+ * Copyright � 2001 Lutz M�ller <lutz@users.sourceforge.net>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details. 
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA  02110-1301  USA.
+ */
+#ifndef __JPEG_MARKER_H__
+#define __JPEG_MARKER_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+typedef enum {
+        JPEG_MARKER_SOF0        = 0xc0,
+        JPEG_MARKER_SOF1        = 0xc1,
+        JPEG_MARKER_SOF2        = 0xc2,
+        JPEG_MARKER_SOF3        = 0xc3,
+	JPEG_MARKER_DHT		= 0xc4,
+        JPEG_MARKER_SOF5        = 0xc5,
+        JPEG_MARKER_SOF6        = 0xc6,
+        JPEG_MARKER_SOF7        = 0xc7,
+	JPEG_MARKER_JPG		= 0xc8,
+        JPEG_MARKER_SOF9        = 0xc9,
+        JPEG_MARKER_SOF10       = 0xca,
+        JPEG_MARKER_SOF11       = 0xcb,
+	JPEG_MARKER_DAC		= 0xcc,
+        JPEG_MARKER_SOF13       = 0xcd,
+        JPEG_MARKER_SOF14       = 0xce,
+        JPEG_MARKER_SOF15       = 0xcf,
+        JPEG_MARKER_RST0	= 0xd0,
+        JPEG_MARKER_RST1	= 0xd1,
+        JPEG_MARKER_RST2	= 0xd2,
+        JPEG_MARKER_RST3	= 0xd3,
+        JPEG_MARKER_RST4	= 0xd4,
+	JPEG_MARKER_RST5	= 0xd5,
+        JPEG_MARKER_RST6	= 0xd6,
+        JPEG_MARKER_RST7	= 0xd7,
+        JPEG_MARKER_SOI         = 0xd8,
+        JPEG_MARKER_EOI         = 0xd9,
+        JPEG_MARKER_SOS         = 0xda,
+        JPEG_MARKER_DQT		= 0xdb,
+        JPEG_MARKER_DNL		= 0xdc,
+        JPEG_MARKER_DRI		= 0xdd,
+        JPEG_MARKER_DHP		= 0xde,
+        JPEG_MARKER_EXP		= 0xdf,
+	JPEG_MARKER_APP0	= 0xe0,
+        JPEG_MARKER_APP1        = 0xe1,
+	JPEG_MARKER_APP2        = 0xe2,
+	JPEG_MARKER_APP3        = 0xe3,
+	JPEG_MARKER_APP4        = 0xe4,
+	JPEG_MARKER_APP5        = 0xe5,
+	JPEG_MARKER_APP6        = 0xe6,
+	JPEG_MARKER_APP7        = 0xe7,
+	JPEG_MARKER_APP8        = 0xe8,
+	JPEG_MARKER_APP9        = 0xe9,
+	JPEG_MARKER_APP10       = 0xea,
+	JPEG_MARKER_APP11       = 0xeb,
+	JPEG_MARKER_APP12       = 0xec,
+	JPEG_MARKER_APP13       = 0xed,
+	JPEG_MARKER_APP14       = 0xee,
+	JPEG_MARKER_APP15       = 0xef,
+	JPEG_MARKER_JPG0	= 0xf0,
+	JPEG_MARKER_JPG1	= 0xf1,
+	JPEG_MARKER_JPG2	= 0xf2,
+	JPEG_MARKER_JPG3	= 0xf3,
+	JPEG_MARKER_JPG4	= 0xf4,
+	JPEG_MARKER_JPG5	= 0xf5,
+	JPEG_MARKER_JPG6	= 0xf6,
+	JPEG_MARKER_JPG7	= 0xf7,
+	JPEG_MARKER_JPG8	= 0xf8,
+	JPEG_MARKER_JPG9	= 0xf9,
+	JPEG_MARKER_JPG10	= 0xfa,
+	JPEG_MARKER_JPG11	= 0xfb,
+	JPEG_MARKER_JPG12	= 0xfc,
+	JPEG_MARKER_JPG13	= 0xfd,
+        JPEG_MARKER_COM         = 0xfe
+} JPEGMarker;
+
+#define JPEG_IS_MARKER(m) (((m) >= JPEG_MARKER_SOF0) &&		\
+			   ((m) <= JPEG_MARKER_COM))
+
+const char *jpeg_marker_get_name        (JPEGMarker marker);
+const char *jpeg_marker_get_description (JPEGMarker marker);
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __JPEG_MARKER_H__ */

data/lib/exif.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'exif/version'
 require 'exif/exif'
 

data/lib/exif/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Exif
-  VERSION = "1.0.1"
+  VERSION = '2.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: exif
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Jian Weihang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-30 00:00:00.000000000 Z
+date: 2017-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,83 +16,74 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: 1.15.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: 1.15.4
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.0.0
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.4
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.10.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.10.3
 description: Ruby EXIF reader written in C extension.
-email:
-- tonytonyjan@gmail.com
+email: tonytonyjan@gmail.com
 executables: []
 extensions:
 - ext/exif/extconf.rb
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
-- Gemfile
-- LICENSE.txt
-- README.md
-- Rakefile
-- benchmark/benchmark.rb
-- exif.gemspec
 - ext/exif/data.c
 - ext/exif/data.h
 - ext/exif/exif.c
-- ext/exif/exif.h
+- ext/exif/exif_entry_to_ivar.c
 - ext/exif/extconf.rb
+- ext/exif/libjpeg/jpeg-data.c
+- ext/exif/libjpeg/jpeg-data.h
+- ext/exif/libjpeg/jpeg-marker.c
+- ext/exif/libjpeg/jpeg-marker.h
 - lib/exif.rb
 - lib/exif/version.rb
-- spec/exif_spec.rb
-- spec/sample.jpg
-- spec/spec_helper.rb
 homepage: https://github.com/tonytonyjan/exif
 licenses:
 - MIT
@@ -113,12 +104,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Ruby EXIF reader written in C extension.
-test_files:
-- spec/exif_spec.rb
-- spec/sample.jpg
-- spec/spec_helper.rb
-has_rdoc: 
+test_files: []