gdk_pixbuf2 3.1.0-x64-mingw32 → 3.1.1-x64-mingw32

Sign up to get free protection for your applications and to get access to all the features.
Files changed (81) hide show
  1. checksums.yaml +4 -4
  2. data/Rakefile +1 -1
  3. data/lib/gdk_pixbuf2/deprecated.rb +3 -1
  4. data/lib/gdk_pixbuf2/pixbuf.rb +59 -5
  5. data/test/gdk_pixbuf2-test-utils.rb +11 -0
  6. data/test/test-pixbuf.rb +61 -15
  7. data/vendor/local/bin/gdk-pixbuf-csource.exe +0 -0
  8. data/vendor/local/bin/gdk-pixbuf-pixdata.exe +0 -0
  9. data/vendor/local/bin/gdk-pixbuf-query-loaders.exe +0 -0
  10. data/vendor/local/bin/gdk-pixbuf-thumbnailer.exe +0 -0
  11. data/vendor/local/bin/libgdk_pixbuf-2.0-0.dll +0 -0
  12. data/vendor/local/include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-animation.h +4 -3
  13. data/vendor/local/include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-core.h +29 -8
  14. data/vendor/local/include/gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixbuf-features.h +2 -2
  15. data/vendor/local/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache +45 -45
  16. data/vendor/local/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-svg.a +0 -0
  17. data/vendor/local/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-svg.dll +0 -0
  18. data/vendor/local/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-svg.dll.a +0 -0
  19. data/vendor/local/lib/girepository-1.0/GdkPixbuf-2.0.typelib +0 -0
  20. data/vendor/local/lib/libgdk_pixbuf-2.0.dll.a +0 -0
  21. data/vendor/local/lib/libgdk_pixbuf-2.0.la +1 -1
  22. data/vendor/local/lib/pkgconfig/gdk-pixbuf-2.0.pc +1 -1
  23. data/vendor/local/share/gir-1.0/GdkPixbuf-2.0.gir +224 -17
  24. data/vendor/local/share/gtk-doc/html/gdk-pixbuf/GdkPixbufLoader.html +2 -2
  25. data/vendor/local/share/gtk-doc/html/gdk-pixbuf/annotation-glossary.html +2 -2
  26. data/vendor/local/share/gtk-doc/html/gdk-pixbuf/api-index-2-12.html +2 -2
  27. data/vendor/local/share/gtk-doc/html/gdk-pixbuf/api-index-2-14.html +2 -2
  28. data/vendor/local/share/gtk-doc/html/gdk-pixbuf/api-index-2-2.html +2 -2
  29. data/vendor/local/share/gtk-doc/html/gdk-pixbuf/api-index-2-26.html +2 -2
  30. data/vendor/local/share/gtk-doc/html/gdk-pixbuf/api-index-2-28.html +2 -2
  31. data/vendor/local/share/gtk-doc/html/gdk-pixbuf/api-index-2-30.html +2 -2
  32. data/vendor/local/share/gtk-doc/html/gdk-pixbuf/api-index-2-32.html +2 -2
  33. data/vendor/local/share/gtk-doc/html/gdk-pixbuf/api-index-2-36.html +2 -2
  34. data/vendor/local/share/gtk-doc/html/gdk-pixbuf/api-index-2-4.html +2 -2
  35. data/vendor/local/share/gtk-doc/html/gdk-pixbuf/api-index-2-6.html +2 -2
  36. data/vendor/local/share/gtk-doc/html/gdk-pixbuf/api-index-2-8.html +2 -2
  37. data/vendor/local/share/gtk-doc/html/gdk-pixbuf/api-index-deprecated.html +2 -2
  38. data/vendor/local/share/gtk-doc/html/gdk-pixbuf/api-index-full.html +2 -2
  39. data/vendor/local/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-Animations.html +3 -3
  40. data/vendor/local/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-File-Loading.html +5 -5
  41. data/vendor/local/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-File-saving.html +20 -20
  42. data/vendor/local/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-Image-Data-in-Memory.html +4 -4
  43. data/vendor/local/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-Inline-data.html +2 -2
  44. data/vendor/local/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-Module-Interface.html +2 -2
  45. data/vendor/local/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-Reference-Counting-and-Memory-Mangement.html +2 -2
  46. data/vendor/local/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-Scaling.html +62 -33
  47. data/vendor/local/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-The-GdkPixbuf-Structure.html +25 -25
  48. data/vendor/local/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-Utilities.html +4 -3
  49. data/vendor/local/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-Versioning.html +4 -4
  50. data/vendor/local/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-X-Drawables-to-Pixbufs.html +2 -2
  51. data/vendor/local/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-Xlib-Rendering.html +2 -2
  52. data/vendor/local/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-XlibRGB.html +3 -3
  53. data/vendor/local/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-csource.html +2 -2
  54. data/vendor/local/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf-Xlib-initialization.html +2 -2
  55. data/vendor/local/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf-from-drawables.html +2 -2
  56. data/vendor/local/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-gdk-pixbuf-rendering.html +2 -2
  57. data/vendor/local/share/gtk-doc/html/gdk-pixbuf/gdk-pixbuf-query-loaders.html +2 -2
  58. data/vendor/local/share/gtk-doc/html/gdk-pixbuf/index.html +4 -4
  59. data/vendor/local/share/gtk-doc/html/gdk-pixbuf/license.html +2 -2
  60. data/vendor/local/share/gtk-doc/html/gdk-pixbuf/rn01.html +3 -3
  61. data/vendor/local/share/gtk-doc/html/gdk-pixbuf/rn02.html +2 -2
  62. data/vendor/local/share/locale/ca/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  63. data/vendor/local/share/locale/cs/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  64. data/vendor/local/share/locale/de/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  65. data/vendor/local/share/locale/es/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  66. data/vendor/local/share/locale/eu/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  67. data/vendor/local/share/locale/fur/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  68. data/vendor/local/share/locale/hr/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  69. data/vendor/local/share/locale/hu/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  70. data/vendor/local/share/locale/it/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  71. data/vendor/local/share/locale/lt/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  72. data/vendor/local/share/locale/nb/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  73. data/vendor/local/share/locale/pl/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  74. data/vendor/local/share/locale/pt_BR/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  75. data/vendor/local/share/locale/sk/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  76. data/vendor/local/share/locale/sv/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  77. data/vendor/local/share/locale/zh_CN/LC_MESSAGES/gdk-pixbuf.mo +0 -0
  78. data/vendor/local/share/man/man1/gdk-pixbuf-csource.1 +1 -1
  79. data/vendor/local/share/man/man1/gdk-pixbuf-query-loaders.1 +1 -1
  80. data/vendor/local/share/thumbnailers/gdk-pixbuf-thumbnailer.thumbnailer +4 -0
  81. metadata +11 -5
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 117a7e3aa451e6dde5f6228900e2d9817f5d4d1c
4
- data.tar.gz: 9e615da26a40a850bf474dc28ccf17e7be85ec9b
3
+ metadata.gz: c12050bdc7f4d63774f4f1e38fe1ccbadf0cdfed
4
+ data.tar.gz: 734171b3922b283f12bcb0579e573ddca8ec0fff
5
5
  SHA512:
