tdiary-contrib 3.2.2.20130518 → 3.2.2.20130614
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.travis.yml +1 -3
- data/doc/ja/plugin/image_gps.txt +56 -17
- data/doc/ja/plugin/playstore.txt +31 -0
- data/js/socialbutton.js +8 -2
- data/lib/exifparser/README +6 -12
- data/lib/tdiary-contrib.rb +7 -6
- data/plugin/brow_si.rb +32 -0
- data/plugin/image_gps.rb +110 -56
- data/plugin/instagr.rb +1 -0
- data/plugin/playstore.rb +161 -0
- data/plugin/tweet_quote.rb +102 -48
- data/plugin/twitter_badge.rb +1 -1
- data/util/estraier-search/estraier-register.rb +2 -1
- data/util/estraier-search/estraier-search.rb +2 -1
- data/util/image-gallery/misc/plugin/recent_image.rb +1 -1
- metadata +7 -27
- data/doc/ja/plugin/image_detail.txt +0 -69
- data/doc/ja/plugin/image_gps2.txt +0 -41
- data/lib/exifparser/BUGS +0 -1
- data/lib/exifparser/ChangeLog +0 -169
- data/lib/exifparser/install.rb +0 -1015
- data/lib/exifparser/lib/exifparser/makernote/canon.rb +0 -502
- data/lib/exifparser/lib/exifparser/makernote/fujifilm.rb +0 -415
- data/lib/exifparser/lib/exifparser/makernote/minolta.rb +0 -84
- data/lib/exifparser/lib/exifparser/makernote/mk_nikonflensname.rb +0 -39
- data/lib/exifparser/lib/exifparser/makernote/nikon.rb +0 -267
- data/lib/exifparser/lib/exifparser/makernote/nikon2.rb +0 -581
- data/lib/exifparser/lib/exifparser/makernote/nikonflensname.rb +0 -438
- data/lib/exifparser/lib/exifparser/makernote/olympus.rb +0 -225
- data/lib/exifparser/lib/exifparser/makernote/prove.rb +0 -84
- data/lib/exifparser/lib/exifparser/makernote/sigma.rb +0 -237
- data/lib/exifparser/lib/exifparser/pre-setup.rb +0 -1
- data/lib/exifparser/lib/exifparser/scan.rb +0 -278
- data/lib/exifparser/lib/exifparser/tag.rb +0 -2298
- data/lib/exifparser/lib/exifparser/thumbnail.rb +0 -76
- data/lib/exifparser/lib/exifparser/utils.rb +0 -88
- data/lib/exifparser/lib/exifparser.rb +0 -265
- data/lib/exifparser/sample/exifview.rb +0 -279
- data/plugin/image_detail.rb +0 -143
@@ -1,225 +0,0 @@
|
|
1
|
-
#
|
2
|
-
# exif/makernote/olympus.rb -
|
3
|
-
#
|
4
|
-
# Copyright (C) Ryuichi Tamura (r-tam@fsinet.or.jp)
|
5
|
-
#
|
6
|
-
# $Revision: 1.1.1.1 $
|
7
|
-
# $Date: 2002/12/16 07:59:00 $
|
8
|
-
#
|
9
|
-
#== Reference
|
10
|
-
#
|
11
|
-
#http://www.ba.wakwak.com/%7Etsuruzoh/Computer/Digicams/exif-e.html
|
12
|
-
#
|
13
|
-
require 'exifparser/tag'
|
14
|
-
require 'exifparser/utils'
|
15
|
-
|
16
|
-
module Exif
|
17
|
-
|
18
|
-
#
|
19
|
-
# Tags used in Olympus Makernote
|
20
|
-
#
|
21
|
-
module Tag
|
22
|
-
|
23
|
-
module MakerNote
|
24
|
-
|
25
|
-
#
|
26
|
-
# 0x0200 - SpecialMode
|
27
|
-
#
|
28
|
-
class SpecialMode < Base
|
29
|
-
|
30
|
-
def processData
|
31
|
-
@formatted = []
|
32
|
-
partition_data(@count) do |data|
|
33
|
-
@formatted.push _formatData(data)
|
34
|
-
end
|
35
|
-
end
|
36
|
-
|
37
|
-
def to_s
|
38
|
-
buf = "Picture taking mode: "
|
39
|
-
case @formatted[0]
|
40
|
-
when 0
|
41
|
-
buf << 'Normal,'
|
42
|
-
when 1
|
43
|
-
buf << 'Unknown,'
|
44
|
-
when 2
|
45
|
-
buf << 'Fast,'
|
46
|
-
when 3
|
47
|
-
buf << 'Panorama,'
|
48
|
-
else
|
49
|
-
buf << 'Unknown,'
|
50
|
-
end
|
51
|
-
buf << " Sequence number: #{@formatted[1]},"
|
52
|
-
buf << " Panorama direction: "
|
53
|
-
case @formatted[2]
|
54
|
-
when 1
|
55
|
-
buf << 'left to right'
|
56
|
-
when 2
|
57
|
-
buf << 'right to left'
|
58
|
-
when 3
|
59
|
-
buf << 'bottom to top'
|
60
|
-
when 4
|
61
|
-
buf << 'top to bottom'
|
62
|
-
else
|
63
|
-
buf << 'unknown'
|
64
|
-
end
|
65
|
-
end
|
66
|
-
|
67
|
-
end
|
68
|
-
|
69
|
-
#
|
70
|
-
# 0x0201 - JpegQual
|
71
|
-
#
|
72
|
-
class JpegQual < Base
|
73
|
-
|
74
|
-
def to_s
|
75
|
-
case @formatted
|
76
|
-
when 1
|
77
|
-
"Standard Quality"
|
78
|
-
when 2
|
79
|
-
"High Quality"
|
80
|
-
when 3
|
81
|
-
"Super High Quality"
|
82
|
-
else
|
83
|
-
"Unknown"
|
84
|
-
end
|
85
|
-
end
|
86
|
-
|
87
|
-
end
|
88
|
-
|
89
|
-
#
|
90
|
-
# 0x0202 - Macro
|
91
|
-
#
|
92
|
-
class Macro < Base
|
93
|
-
|
94
|
-
def to_s
|
95
|
-
case @formatted
|
96
|
-
when 0
|
97
|
-
'Off'
|
98
|
-
when 1
|
99
|
-
'On'
|
100
|
-
else
|
101
|
-
'Unknown'
|
102
|
-
end
|
103
|
-
end
|
104
|
-
|
105
|
-
end
|
106
|
-
|
107
|
-
#
|
108
|
-
# 0x0203 - Unknown
|
109
|
-
#
|
110
|
-
|
111
|
-
#
|
112
|
-
# 0x0204 - DigiZoom
|
113
|
-
#
|
114
|
-
class DigiZoom < Base
|
115
|
-
end
|
116
|
-
|
117
|
-
#
|
118
|
-
# 0x0205 - Unknown
|
119
|
-
#
|
120
|
-
|
121
|
-
#
|
122
|
-
# 0x0206 - Unknown
|
123
|
-
#
|
124
|
-
|
125
|
-
#
|
126
|
-
# 0x0207 - SoftwareRelease
|
127
|
-
#
|
128
|
-
class SoftwareRelease < Base
|
129
|
-
end
|
130
|
-
|
131
|
-
#
|
132
|
-
# 0x0208 - PictInfo
|
133
|
-
#
|
134
|
-
class PictInfo < Base
|
135
|
-
end
|
136
|
-
|
137
|
-
#
|
138
|
-
# 0x0209 - CameraID
|
139
|
-
#
|
140
|
-
class CameraID < Base
|
141
|
-
end
|
142
|
-
|
143
|
-
#
|
144
|
-
# 0x0f00
|
145
|
-
#
|
146
|
-
class DataDump < Base
|
147
|
-
end
|
148
|
-
|
149
|
-
end
|
150
|
-
|
151
|
-
OlympusIFDTable = {
|
152
|
-
0x0200 => MakerNote::SpecialMode,
|
153
|
-
0x0201 => MakerNote::JpegQual,
|
154
|
-
0x0202 => MakerNote::Macro,
|
155
|
-
0x0203 => Unknown,
|
156
|
-
0x0204 => MakerNote::DigiZoom,
|
157
|
-
0x0205 => Unknown,
|
158
|
-
0x0206 => Unknown,
|
159
|
-
0x0207 => MakerNote::SoftwareRelease,
|
160
|
-
0x0208 => MakerNote::PictInfo,
|
161
|
-
0x0209 => MakerNote::CameraID,
|
162
|
-
0x0f00 => MakerNote::DataDump
|
163
|
-
}
|
164
|
-
|
165
|
-
end
|
166
|
-
|
167
|
-
class Olympus
|
168
|
-
|
169
|
-
def initialize(fin, tiff_origin, dataPos, byteOrder_module)
|
170
|
-
@fin = fin
|
171
|
-
@tiffHeader0 = tiff_origin
|
172
|
-
@dataPos = dataPos
|
173
|
-
@byteOrder_module = byteOrder_module
|
174
|
-
self.extend @byteOrder_module
|
175
|
-
end
|
176
|
-
|
177
|
-
def scan_IFD
|
178
|
-
#
|
179
|
-
# Olympus MakerNote starts from 8 byte from the origin.
|
180
|
-
#
|
181
|
-
@fin.pos = @dataPos + 8
|
182
|
-
#
|
183
|
-
# get the number of tags
|
184
|
-
#
|
185
|
-
num_dirs = decode_ushort(fin_read_n(2))
|
186
|
-
#
|
187
|
-
# now scan them
|
188
|
-
#
|
189
|
-
1.upto(num_dirs) {
|
190
|
-
curpos_tag = @fin.pos
|
191
|
-
tag = parseTagID(fin_read_n(2))
|
192
|
-
tagclass = Tag.find(tag.hex, Tag::OlympusIFDTable)
|
193
|
-
unit, formatter = Tag::Format::Unit[decode_ushort(fin_read_n(2))]
|
194
|
-
count = decode_ulong(fin_read_n(4))
|
195
|
-
tagdata = fin_read_n(4)
|
196
|
-
obj = tagclass.new(tag, "MakerNote", count)
|
197
|
-
obj.extend formatter, @byteOrder_module
|
198
|
-
obj.pos = curpos_tag
|
199
|
-
if unit * count > 4
|
200
|
-
curpos = @fin.pos
|
201
|
-
begin
|
202
|
-
@fin.pos = @tiffHeader0 + decode_ulong(tagdata)
|
203
|
-
obj.dataPos = @fin.pos
|
204
|
-
obj.data = fin_read_n(unit*count)
|
205
|
-
ensure
|
206
|
-
@fin.pos = curpos
|
207
|
-
end
|
208
|
-
else
|
209
|
-
obj.dataPos = @fin.pos - 4
|
210
|
-
obj.data = tagdata
|
211
|
-
end
|
212
|
-
obj.processData
|
213
|
-
yield obj
|
214
|
-
}
|
215
|
-
end
|
216
|
-
|
217
|
-
private
|
218
|
-
|
219
|
-
def fin_read_n(n)
|
220
|
-
@fin.read(n)
|
221
|
-
end
|
222
|
-
|
223
|
-
end
|
224
|
-
|
225
|
-
end
|
@@ -1,84 +0,0 @@
|
|
1
|
-
#
|
2
|
-
#
|
3
|
-
# exifparser/makernote/prove.rb -
|
4
|
-
#
|
5
|
-
# Copyright (C) 2002 Ryuichi Tamura (r-tam@fsinet.or.jp)
|
6
|
-
#
|
7
|
-
# $Revision: 1.1.1.1 $
|
8
|
-
# $Date: 2002/12/16 07:59:00 $
|
9
|
-
#
|
10
|
-
require 'exifparser/makernote/fujifilm'
|
11
|
-
require 'exifparser/makernote/olympus'
|
12
|
-
require 'exifparser/makernote/canon'
|
13
|
-
require 'exifparser/makernote/nikon'
|
14
|
-
require 'exifparser/makernote/nikon2'
|
15
|
-
require 'exifparser/makernote/minolta'
|
16
|
-
require 'exifparser/makernote/sigma'
|
17
|
-
|
18
|
-
module Exif
|
19
|
-
|
20
|
-
module MakerNote
|
21
|
-
|
22
|
-
class NotSupportedError < RuntimeError; end
|
23
|
-
|
24
|
-
module_function
|
25
|
-
|
26
|
-
def prove(data, tag_make=nil, tag_model=nil)
|
27
|
-
|
28
|
-
make = tag_make == nil ? '' : tag_make.to_s.upcase
|
29
|
-
model = tag_model == nil ? '' : tag_model.to_s.upcase
|
30
|
-
|
31
|
-
#
|
32
|
-
# Identifier for OLYMPUS
|
33
|
-
#
|
34
|
-
if data[0..5] == "OLYMP\000"
|
35
|
-
return Olympus
|
36
|
-
#
|
37
|
-
# Identifier for FUJIFILM
|
38
|
-
#
|
39
|
-
elsif data[0..7] == "FUJIFILM"
|
40
|
-
return Fujifilm
|
41
|
-
|
42
|
-
#
|
43
|
-
# Identifier for Nikon
|
44
|
-
#
|
45
|
-
|
46
|
-
elsif make[0..4] == 'NIKON'
|
47
|
-
if data[0..5] == "Nikon\000"
|
48
|
-
if data[6] == 0x01 && data[7] == 0x00
|
49
|
-
return Nikon
|
50
|
-
end
|
51
|
-
end
|
52
|
-
return Nikon2
|
53
|
-
|
54
|
-
#
|
55
|
-
# Canon
|
56
|
-
#
|
57
|
-
elsif make[0..4] == 'CANON'
|
58
|
-
return Canon
|
59
|
-
|
60
|
-
#
|
61
|
-
# Minolta
|
62
|
-
#
|
63
|
-
elsif make[0..6] == 'MINOLTA'
|
64
|
-
return Minolta
|
65
|
-
|
66
|
-
#
|
67
|
-
# Sigma
|
68
|
-
#
|
69
|
-
elsif make[0..4] == 'SIGMA'
|
70
|
-
return Sigma
|
71
|
-
|
72
|
-
end
|
73
|
-
|
74
|
-
#
|
75
|
-
# If none above is applied, raises exception,
|
76
|
-
# which will be caught by caller's rescue statement.
|
77
|
-
#
|
78
|
-
raise NotSupportedError
|
79
|
-
end
|
80
|
-
module_function :prove
|
81
|
-
|
82
|
-
end
|
83
|
-
|
84
|
-
end
|
@@ -1,237 +0,0 @@
|
|
1
|
-
#
|
2
|
-
# exifparser/makernote/sigma.rb
|
3
|
-
#
|
4
|
-
# $Revision: 1.1 $
|
5
|
-
# $Date: 2010/10/23 16:41:28 $
|
6
|
-
#
|
7
|
-
require 'exifparser/tag'
|
8
|
-
require 'exifparser/utils'
|
9
|
-
|
10
|
-
module Exif
|
11
|
-
|
12
|
-
module Tag
|
13
|
-
|
14
|
-
module MakerNote
|
15
|
-
#
|
16
|
-
# 0x0002 - SigmaSerialNo
|
17
|
-
#
|
18
|
-
# class SigmaSerialNo < Base
|
19
|
-
# end
|
20
|
-
|
21
|
-
#
|
22
|
-
# 0x0003 - DriveMode
|
23
|
-
#
|
24
|
-
class DriveMode < Base
|
25
|
-
end
|
26
|
-
|
27
|
-
#
|
28
|
-
# 0x0004 - ImageSize
|
29
|
-
#
|
30
|
-
class ImageSize < Base
|
31
|
-
end
|
32
|
-
|
33
|
-
#
|
34
|
-
# 0x0005 - AF_Mode
|
35
|
-
#
|
36
|
-
class AF_Mode < Base
|
37
|
-
end
|
38
|
-
|
39
|
-
#
|
40
|
-
# 0x0006 - AF_Setting
|
41
|
-
#
|
42
|
-
class AF_Setting < Base
|
43
|
-
end
|
44
|
-
|
45
|
-
#
|
46
|
-
# 0x0007 - White_Balance
|
47
|
-
#
|
48
|
-
class White_Balance < Base
|
49
|
-
end
|
50
|
-
|
51
|
-
#
|
52
|
-
# 0x0008 - ExposureMode
|
53
|
-
#
|
54
|
-
class ExposureMode < Base
|
55
|
-
end
|
56
|
-
|
57
|
-
#
|
58
|
-
# 0x0009 - MeteringMode
|
59
|
-
#
|
60
|
-
class MeteringMode < Base
|
61
|
-
end
|
62
|
-
|
63
|
-
#
|
64
|
-
# 0x000a - FocalLength
|
65
|
-
#
|
66
|
-
class FocalLength < Base
|
67
|
-
end
|
68
|
-
|
69
|
-
#
|
70
|
-
# 0x000b - ColorSpace
|
71
|
-
#
|
72
|
-
class ColorSpace < Base
|
73
|
-
end
|
74
|
-
|
75
|
-
#
|
76
|
-
# 0x000c - ExposureBias
|
77
|
-
#
|
78
|
-
class ExposureBias < Base
|
79
|
-
end
|
80
|
-
|
81
|
-
#
|
82
|
-
# 0x000d - Contrast
|
83
|
-
#
|
84
|
-
class Contrast < Base
|
85
|
-
end
|
86
|
-
|
87
|
-
#
|
88
|
-
# 0x000e - Shadow
|
89
|
-
#
|
90
|
-
class Shadow < Base
|
91
|
-
end
|
92
|
-
|
93
|
-
#
|
94
|
-
# 0x000f - HighLight
|
95
|
-
#
|
96
|
-
class HighLight < Base
|
97
|
-
end
|
98
|
-
|
99
|
-
#
|
100
|
-
# 0x0010 - Saturation
|
101
|
-
#
|
102
|
-
class Saturation
|
103
|
-
end
|
104
|
-
|
105
|
-
#
|
106
|
-
# 0x0011 - SharpnessBias
|
107
|
-
#
|
108
|
-
class SharpnessBias < Base
|
109
|
-
end
|
110
|
-
|
111
|
-
#
|
112
|
-
# 0x0012 - X3FillLight
|
113
|
-
#
|
114
|
-
class X3FillLight < Base
|
115
|
-
end
|
116
|
-
|
117
|
-
#
|
118
|
-
# 0x0014 - ColorControl
|
119
|
-
#
|
120
|
-
class ColorControl < Base
|
121
|
-
end
|
122
|
-
|
123
|
-
#
|
124
|
-
# 0x0015 - SettingMode
|
125
|
-
#
|
126
|
-
class SettingMode < Base
|
127
|
-
end
|
128
|
-
|
129
|
-
#
|
130
|
-
# 0x0017 - Firmware
|
131
|
-
#
|
132
|
-
class Firmware < Base
|
133
|
-
end
|
134
|
-
|
135
|
-
#
|
136
|
-
# 0x0018 - SigmaSoftware
|
137
|
-
#
|
138
|
-
class SigmaSoftware < Base
|
139
|
-
end
|
140
|
-
|
141
|
-
#
|
142
|
-
# 0x0019 - AutoBracket
|
143
|
-
#
|
144
|
-
class AutoBracket < Base
|
145
|
-
end
|
146
|
-
|
147
|
-
end
|
148
|
-
|
149
|
-
SigmaIFDTable = {
|
150
|
-
# 0x0002 => MakerNote::SigmaSerialNo,
|
151
|
-
0x0003 => MakerNote::DriveMode,
|
152
|
-
0x0004 => MakerNote::ImageSize,
|
153
|
-
0x0005 => MakerNote::AF_Mode,
|
154
|
-
0x0006 => MakerNote::AF_Setting,
|
155
|
-
0x0007 => MakerNote::White_Balance,
|
156
|
-
0x0008 => MakerNote::ExposureMode,
|
157
|
-
0x0009 => MakerNote::MeteringMode,
|
158
|
-
0x000a => MakerNote::FocalLength,
|
159
|
-
0x000b => MakerNote::ColorSpace,
|
160
|
-
0x000c => MakerNote::ExposureBias,
|
161
|
-
0x000d => MakerNote::Contrast,
|
162
|
-
0x000e => MakerNote::Shadow,
|
163
|
-
0x000f => MakerNote::HighLight,
|
164
|
-
0x0010 => MakerNote::Saturation,
|
165
|
-
0x0011 => MakerNote::SharpnessBias,
|
166
|
-
0x0012 => MakerNote::X3FillLight,
|
167
|
-
0x0014 => MakerNote::ColorControl,
|
168
|
-
0x0015 => MakerNote::SettingMode,
|
169
|
-
0x0017 => MakerNote::Firmware,
|
170
|
-
0x0018 => MakerNote::SigmaSoftware,
|
171
|
-
0x0019 => MakerNote::AutoBracket
|
172
|
-
}
|
173
|
-
|
174
|
-
end
|
175
|
-
|
176
|
-
class Sigma
|
177
|
-
|
178
|
-
def initialize(fin, tiff_origin, dataPos, byteOrder_module)
|
179
|
-
@fin = fin
|
180
|
-
@tiffHeader0 = tiff_origin
|
181
|
-
@dataPos = dataPos
|
182
|
-
@byteOrder_module = byteOrder_module
|
183
|
-
self.extend @byteOrder_module
|
184
|
-
end
|
185
|
-
|
186
|
-
def scan_IFD
|
187
|
-
#
|
188
|
-
# Sigma MakerNote starts from 10 byte from the origin
|
189
|
-
#
|
190
|
-
@fin.pos = @dataPos + 10
|
191
|
-
|
192
|
-
#
|
193
|
-
# get the number of tags
|
194
|
-
#
|
195
|
-
numDirs = decode_ushort(fin_read_n(2))
|
196
|
-
|
197
|
-
#
|
198
|
-
# now scan them
|
199
|
-
#
|
200
|
-
1.upto(numDirs) {
|
201
|
-
curpos_tag = @fin.pos
|
202
|
-
tag = parseTagID(fin_read_n(2))
|
203
|
-
tagclass = Tag.find(tag.hex, Tag::SigmaIFDTable)
|
204
|
-
unit, formatter = Tag::Format::Unit[decode_ushort(fin_read_n(2))]
|
205
|
-
count = decode_ulong(fin_read_n(4))
|
206
|
-
tagdata = fin_read_n(4)
|
207
|
-
|
208
|
-
obj = tagclass.new(tag, "MakerNote", count)
|
209
|
-
obj.extend formatter, @byteOrder_module
|
210
|
-
obj.pos = curpos_tag
|
211
|
-
if unit * count > 4
|
212
|
-
curpos = @fin.pos
|
213
|
-
begin
|
214
|
-
@fin.pos = @tiffHeader0 + decode_ulong(tagdata)
|
215
|
-
obj.dataPos = @fin.pos
|
216
|
-
obj.data = fin_read_n(unit*count)
|
217
|
-
ensure
|
218
|
-
@fin.pos = curpos
|
219
|
-
end
|
220
|
-
else
|
221
|
-
obj.dataPos = @fin.pos - 4
|
222
|
-
obj.data = tagdata
|
223
|
-
end
|
224
|
-
obj.processData
|
225
|
-
yield obj
|
226
|
-
}
|
227
|
-
end
|
228
|
-
|
229
|
-
private
|
230
|
-
|
231
|
-
def fin_read_n(n)
|
232
|
-
@fin.read(n)
|
233
|
-
end
|
234
|
-
|
235
|
-
end
|
236
|
-
|
237
|
-
end
|
@@ -1 +0,0 @@
|
|
1
|
-
# pre-setup.rb - working with install.rb
|