ruby-vips 0.3.4 → 0.3.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
data/CHANGELOG.md CHANGED
@@ -1,5 +1,10 @@
1
1
  # master
2
2
 
3
+ # Version 0.3.5
4
+
5
+ * rb_raise() in mask.c no longer passes a string pointer as the fmt arg, stopping gcc bailing out on some platforms [John Cupitt]
6
+ * Image.magick() now calls im_magick2vips() directly rather than relying on libvips file type sniffing [John Cupitt]
7
+
3
8
  # Version 0.3.4
4
9
 
5
10
  * Update specs for lcms changes, thanks Stanislaw [John Cupitt]
data/Gemfile.lock CHANGED
@@ -19,7 +19,7 @@ GEM
19
19
  rspec-core (2.11.1)
20
20
  rspec-expectations (2.11.3)
21
21
  diff-lcs (~> 1.1.3)
22
- rspec-mocks (2.11.2)
22
+ rspec-mocks (2.11.3)
23
23
 
24
24
  PLATFORMS
25
25
  ruby
data/README.md CHANGED
@@ -99,7 +99,7 @@ gem 'ruby-vips'
99
99
  ## Documentation.
100
100
 
101
101
  ruby-vips has [rdoc
102
- documentation](http://rubydoc.info/gems/ruby-vips/0.2.0/frames). Also
102
+ documentation](http://rubydoc.info/gems/ruby-vips/frames). Also
103
103
  see [Wiki page](https://github.com/jcupitt/ruby-vips/wiki)
104
104
 
105
105
  ## Small example
data/ext/mask.c CHANGED
@@ -282,7 +282,7 @@ mask_arg2mask(VALUE arg, INTMASK **imask, DOUBLEMASK **dmask)
282
282
  else
283
283
  errstr = "Expected an int array or an int Mask";
284
284
 
285
- rb_raise(rb_eArgError, errstr);
285
+ rb_raise(rb_eArgError, "%s", errstr);
286
286
  }
287
287
 
288
288
  if (imask)
data/ext/reader.c CHANGED
@@ -39,16 +39,16 @@ reader_s_recognized_p(VALUE klass, VALUE path)
39
39
  static VALUE
40
40
  reader_read_internal(VALUE obj, VALUE path, VALUE flags)
41
41
  {
42
- VipsImage *im_new;
42
+ VipsImage *im_new;
43
43
 
44
- /* flags bit 1 means "sequential mode requested".
45
- */
46
- char *mode = NUM2INT(flags) & 1 ? "rs" : "rd";
44
+ /* flags bit 1 means "sequential mode requested".
45
+ */
46
+ char *mode = NUM2INT(flags) & 1 ? "rs" : "rd";
47
47
 
48
48
  if (!(im_new = im_open(StringValuePtr(path), mode)))
49
49
  vips_lib_error();
50
50
 
51
- return img_init(cVIPSImage, im_new);
51
+ return img_init(cVIPSImage, im_new);
52
52
  }
53
53
 
54
54
  /* :nodoc: */
@@ -70,6 +70,21 @@ raw_read_internal(VALUE obj, VALUE path, VALUE width, VALUE height, VALUE bpp,
70
70
  return img_init(cVIPSImage, im_new);
71
71
  }
72
72
 
73
+ static VALUE
74
+ magick_read_internal(VALUE obj, VALUE path, VALUE flags)
75
+ {
76
+ VipsImage *im_new;
77
+
78
+ if (!(im_new = im_open(StringValuePtr(path), "p")))
79
+ vips_lib_error();
80
+ if (im_magick2vips(StringValuePtr(path), im_new)) {
81
+ im_close(im_new);
82
+ vips_lib_error();
83
+ }
84
+
85
+ return img_init(cVIPSImage, im_new);
86
+ }
87
+
73
88
  static void
74
89
  reader_fmt_set(VALUE klass, const char* val)
75
90
  {
@@ -152,6 +167,7 @@ init_Reader(void)
152
167
  */
153
168
 
154
169
  VALUE magick_reader = rb_define_class_under(mVIPS, "MagickReader", reader);
170
+ rb_define_private_method(magick_reader, "read_internal", magick_read_internal, 2);
155
171
  reader_fmt_set(magick_reader, "magick");
156
172
 
157
173
  /*
data/lib/vips/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module VIPS
2
- VERSION = "0.3.4"
2
+ VERSION = "0.3.5"
3
3
  end
data/lib/vips/writer.rb CHANGED
@@ -171,7 +171,7 @@ module VIPS
171
171
  end
172
172
 
173
173
  def layout_str
174
- s = @layout
174
+ s = @layout.to_s
175
175
  s << ":#{@tile_size.join 'x'}" if @layout == :tile
176
176
  s
177
177
  end
data/ruby-vips.gemspec CHANGED
@@ -5,11 +5,11 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = "ruby-vips"
8
- s.version = "0.3.4"
8
+ s.version = "0.3.5"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["Timothy Elliott", "John Cupitt"]
12
- s.date = "2012-09-11"
12
+ s.date = "2013-01-15"
13
13
  s.description = "Ruby extension for the vips image processing library."
14
14
  s.email = "jcupitt@gmail.com"
15
15
  s.extensions = ["ext/extconf.rb"]
@@ -69,7 +69,7 @@ Gem::Specification.new do |s|
69
69
  s.homepage = "http://github.com/jcupitt/ruby-vips"
70
70
  s.licenses = ["MIT"]
71
71
  s.require_paths = ["lib"]
72
- s.rubygems_version = "1.8.15"
72
+ s.rubygems_version = "1.8.23"
73
73
  s.summary = "ruby-vips is a ruby extension for vips. It is extremely fast and it can process huge images without requiring the entire image to be loaded into memory."
74
74
 
75
75
  if s.respond_to? :specification_version then
metadata CHANGED
@@ -1,93 +1,91 @@
1
- --- !ruby/object:Gem::Specification
1
+ --- !ruby/object:Gem::Specification
2
2
  name: ruby-vips
3
- version: !ruby/object:Gem::Version
4
- hash: 27
3
+ version: !ruby/object:Gem::Version
4
+ version: 0.3.5
5
5
  prerelease:
6
- segments:
7
- - 0
8
- - 3
9
- - 4
10
- version: 0.3.4
11
6
  platform: ruby
12
- authors:
7
+ authors:
13
8
  - Timothy Elliott
14
9
  - John Cupitt
15
10
  autorequire:
16
11
  bindir: bin
17
12
  cert_chain: []
18
-
19
- date: 2012-09-11 00:00:00 Z
20
- dependencies:
21
- - !ruby/object:Gem::Dependency
22
- version_requirements: &id001 !ruby/object:Gem::Requirement
13
+ date: 2013-01-15 00:00:00.000000000 Z
14
+ dependencies:
15
+ - !ruby/object:Gem::Dependency
16
+ name: rdoc
17
+ requirement: !ruby/object:Gem::Requirement
23
18
  none: false
24
- requirements:
19
+ requirements:
25
20
  - - ~>
26
- - !ruby/object:Gem::Version
27
- hash: 31
28
- segments:
29
- - 3
30
- - 12
31
- version: "3.12"
32
- name: rdoc
33
- prerelease: false
21
+ - !ruby/object:Gem::Version
22
+ version: '3.12'
34
23
  type: :development
35
- requirement: *id001
36
- - !ruby/object:Gem::Dependency
37
- version_requirements: &id002 !ruby/object:Gem::Requirement
24
+ prerelease: false
25
+ version_requirements: !ruby/object:Gem::Requirement
38
26
  none: false
39
- requirements:
40
- - - ">="
41
- - !ruby/object:Gem::Version
42
- hash: 3
43
- segments:
44
- - 0
45
- version: "0"
27
+ requirements:
28
+ - - ~>
29
+ - !ruby/object:Gem::Version
30
+ version: '3.12'
31
+ - !ruby/object:Gem::Dependency
46
32
  name: bundler
47
- prerelease: false
33
+ requirement: !ruby/object:Gem::Requirement
34
+ none: false
35
+ requirements:
36
+ - - ! '>='
37
+ - !ruby/object:Gem::Version
38
+ version: '0'
48
39
  type: :development
49
- requirement: *id002
50
- - !ruby/object:Gem::Dependency
51
- version_requirements: &id003 !ruby/object:Gem::Requirement
40
+ prerelease: false
41
+ version_requirements: !ruby/object:Gem::Requirement
42
+ none: false
43
+ requirements:
44
+ - - ! '>='
45
+ - !ruby/object:Gem::Version
46
+ version: '0'
47
+ - !ruby/object:Gem::Dependency
48
+ name: jeweler
49
+ requirement: !ruby/object:Gem::Requirement
52
50
  none: false
53
- requirements:
51
+ requirements:
54
52
  - - ~>
55
- - !ruby/object:Gem::Version
56
- hash: 49
57
- segments:
58
- - 1
59
- - 8
60
- - 3
53
+ - !ruby/object:Gem::Version
61
54
  version: 1.8.3
62
- name: jeweler
63
- prerelease: false
64
55
  type: :development
65
- requirement: *id003
66
- - !ruby/object:Gem::Dependency
67
- version_requirements: &id004 !ruby/object:Gem::Requirement
56
+ prerelease: false
57
+ version_requirements: !ruby/object:Gem::Requirement
68
58
  none: false
69
- requirements:
70
- - - ">="
71
- - !ruby/object:Gem::Version
72
- hash: 3
73
- segments:
74
- - 0
75
- version: "0"
59
+ requirements:
60
+ - - ~>
61
+ - !ruby/object:Gem::Version
62
+ version: 1.8.3
63
+ - !ruby/object:Gem::Dependency
76
64
  name: rspec
77
- prerelease: false
65
+ requirement: !ruby/object:Gem::Requirement
66
+ none: false
67
+ requirements:
68
+ - - ! '>='
69
+ - !ruby/object:Gem::Version
70
+ version: '0'
78
71
  type: :development
79
- requirement: *id004
72
+ prerelease: false
73
+ version_requirements: !ruby/object:Gem::Requirement
74
+ none: false
75
+ requirements:
76
+ - - ! '>='
77
+ - !ruby/object:Gem::Version
78
+ version: '0'
80
79
  description: Ruby extension for the vips image processing library.
81
80
  email: jcupitt@gmail.com
82
81
  executables: []
83
-
84
- extensions:
82
+ extensions:
85
83
  - ext/extconf.rb
86
- extra_rdoc_files:
84
+ extra_rdoc_files:
87
85
  - LICENSE
88
86
  - README.md
89
87
  - TODO
90
- files:
88
+ files:
91
89
  - CHANGELOG.md
92
90
  - Gemfile.lock
93
91
  - README.md
@@ -137,37 +135,32 @@ files:
137
135
  - LICENSE
138
136
  - TODO
139
137
  homepage: http://github.com/jcupitt/ruby-vips
140
- licenses:
138
+ licenses:
141
139
  - MIT
142
140
  post_install_message:
143
141
  rdoc_options: []
144
-
145
- require_paths:
142
+ require_paths:
146
143
  - lib
147
- required_ruby_version: !ruby/object:Gem::Requirement
144
+ required_ruby_version: !ruby/object:Gem::Requirement
148
145
  none: false
149
- requirements:
150
- - - ">="
151
- - !ruby/object:Gem::Version
152
- hash: 3
153
- segments:
146
+ requirements:
147
+ - - ! '>='
148
+ - !ruby/object:Gem::Version
149
+ version: '0'
150
+ segments:
154
151
  - 0
155
- version: "0"
156
- required_rubygems_version: !ruby/object:Gem::Requirement
152
+ hash: 3498407689071905375
153
+ required_rubygems_version: !ruby/object:Gem::Requirement
157
154
  none: false
158
- requirements:
159
- - - ">="
160
- - !ruby/object:Gem::Version
161
- hash: 3
162
- segments:
163
- - 0
164
- version: "0"
155
+ requirements:
156
+ - - ! '>='
157
+ - !ruby/object:Gem::Version
158
+ version: '0'
165
159
  requirements: []
166
-
167
160
  rubyforge_project:
168
- rubygems_version: 1.8.15
161
+ rubygems_version: 1.8.23
169
162
  signing_key:
170
163
  specification_version: 3
171
- summary: ruby-vips is a ruby extension for vips. It is extremely fast and it can process huge images without requiring the entire image to be loaded into memory.
164
+ summary: ruby-vips is a ruby extension for vips. It is extremely fast and it can process
165
+ huge images without requiring the entire image to be loaded into memory.
172
166
  test_files: []
173
-