6
- metadata.gz: e355f09702f18ae512677e9f8615d9f90ba3ea4176b61da70d4260ec2d2ac0901ee7117d12f9ffea66392454a8e17a96b7134c0de67502bfaecc9d1c9329d368
7
- data.tar.gz: 36c0438a953769d3d14b1cc8367161b0f5a317ff0edcc485ab1b6f288c356db8397675301255eb461fb060b98da3389c64a1e5320990bec0e0db808a04ef9e3f
6
+ metadata.gz: daabde5b2a62b1418b0d917993b867ad87e41e6ede54371cc5fa6824ea1b1c6b9018c7923ed9964977bd8f12bcedd6496c9b804f2f3cd445698fe968f31146be
7
+ data.tar.gz: 228e1ee0f35e2987551fa2d39f0ecf1cea55da0c35c0a766243e09281cfb6c57b18173a0d111cde719cef1674aa988b11e9c26143f20819b47cf25bb17972e41
data/Rakefile CHANGED
@@ -36,7 +36,7 @@ package_task = GNOME2::Rake::PackageTask.new do |package|
36
36
  :name => "gdk-pixbuf",
37
37
  :download_site => :gnome,
38
38
  :label => "gdk-pixbuf",
39
- :version => "2.36.0",
39
+ :version => "2.36.4",
40
40
  :compression_method => "xz",
41
41
  :windows => {
42
42
  :configure_args => [
@@ -1,4 +1,4 @@
1
- # Copyright (C) 2016 Ruby-GNOME2 Project Team
1
+ # Copyright (C) 2016-2017 Ruby-GNOME2 Project Team
2
2
  #
3
3
  # This library is free software; you can redistribute it and/or
4
4
  # modify it under the terms of the GNU Lesser General Public
@@ -50,6 +50,8 @@ module GdkPixbuf
50
50
  end
51
51
  end
52
52
 
53
+ define_deprecated_method :save_to_buffer, :save
54
+
53
55
  define_deprecated_method_by_hash_args :composite,
54
56
  "dest_width, " +
55
57
  "dest_height, " +
@@ -1,4 +1,4 @@
1
- # Copyright (C) 2016 Ruby-GNOME2 Project Team
1
+ # Copyright (C) 2016-2017 Ruby-GNOME2 Project Team
2
2
  #
3
3
  # This library is free software; you can redistribute it and/or
4
4
  # modify it under the terms of the GNU Lesser General Public
@@ -189,16 +189,70 @@ module GdkPixbuf
189
189
  dest
190
190
  end
191
191
 
192
- # TODO: test
193
- # TODO: Improve API by Hash
194
- def save(filename, type, options={})
192
+ # @overload save(type, options={})
193
+ #
194
+ # Save as `type` format.
195
+ #
196
+ # @param type [String] The format to be saved. `"jpeg"`,
197
+ # `"png"`, `"ico"` and `"bmp"` are available by default.
198
+ #
199
+ # @param options [Hash<Symbol, String>] The options for
200
+ # saving. Key-value pairs except `:filename` key are passed to
201
+ # save logic. Available keys are depended on format. For
202
+ # example, `:quality => "100"` is available in `"jpeg"`
203
+ # format.
204
+ # @option options [String] :filename The filename to be outputted.
205
+ #
206
+ # @return [String, void] The saved data. If you specify
207
+ # `:filename` option, it returns nothing.
208
+ #
209
+ # @overload save(filename, type, options={})
210
+ #
211
+ # Save to `filename` as `type` format.
212
+ #
213
+ # @return [void]
214
+ #
215
+ # @deprecated since 3.1.1. Use `save(type, :filename =>
216
+ # filename)` instead.
217
+ def save(*args)
218
+ case args.size
219
+ when 1
220
+ filename = nil
221
+ type, = args
222
+ options = {}
223
+ when 2
224
+ if args.last.is_a?(Hash)
225
+ type, options = args
226
+ if options.key?(:filename)
227
+ options = options.dup
228
+ filename = options.delete(:filename)
229
+ else
230
+ filename = nil
231
+ end
232
+ else
233
+ filename, type = args
234
+ options = {}
235
+ end
236
+ when 3
237
+ filename, type, options = args
238
+ else
239
+ message = "wrong number of arguments (given #{args.size}, expected 1..3)"
240
+ raise ArgumentError, message
241
+ end
242
+
195
243
  keys = []
196
244
  values = []
197
245
  options.each do |key, value|
246
+ key = key.to_s if key.is_a?(Symbol)
198
247
  keys << key
199
248
  values << value
200
249
  end
201
- savev(filename, type, keys, values)
250
+ if filename
251
+ savev(filename, type, keys, values)
252
+ else
253
+ _, data = save_to_bufferv(type, keys, values)
254
+ data.pack("C*")
255
+ end
202
256
  end
203
257
 
204
258
  alias_method :scale_raw, :scale
@@ -14,6 +14,8 @@
14
14
  # License along with this library; if not, write to the Free Software
15
15
  # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
+ require "tempfile"
18
+
17
19
  require "test-unit"
18
20
 
19
21
  module GdkPixbufTestUtils
@@ -28,4 +30,13 @@ module GdkPixbufTestUtils
28
30
  def fixture_path(*components)
29
31
  File.join(File.dirname(__FILE__), "fixture", *components)
30
32
  end
33
+
34
+ def suppress_warning
35
+ verbose, $VERBOSE = $VERBOSE, nil
36
+ begin
37
+ yield
38
+ ensure
39
+ $VERBOSE = verbose
40
+ end
41
+ end
31
42
  end
data/test/test-pixbuf.rb CHANGED
@@ -1,4 +1,4 @@
1
- # Copyright (C) 2016 Ruby-GNOME2 Project Team
1
+ # Copyright (C) 2016-2017 Ruby-GNOME2 Project Team
2
2
  #
3
3
  # This library is free software; you can redistribute it and/or
4
4
  # modify it under the terms of the GNU Lesser General Public
@@ -38,6 +38,12 @@ class TestPixbuf < Test::Unit::TestCase
38
38
  end
39
39
 
40
40
  sub_test_case("legacy form") do
41
+ setup do |&block|
42
+ suppress_warning do
43
+ block.call
44
+ end
45
+ end
46
+
41
47
  test "basic" do
42
48
  colorspace = GdkPixbuf::Colorspace::RGB
43
49
  width = 100
@@ -158,19 +164,23 @@ class TestPixbuf < Test::Unit::TestCase
158
164
  end
159
165
 
160
166
  test "subpixbuf" do
161
- src_pixbuf = GdkPixbuf::Pixbuf.new(fixture_path("gnome-logo-icon.png"))
162
- pixbuf = GdkPixbuf::Pixbuf.new(:src_pixbuf => src_pixbuf,
163
- :src_x => 0,
164
- :src_y => 0,
165
- :width => 32,
166
- :height => 32)
167
+ filename = fixture_path("gnome-logo-icon.png")
168
+ src_pixbuf = GdkPixbuf::Pixbuf.new(:file => filename)
169
+ pixbuf = suppress_warning do
170
+ GdkPixbuf::Pixbuf.new(:src_pixbuf => src_pixbuf,
171
+ :src_x => 0,
172
+ :src_y => 0,
173
+ :width => 32,
174
+ :height => 32)
175
+ end
167
176
  assert_equal(GdkPixbuf::Colorspace::RGB, pixbuf.colorspace)
168
177
  assert_equal(32, pixbuf.width)
169
178
  assert_equal(32, pixbuf.height)
170
179
  end
171
180
 
172
181
  test "data" do
173
- src_pixbuf = GdkPixbuf::Pixbuf.new(fixture_path("gnome-logo-icon.png"))
182
+ filename = fixture_path("gnome-logo-icon.png")
183
+ src_pixbuf = GdkPixbuf::Pixbuf.new(:file => filename)
174
184
  data = src_pixbuf.pixels.pack("C*")
175
185
  pixbuf = GdkPixbuf::Pixbuf.new(:data => data,
176
186
  :colorspace => src_pixbuf.colorspace,
@@ -185,7 +195,8 @@ class TestPixbuf < Test::Unit::TestCase
185
195
 
186
196
  test "bytes" do
187
197
  only_version(2, 32)
188
- src_pixbuf = GdkPixbuf::Pixbuf.new(fixture_path("gnome-logo-icon.png"))
198
+ filename = fixture_path("gnome-logo-icon.png")
199
+ src_pixbuf = GdkPixbuf::Pixbuf.new(:file => filename)
189
200
  bytes = src_pixbuf.pixels.flatten.pack("C*")
190
201
  pixbuf = GdkPixbuf::Pixbuf.new(:bytes => bytes,
191
202
  :colorspace => src_pixbuf.colorspace,
@@ -199,7 +210,8 @@ class TestPixbuf < Test::Unit::TestCase
199
210
  end
200
211
 
201
212
  test "resource" do
202
- src_pixbuf = GdkPixbuf::Pixbuf.new(fixture_path("gnome-logo-icon.png"))
213
+ filename = fixture_path("gnome-logo-icon.png")
214
+ src_pixbuf = GdkPixbuf::Pixbuf.new(:file => filename)
203
215
  resource = Gio::Resource.load(fixture_path("image.gresource"))
204
216
  Gio::Resources.register(resource)
205
217
  begin
@@ -238,7 +250,8 @@ class TestPixbuf < Test::Unit::TestCase
238
250
  end
239
251
 
240
252
  def test_new_subpixbuf
241
- src_pixbuf = GdkPixbuf::Pixbuf.new(fixture_path("gnome-logo-icon.png"))
253
+ filename = fixture_path("gnome-logo-icon.png")
254
+ src_pixbuf = GdkPixbuf::Pixbuf.new(:file => filename)
242
255
  pixbuf = src_pixbuf.new_subpixbuf(0, 0, 32, 32)
243
256
  assert_equal(GdkPixbuf::Colorspace::RGB, pixbuf.colorspace)
244
257
  assert_equal(32, pixbuf.width)
@@ -247,7 +260,8 @@ class TestPixbuf < Test::Unit::TestCase
247
260
  end
248
261
 
249
262
  def test_dup
250
- pixbuf = GdkPixbuf::Pixbuf.new(fixture_path("gnome-logo-icon.png"))
263
+ filename = fixture_path("gnome-logo-icon.png")
264
+ pixbuf = GdkPixbuf::Pixbuf.new(:file => filename)
251
265
  assert_equal(pixbuf.pixels, pixbuf.dup.pixels)
252
266
  end
253
267
 
@@ -260,7 +274,8 @@ class TestPixbuf < Test::Unit::TestCase
260
274
  end
261
275
 
262
276
  def test_rotate
263
- pixbuf = GdkPixbuf::Pixbuf.new(fixture_path("gnome-logo-icon.png"))
277
+ filename = fixture_path("gnome-logo-icon.png")
278
+ pixbuf = GdkPixbuf::Pixbuf.new(:file => filename)
264
279
  inverted_pixbuf = pixbuf.rotate(:upsidedown)
265
280
  assert_not_equal(pixbuf.pixels, inverted_pixbuf.pixels)
266
281
  inverted_twice_pixbuf = inverted_pixbuf.rotate(:upsidedown)
@@ -316,7 +331,8 @@ class TestPixbuf < Test::Unit::TestCase
316
331
  end
317
332
 
318
333
  test "no modifications" do
319
- src_pixbuf = GdkPixbuf::Pixbuf.new(fixture_path("gnome-logo-icon.png"))
334
+ filename = fixture_path("gnome-logo-icon.png")
335
+ src_pixbuf = GdkPixbuf::Pixbuf.new(:file => filename)
320
336
  pixbuf = src_pixbuf.saturate_and_pixelate(1, false)
321
337
  assert_equal(src_pixbuf.pixels, pixbuf.pixels)
322
338
  end
@@ -325,7 +341,8 @@ class TestPixbuf < Test::Unit::TestCase
325
341
  if /\Ai\d86-/ === RUBY_PLATFORM
326
342
  omit("floating point calculation result is different on i386")
327
343
  end
328
- src_pixbuf = GdkPixbuf::Pixbuf.new(fixture_path("gnome-logo-icon.png"))
344
+ filename = fixture_path("gnome-logo-icon.png")
345
+ src_pixbuf = GdkPixbuf::Pixbuf.new(:file => filename)
329
346
  pixbuf = src_pixbuf.saturate_and_pixelate(0, true)
330
347
  ref = saturate_and_pixelate_pixels(src_pixbuf, 0, true)
331
348
  assert_equal(ref, pixbuf.pixels, ref.size)
@@ -334,4 +351,33 @@ class TestPixbuf < Test::Unit::TestCase
334
351
  assert_equal(ref, pixbuf.pixels)
335
352
  end
336
353
  end
354
+
355
+ sub_test_case("#save") do
356
+ test("no options") do
357
+ png_filename = fixture_path("gnome-logo-icon.png")
358
+ pixbuf = GdkPixbuf::Pixbuf.new(:file => png_filename)
359
+ jpeg = pixbuf.save("jpeg")
360
+ assert_equal(["image/jpeg", false],
361
+ Gio::ContentType.guess(nil, jpeg))
362
+ end
363
+
364
+ test(":filename") do
365
+ png_filename = fixture_path("gnome-logo-icon.png")
366
+ pixbuf = GdkPixbuf::Pixbuf.new(:file => png_filename)
367
+ output = Tempfile.new(["pixbuf", ".jpeg"])
368
+ pixbuf.save(output.path, "jpeg")
369
+ assert_equal(["image/jpeg", false],
370
+ Gio::ContentType.guess(nil, output.read))
371
+ end
372
+ end
373
+
374
+ test("#save_to_buffer") do
375
+ png_filename = fixture_path("gnome-logo-icon.png")
376
+ pixbuf = GdkPixbuf::Pixbuf.new(:file => png_filename)
377
+ jpeg = suppress_warning do
378
+ pixbuf.save_to_buffer("jpeg")
379
+ end
380
+ assert_equal(["image/jpeg", false],
381
+ Gio::ContentType.guess(nil, jpeg))
382
+ end
337
383
  end
@@ -63,10 +63,11 @@ typedef struct _GdkPixbufAnimationIter GdkPixbufAnimationIter;
63
63
  GDK_PIXBUF_AVAILABLE_IN_ALL
64
64
  GType gdk_pixbuf_animation_get_type (void) G_GNUC_CONST;
65
65
 
66
- #ifndef __GTK_DOC_IGNORE__
67
66
  #ifdef G_OS_WIN32
68
- #define gdk_pixbuf_animation_new_from_file gdk_pixbuf_animation_new_from_file_utf8
69
- #endif
67
+ /* API/ABI compat, see gdk-pixbuf-core.h for details */
68
+ GDK_PIXBUF_AVAILABLE_IN_ALL
69
+ GdkPixbufAnimation *gdk_pixbuf_animation_new_from_file_utf8 (const char *filename,
70
+ GError **error);
70
71
  #endif
71
72
 
72
73
  GDK_PIXBUF_AVAILABLE_IN_ALL
@@ -115,7 +115,7 @@ G_BEGIN_DECLS
115
115
  * In the future it will do full alpha compositing.
116
116
  *
117
117
  * These values can be passed to
118
- * gdk_pixbuf_render_to_drawable_alpha() to control how the alpha
118
+ * gdk_pixbuf_xlib_render_to_drawable_alpha() to control how the alpha
119
119
  * channel of an image should be handled. This function can create a
120
120
  * bilevel clipping mask (black and white) and use it while painting
121
121
  * the image. In the future, when the X Window System gets an alpha
@@ -284,13 +284,25 @@ GdkPixbuf *gdk_pixbuf_new_subpixbuf (GdkPixbuf *src_pixbuf,
284
284
 
285
285
  /* Simple loading */
286
286
 
287
- #ifndef __GTK_DOC_IGNORE__
288
287
  #ifdef G_OS_WIN32
289
- /* DLL ABI stability hack. */
290
- #define gdk_pixbuf_new_from_file gdk_pixbuf_new_from_file_utf8
291
- #define gdk_pixbuf_new_from_file_at_size gdk_pixbuf_new_from_file_at_size_utf8
292
- #define gdk_pixbuf_new_from_file_at_scale gdk_pixbuf_new_from_file_at_scale_utf8
293
- #endif
288
+ /* In previous versions these _utf8 variants where exported and linked to
289
+ * by default. Export them here for ABI (and gi API) compat.
290
+ */
291
+
292
+ GDK_PIXBUF_AVAILABLE_IN_ALL
293
+ GdkPixbuf *gdk_pixbuf_new_from_file_utf8 (const char *filename,
294
+ GError **error);
295
+ GDK_PIXBUF_AVAILABLE_IN_2_4
296
+ GdkPixbuf *gdk_pixbuf_new_from_file_at_size_utf8 (const char *filename,
297
+ int width,
298
+ int height,
299
+ GError **error);
300
+ GDK_PIXBUF_AVAILABLE_IN_2_6
301
+ GdkPixbuf *gdk_pixbuf_new_from_file_at_scale_utf8 (const char *filename,
302
+ int width,
303
+ int height,
304
+ gboolean preserve_aspect_ratio,
305
+ GError **error);
294
306
  #endif
295
307
 
296
308
  GDK_PIXBUF_AVAILABLE_IN_ALL
@@ -357,7 +369,6 @@ void gdk_pixbuf_fill (GdkPixbuf *pixbuf,
357
369
  #ifdef G_OS_WIN32
358
370
  /* DLL ABI stability hack. */
359
371
  #define gdk_pixbuf_save gdk_pixbuf_save_utf8
360
- #define gdk_pixbuf_savev gdk_pixbuf_savev_utf8
361
372
  #endif
362
373
  #endif
363
374
 
@@ -376,6 +387,16 @@ gboolean gdk_pixbuf_savev (GdkPixbuf *pixbuf,
376
387
  char **option_values,
377
388
  GError **error);
378
389
 
390
+ #ifdef G_OS_WIN32
391
+ GDK_PIXBUF_AVAILABLE_IN_ALL
392
+ gboolean gdk_pixbuf_savev_utf8 (GdkPixbuf *pixbuf,
393
+ const char *filename,
394
+ const char *type,
395
+ char **option_keys,
396
+ char **option_values,
397
+ GError **error);
398
+ #endif
399
+
379
400
  /* Saving to a callback function */
380
401
 
381
402
 
@@ -45,8 +45,8 @@ Library version numbers.
45
45
 
46
46
  #define GDK_PIXBUF_MAJOR (2)
47
47
  #define GDK_PIXBUF_MINOR (36)
48
- #define GDK_PIXBUF_MICRO (0)
49
- #define GDK_PIXBUF_VERSION "2.36.0"
48
+ #define GDK_PIXBUF_MICRO (4)
49
+ #define GDK_PIXBUF_VERSION "2.36.4"
50
50
 
51
51
  #ifndef _GDK_PIXBUF_EXTERN
52
52
  #define _GDK_PIXBUF_EXTERN extern
@@ -4,11 +4,13 @@
4
4
  #
5
5
  # LoaderDir = /usr/lib/x86_64-linux-gnu/gdk-pixbuf-2.0/2.10.0/loaders
6
6
  #
7
- "/usr/lib/x86_64-linux-gnu/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-xpm.so"
8
- "xpm" 4 "gdk-pixbuf" "XPM" "LGPL"
9
- "image/x-xpixmap" ""
10
- "xpm" ""
11
- "/* XPM */" "" 100
7
+ "/usr/lib/x86_64-linux-gnu/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-tiff.so"
8
+ "tiff" 5 "gdk-pixbuf" "TIFF" "LGPL"
9
+ "image/tiff" ""
10
+ "tiff" "tif" ""
11
+ "MM *" " z " 100
12
+ "II* " " z" 100
13
+ "II* \020 CR\002 " " z zzz z" 0
12
14
 
13
15
  "/usr/lib/x86_64-linux-gnu/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-qtif.so"
14
16
  "qtif" 4 "gdk-pixbuf" "QuickTime" "LGPL"
@@ -17,11 +19,11 @@
17
19
  "abcdidsc" "xxxx " 100
18
20
  "abcdidat" "xxxx " 100
19
21
 
20
- "/usr/lib/x86_64-linux-gnu/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-gif.so"
21
- "gif" 4 "gdk-pixbuf" "GIF" "LGPL"
22
- "image/gif" ""
23
- "gif" ""
24
- "GIF8" "" 100
22
+ "/usr/lib/x86_64-linux-gnu/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-jpeg.so"
23
+ "jpeg" 5 "gdk-pixbuf" "JPEG" "LGPL"
24
+ "image/jpeg" ""
25
+ "jpeg" "jpe" "jpg" ""
26
+ "\377\330" "" 100
25
27
 
26
28
  "/usr/lib/x86_64-linux-gnu/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-svg.so"
27
29
  "svg" 6 "gdk-pixbuf" "Scalable Vector Graphics" "LGPL"
@@ -30,19 +32,18 @@
30
32
  " <svg" "* " 100
31
33
  " <!DOCTYPE svg" "* " 100
32
34
 
33
- "/usr/lib/x86_64-linux-gnu/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-bmp.so"
34
- "bmp" 5 "gdk-pixbuf" "BMP" "LGPL"
35
- "image/bmp" "image/x-bmp" "image/x-MS-bmp" ""
36
- "bmp" ""
37
- "BM" "" 100
35
+ "/usr/lib/x86_64-linux-gnu/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-png.so"
36
+ "png" 5 "gdk-pixbuf" "PNG" "LGPL"
37
+ "image/png" ""
38
+ "png" ""
39
+ "\211PNG\r\n\032\n" "" 100
38
40
 
39
- "/usr/lib/x86_64-linux-gnu/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-tiff.so"
40
- "tiff" 5 "gdk-pixbuf" "TIFF" "LGPL"
41
- "image/tiff" ""
42
- "tiff" "tif" ""
43
- "MM *" " z " 100
44
- "II* " " z" 100
45
- "II* \020 CR\002 " " z zzz z" 0
41
+ "/usr/lib/x86_64-linux-gnu/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-ico.so"
42
+ "ico" 5 "gdk-pixbuf" "Windows icon" "LGPL"
43
+ "image/x-icon" "image/x-ico" "image/x-win-bitmap" ""
44
+ "ico" "cur" ""
45
+ " \001 " "zz znz" 100
46
+ " \002 " "zz znz" 100
46
47
 
47
48
  "/usr/lib/x86_64-linux-gnu/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-xbm.so"
48
49
  "xbm" 4 "gdk-pixbuf" "XBM" "LGPL"
@@ -51,18 +52,29 @@
51
52
  "#define " "" 100
52
53
  "/*" "" 50
53
54
 
54
- "/usr/lib/x86_64-linux-gnu/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-ico.so"
55
- "ico" 5 "gdk-pixbuf" "Windows icon" "LGPL"
56
- "image/x-icon" "image/x-ico" "image/x-win-bitmap" ""
57
- "ico" "cur" ""
58
- " \001 " "zz znz" 100
59
- " \002 " "zz znz" 100
55
+ "/usr/lib/x86_64-linux-gnu/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-bmp.so"
56
+ "bmp" 5 "gdk-pixbuf" "BMP" "LGPL"
57
+ "image/bmp" "image/x-bmp" "image/x-MS-bmp" ""
58
+ "bmp" ""
59
+ "BM" "" 100
60
60
 
61
- "/usr/lib/x86_64-linux-gnu/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-png.so"
62
- "png" 5 "gdk-pixbuf" "PNG" "LGPL"
63
- "image/png" ""
64
- "png" ""
65
- "\211PNG\r\n\032\n" "" 100
61
+ "/usr/lib/x86_64-linux-gnu/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-gif.so"
62
+ "gif" 4 "gdk-pixbuf" "GIF" "LGPL"
63
+ "image/gif" ""
64
+ "gif" ""
65
+ "GIF8" "" 100
66
+
67
+ "/usr/lib/x86_64-linux-gnu/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-ani.so"
68
+ "ani" 4 "gdk-pixbuf" "Windows animated cursor" "LGPL"
69
+ "application/x-navi-animation" ""
70
+ "ani" ""
71
+ "RIFF ACON" " xxxx " 100
72
+
73
+ "/usr/lib/x86_64-linux-gnu/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-xpm.so"
74
+ "xpm" 4 "gdk-pixbuf" "XPM" "LGPL"
75
+ "image/x-xpixmap" ""
76
+ "xpm" ""
77
+ "/* XPM */" "" 100
66
78
 
67
79
  "/usr/lib/x86_64-linux-gnu/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-tga.so"
68
80
  "tga" 4 "gdk-pixbuf" "Targa" "LGPL"
@@ -75,12 +87,6 @@
75
87
  " \n" "xz " 100
76
88
  " \v" "xz " 100
77
89
 
78
- "/usr/lib/x86_64-linux-gnu/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-ani.so"
79
- "ani" 4 "gdk-pixbuf" "Windows animated cursor" "LGPL"
80
- "application/x-navi-animation" ""
81
- "ani" ""
82
- "RIFF ACON" " xxxx " 100
83
-
84
90
  "/usr/lib/x86_64-linux-gnu/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-pnm.so"
85
91
  "pnm" 4 "gdk-pixbuf" "PNM/PBM/PGM/PPM" "LGPL"
86
92
  "image/x-portable-anymap" "image/x-portable-bitmap" "image/x-portable-graymap" "image/x-portable-pixmap" ""
@@ -98,10 +104,4 @@
98
104
  "icns" ""
99
105
  "icns" "" 100
100
106
 
101
- "/usr/lib/x86_64-linux-gnu/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-jpeg.so"
102
- "jpeg" 5 "gdk-pixbuf" "JPEG" "LGPL"
103
- "image/jpeg" ""
104
- "jpeg" "jpe" "jpg" ""
105
- "\377\330" "" 100
106
-
107
107