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
@@ -25,7 +25,7 @@ weak_library_names=''
25
25
  # Version information for libgdk_pixbuf-2.0.
26
26
  current=3600
27
27
  age=3600
28
- revision=0
28
+ revision=4
29
29
 
30
30
  # Is this an already installed library?
31
31
  installed=yes
@@ -10,7 +10,7 @@ gdk_pixbuf_cache_file=${gdk_pixbuf_binarydir}/loaders.cache
10
10
 
11
11
  Name: GdkPixbuf
12
12
  Description: Image loading and scaling
13
- Version: 2.36.0
13
+ Version: 2.36.4
14
14
  Requires: gobject-2.0
15
15
  Requires.private: gmodule-no-export-2.0 libpng16
16
16
  Libs: -L${libdir} -lgdk_pixbuf-2.0
@@ -97,7 +97,7 @@ the gdk-pixbuf library. Currently only RGB is supported.</doc>
97
97
  "0.8.2" for example.</doc>
98
98
  <type name="gint" c:type="gint"/>
99
99
  </constant>
100
- <constant name="PIXBUF_MICRO" value="0" c:type="GDK_PIXBUF_MICRO">
100
+ <constant name="PIXBUF_MICRO" value="4" c:type="GDK_PIXBUF_MICRO">
101
101
  <doc xml:space="preserve">Micro version of gdk-pixbuf library, that is the "2" in
102
102
  "0.8.2" for example.</doc>
103
103
  <type name="gint" c:type="gint"/>
@@ -107,7 +107,7 @@ the gdk-pixbuf library. Currently only RGB is supported.</doc>
107
107
  "0.8.2" for example.</doc>
108
108
  <type name="gint" c:type="gint"/>
109
109
  </constant>
110
- <constant name="PIXBUF_VERSION" value="2.36.0" c:type="GDK_PIXBUF_VERSION">
110
+ <constant name="PIXBUF_VERSION" value="2.36.4" c:type="GDK_PIXBUF_VERSION">
111
111
  <doc xml:space="preserve">Contains the full version of the gdk-pixbuf header as a string.
112
112
  This is the version being compiled against; contrast with
113
113
  #gdk_pixbuf_version.</doc>
@@ -271,41 +271,160 @@ drops to zero, or %NULL if the data should not be freed</doc>
271
271
  </parameter>
272
272
  </parameters>
273
273
  </constructor>
274
+ <constructor name="new_from_file"
275
+ c:identifier="gdk_pixbuf_new_from_file"
276
+ throws="1">
277
+ <doc xml:space="preserve">Creates a new pixbuf by loading an image from a file. The file format is
278
+ detected automatically. If %NULL is returned, then @error will be set.
279
+ Possible errors are in the #GDK_PIXBUF_ERROR and #G_FILE_ERROR domains.</doc>
280
+ <return-value transfer-ownership="full">
281
+ <doc xml:space="preserve">A newly-created pixbuf with a reference count of 1, or %NULL if
282
+ any of several error conditions occurred: the file could not be opened,
283
+ there was no loader for the file's format, there was not enough memory to
284
+ allocate the image buffer, or the image file contained invalid data.</doc>
285
+ <type name="Pixbuf" c:type="GdkPixbuf*"/>
286
+ </return-value>
287
+ <parameters>
288
+ <parameter name="filename" transfer-ownership="none">
289
+ <doc xml:space="preserve">Name of file to load, in the GLib file name encoding</doc>
290
+ <type name="utf8" c:type="const char*"/>
291
+ </parameter>
292
+ </parameters>
293
+ </constructor>
294
+ <constructor name="new_from_file_at_scale"
295
+ c:identifier="gdk_pixbuf_new_from_file_at_scale"
296
+ version="2.6"
297
+ throws="1">
298
+ <doc xml:space="preserve">Creates a new pixbuf by loading an image from a file. The file format is
299
+ detected automatically. If %NULL is returned, then @error will be set.
300
+ Possible errors are in the #GDK_PIXBUF_ERROR and #G_FILE_ERROR domains.
301
+ The image will be scaled to fit in the requested size, optionally preserving
302
+ the image's aspect ratio.
303
+
304
+ When preserving the aspect ratio, a @width of -1 will cause the image
305
+ to be scaled to the exact given height, and a @height of -1 will cause
306
+ the image to be scaled to the exact given width. When not preserving
307
+ aspect ratio, a @width or @height of -1 means to not scale the image
308
+ at all in that dimension. Negative values for @width and @height are
309
+ allowed since 2.8.</doc>
310
+ <return-value transfer-ownership="full">
311
+ <doc xml:space="preserve">A newly-created pixbuf with a reference count of 1, or %NULL
312
+ if any of several error conditions occurred: the file could not be opened,
313
+ there was no loader for the file's format, there was not enough memory to
314
+ allocate the image buffer, or the image file contained invalid data.</doc>
315
+ <type name="Pixbuf" c:type="GdkPixbuf*"/>
316
+ </return-value>
317
+ <parameters>
318
+ <parameter name="filename" transfer-ownership="none">
319
+ <doc xml:space="preserve">Name of file to load, in the GLib file name encoding</doc>
320
+ <type name="utf8" c:type="const char*"/>
321
+ </parameter>
322
+ <parameter name="width" transfer-ownership="none">
323
+ <doc xml:space="preserve">The width the image should have or -1 to not constrain the width</doc>
324
+ <type name="gint" c:type="int"/>
325
+ </parameter>
326
+ <parameter name="height" transfer-ownership="none">
327
+ <doc xml:space="preserve">The height the image should have or -1 to not constrain the height</doc>
328
+ <type name="gint" c:type="int"/>
329
+ </parameter>
330
+ <parameter name="preserve_aspect_ratio" transfer-ownership="none">
331
+ <doc xml:space="preserve">%TRUE to preserve the image's aspect ratio</doc>
332
+ <type name="gboolean" c:type="gboolean"/>
333
+ </parameter>
334
+ </parameters>
335
+ </constructor>
274
336
  <constructor name="new_from_file_at_scale_utf8"
275
337
  c:identifier="gdk_pixbuf_new_from_file_at_scale_utf8"
338
+ version="2.6"
276
339
  throws="1">
340
+ <doc xml:space="preserve">Same as gdk_pixbuf_new_from_file_at_scale().</doc>
277
341
  <return-value transfer-ownership="full">
342
+ <doc xml:space="preserve">A newly-created pixbuf with a reference count of 1, or %NULL
343
+ if any of several error conditions occurred: the file could not be opened,
344
+ there was no loader for the file's format, there was not enough memory to
345
+ allocate the image buffer, or the image file contained invalid data.</doc>
278
346
  <type name="Pixbuf" c:type="GdkPixbuf*"/>
279
347
  </return-value>
280
348
  <parameters>
281
349
  <parameter name="filename" transfer-ownership="none">
350
+ <doc xml:space="preserve">Name of file to load, in the GLib file name encoding</doc>
282
351
  <type name="utf8" c:type="const char*"/>
283
352
  </parameter>
284
353
  <parameter name="width" transfer-ownership="none">
354
+ <doc xml:space="preserve">The width the image should have or -1 to not constrain the width</doc>
285
355
  <type name="gint" c:type="int"/>
286
356
  </parameter>
287
357
  <parameter name="height" transfer-ownership="none">
358
+ <doc xml:space="preserve">The height the image should have or -1 to not constrain the height</doc>
288
359
  <type name="gint" c:type="int"/>
289
360
  </parameter>
290
361
  <parameter name="preserve_aspect_ratio" transfer-ownership="none">
362
+ <doc xml:space="preserve">%TRUE to preserve the image's aspect ratio</doc>
291
363
  <type name="gboolean" c:type="gboolean"/>
292
364
  </parameter>
293
365
  </parameters>
294
366
  </constructor>
367
+ <constructor name="new_from_file_at_size"
368
+ c:identifier="gdk_pixbuf_new_from_file_at_size"
369
+ version="2.4"
370
+ throws="1">
371
+ <doc xml:space="preserve">Creates a new pixbuf by loading an image from a file.
372
+ The file format is detected automatically. If %NULL is returned, then
373
+ @error will be set. Possible errors are in the #GDK_PIXBUF_ERROR and
374
+ #G_FILE_ERROR domains.
375
+
376
+ The image will be scaled to fit in the requested size, preserving
377
+ the image's aspect ratio. Note that the returned pixbuf may be smaller
378
+ than @width x @height, if the aspect ratio requires it. To load
379
+ and image at the requested size, regardless of aspect ratio, use
380
+ gdk_pixbuf_new_from_file_at_scale().</doc>
381
+ <return-value transfer-ownership="full">
382
+ <doc xml:space="preserve">A newly-created pixbuf with a reference count of 1, or
383
+ %NULL if any of several error conditions occurred: the file could not
384
+ be opened, there was no loader for the file's format, there was not
385
+ enough memory to allocate the image buffer, or the image file contained
386
+ invalid data.</doc>
387
+ <type name="Pixbuf" c:type="GdkPixbuf*"/>
388
+ </return-value>
389
+ <parameters>
390
+ <parameter name="filename" transfer-ownership="none">
391
+ <doc xml:space="preserve">Name of file to load, in the GLib file name encoding</doc>
392
+ <type name="utf8" c:type="const char*"/>
393
+ </parameter>
394
+ <parameter name="width" transfer-ownership="none">
395
+ <doc xml:space="preserve">The width the image should have or -1 to not constrain the width</doc>
396
+ <type name="gint" c:type="int"/>
397
+ </parameter>
398
+ <parameter name="height" transfer-ownership="none">
399
+ <doc xml:space="preserve">The height the image should have or -1 to not constrain the height</doc>
400
+ <type name="gint" c:type="int"/>
401
+ </parameter>
402
+ </parameters>
403
+ </constructor>
295
404
  <constructor name="new_from_file_at_size_utf8"
296
405
  c:identifier="gdk_pixbuf_new_from_file_at_size_utf8"
406
+ version="2.4"
297
407
  throws="1">
408
+ <doc xml:space="preserve">Same as gdk_pixbuf_new_from_file_at_size()</doc>
298
409
  <return-value transfer-ownership="full">
410
+ <doc xml:space="preserve">A newly-created pixbuf with a reference count of 1, or
411
+ %NULL if any of several error conditions occurred: the file could not
412
+ be opened, there was no loader for the file's format, there was not
413
+ enough memory to allocate the image buffer, or the image file contained
414
+ invalid data.</doc>
299
415
  <type name="Pixbuf" c:type="GdkPixbuf*"/>
300
416
  </return-value>
301
417
  <parameters>
302
418
  <parameter name="filename" transfer-ownership="none">
419
+ <doc xml:space="preserve">Name of file to load, in the GLib file name encoding</doc>
303
420
  <type name="utf8" c:type="const char*"/>
304
421
  </parameter>
305
422
  <parameter name="width" transfer-ownership="none">
423
+ <doc xml:space="preserve">The width the image should have or -1 to not constrain the width</doc>
306
424
  <type name="gint" c:type="int"/>
307
425
  </parameter>
308
426
  <parameter name="height" transfer-ownership="none">
427
+ <doc xml:space="preserve">The height the image should have or -1 to not constrain the height</doc>
309
428
  <type name="gint" c:type="int"/>
310
429
  </parameter>
311
430
  </parameters>
@@ -313,11 +432,17 @@ drops to zero, or %NULL if the data should not be freed</doc>
313
432
  <constructor name="new_from_file_utf8"
314
433
  c:identifier="gdk_pixbuf_new_from_file_utf8"
315
434
  throws="1">
435
+ <doc xml:space="preserve">Same as gdk_pixbuf_new_from_file()</doc>
316
436
  <return-value transfer-ownership="full">
437
+ <doc xml:space="preserve">A newly-created pixbuf with a reference count of 1, or %NULL if
438
+ any of several error conditions occurred: the file could not be opened,
439
+ there was no loader for the file's format, there was not enough memory to
440
+ allocate the image buffer, or the image file contained invalid data.</doc>
317
441
  <type name="Pixbuf" c:type="GdkPixbuf*"/>
318
442
  </return-value>
319
443
  <parameters>
320
444
  <parameter name="filename" transfer-ownership="none">
445
+ <doc xml:space="preserve">Name of file to load, in the GLib file name encoding</doc>
321
446
  <type name="utf8" c:type="const char*"/>
322
447
  </parameter>
323
448
  </parameters>
@@ -671,7 +796,7 @@ get the result of the operation.</doc>
671
796
  allow-none="1"
672
797
  scope="async"
673
798
  closure="3">
674
- <doc xml:space="preserve">a #GAsyncReadyCallback to call when the the pixbuf is loaded</doc>
799
+ <doc xml:space="preserve">a #GAsyncReadyCallback to call when the file info is available</doc>
675
800
  <type name="Gio.AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
676
801
  </parameter>
677
802
  <parameter name="user_data"
@@ -763,7 +888,7 @@ You can then call gdk_pixbuf_new_from_stream_finish() to get the result of the o
763
888
  allow-none="1"
764
889
  scope="async"
765
890
  closure="3">
766
- <doc xml:space="preserve">a #GAsyncReadyCallback to call when the the pixbuf is loaded</doc>
891
+ <doc xml:space="preserve">a #GAsyncReadyCallback to call when the pixbuf is loaded</doc>
767
892
  <type name="Gio.AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
768
893
  </parameter>
769
894
  <parameter name="user_data"
@@ -818,7 +943,7 @@ You can then call gdk_pixbuf_new_from_stream_finish() to get the result of the o
818
943
  allow-none="1"
819
944
  scope="async"
820
945
  closure="6">
821
- <doc xml:space="preserve">a #GAsyncReadyCallback to call when the the pixbuf is loaded</doc>
946
+ <doc xml:space="preserve">a #GAsyncReadyCallback to call when the pixbuf is loaded</doc>
822
947
  <type name="Gio.AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
823
948
  </parameter>
824
949
  <parameter name="user_data"
@@ -896,7 +1021,8 @@ libtiff). If an orientation option/tag is present, the
896
1021
  appropriate transform will be performed so that the pixbuf
897
1022
  is oriented correctly.</doc>
898
1023
  <return-value transfer-ownership="full">
899
- <doc xml:space="preserve">A newly-created pixbuf, or a reference to the
1024
+ <doc xml:space="preserve">A newly-created pixbuf, %NULL if
1025
+ not enough memory could be allocated for it, or a reference to the
900
1026
  input pixbuf (with an increased reference count).</doc>
901
1027
  <type name="Pixbuf" c:type="GdkPixbuf*"/>
902
1028
  </return-value>
@@ -912,7 +1038,7 @@ input pixbuf (with an increased reference count).</doc>
912
1038
  @scale_x and @scale_y then translating by @offset_x and @offset_y.
913
1039
  This gives an image in the coordinates of the destination pixbuf.
914
1040
  The rectangle (@dest_x, @dest_y, @dest_width, @dest_height)
915
- is then composited onto the corresponding rectangle of the
1041
+ is then alpha blended onto the corresponding rectangle of the
916
1042
  original destination image.
917
1043
 
918
1044
  When the destination rectangle contains parts not in the source
@@ -977,11 +1103,14 @@ to infinity.
977
1103
  <method name="composite_color" c:identifier="gdk_pixbuf_composite_color">
978
1104
  <doc xml:space="preserve">Creates a transformation of the source image @src by scaling by
979
1105
  @scale_x and @scale_y then translating by @offset_x and @offset_y,
980
- then composites the rectangle (@dest_x ,@dest_y, @dest_width,
1106
+ then alpha blends the rectangle (@dest_x ,@dest_y, @dest_width,
981
1107
  @dest_height) of the resulting image with a checkboard of the
982
1108
  colors @color1 and @color2 and renders it onto the destination
983
1109
  image.
984
1110
 
1111
+ If the source image has no alpha channel, and @overall_alpha is 255, a fast
1112
+ path is used which omits the alpha blending and just performs the scaling.
1113
+
985
1114
  See gdk_pixbuf_composite_color_simple() for a simpler variant of this
986
1115
  function suitable for many tasks.</doc>
987
1116
  <return-value transfer-ownership="none">
@@ -1061,7 +1190,7 @@ function suitable for many tasks.</doc>
1061
1190
  <method name="composite_color_simple"
1062
1191
  c:identifier="gdk_pixbuf_composite_color_simple">
1063
1192
  <doc xml:space="preserve">Creates a new #GdkPixbuf by scaling @src to @dest_width x
1064
- @dest_height and compositing the result with a checkboard of colors
1193
+ @dest_height and alpha blending the result with a checkboard of colors
1065
1194
  @color1 and @color2.</doc>
1066
1195
  <return-value transfer-ownership="full">
1067
1196
  <doc xml:space="preserve">the new #GdkPixbuf, or %NULL if not enough memory could be
@@ -1547,7 +1676,9 @@ pixbuf.</doc>
1547
1676
  c:identifier="gdk_pixbuf_rotate_simple"
1548
1677
  version="2.6">
1549
1678
  <doc xml:space="preserve">Rotates a pixbuf by a multiple of 90 degrees, and returns the
1550
- result in a new pixbuf.</doc>
1679
+ result in a new pixbuf.
1680
+
1681
+ If @angle is 0, a copy of @src is returned, avoiding any rotation.</doc>
1551
1682
  <return-value transfer-ownership="full" nullable="1">
1552
1683
  <doc xml:space="preserve">the new #GdkPixbuf, or %NULL
1553
1684
  if not enough memory could be allocated for it.</doc>
@@ -1898,7 +2029,7 @@ You can then call gdk_pixbuf_save_to_stream_finish() to get the result of the op
1898
2029
  allow-none="1"
1899
2030
  scope="async"
1900
2031
  closure="4">
1901
- <doc xml:space="preserve">a #GAsyncReadyCallback to call when the the pixbuf is loaded</doc>
2032
+ <doc xml:space="preserve">a #GAsyncReadyCallback to call when the pixbuf is saved</doc>
1902
2033
  <type name="Gio.AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
1903
2034
  </parameter>
1904
2035
  <parameter name="user_data"
@@ -2012,7 +2143,7 @@ You can then call gdk_pixbuf_save_to_stream_finish() to get the result of the op
2012
2143
  allow-none="1"
2013
2144
  scope="async"
2014
2145
  closure="6">
2015
- <doc xml:space="preserve">a #GAsyncReadyCallback to call when the the pixbuf is loaded</doc>
2146
+ <doc xml:space="preserve">a #GAsyncReadyCallback to call when the pixbuf is saved</doc>
2016
2147
  <type name="Gio.AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
2017
2148
  </parameter>
2018
2149
  <parameter name="user_data"
@@ -2048,27 +2179,73 @@ You can then call gdk_pixbuf_save_to_stream_finish() to get the result of the op
2048
2179
  </parameter>
2049
2180
  </parameters>
2050
2181
  </method>
2182
+ <method name="savev" c:identifier="gdk_pixbuf_savev" throws="1">
2183
+ <doc xml:space="preserve">Saves pixbuf to a file in @type, which is currently "jpeg", "png", "tiff", "ico" or "bmp".
2184
+ If @error is set, %FALSE will be returned.
2185
+ See gdk_pixbuf_save () for more details.</doc>
2186
+ <return-value transfer-ownership="none">
2187
+ <doc xml:space="preserve">whether an error was set</doc>
2188
+ <type name="gboolean" c:type="gboolean"/>
2189
+ </return-value>
2190
+ <parameters>
2191
+ <instance-parameter name="pixbuf" transfer-ownership="none">
2192
+ <doc xml:space="preserve">a #GdkPixbuf.</doc>
2193
+ <type name="Pixbuf" c:type="GdkPixbuf*"/>
2194
+ </instance-parameter>
2195
+ <parameter name="filename" transfer-ownership="none">
2196
+ <doc xml:space="preserve">name of file to save.</doc>
2197
+ <type name="utf8" c:type="const char*"/>
2198
+ </parameter>
2199
+ <parameter name="type" transfer-ownership="none">
2200
+ <doc xml:space="preserve">name of file format.</doc>
2201
+ <type name="utf8" c:type="const char*"/>
2202
+ </parameter>
2203
+ <parameter name="option_keys" transfer-ownership="none">
2204
+ <doc xml:space="preserve">name of options to set, %NULL-terminated</doc>
2205
+ <array c:type="char**">
2206
+ <type name="utf8" c:type="char*"/>
2207
+ </array>
2208
+ </parameter>
2209
+ <parameter name="option_values" transfer-ownership="none">
2210
+ <doc xml:space="preserve">values for named options</doc>
2211
+ <array c:type="char**">
2212
+ <type name="utf8" c:type="char*"/>
2213
+ </array>
2214
+ </parameter>
2215
+ </parameters>
2216
+ </method>
2051
2217
  <method name="savev_utf8"
2052
2218
  c:identifier="gdk_pixbuf_savev_utf8"
2053
2219
  throws="1">
2220
+ <doc xml:space="preserve">Same as gdk_pixbuf_savev()</doc>
2054
2221
  <return-value transfer-ownership="none">
2222
+ <doc xml:space="preserve">whether an error was set</doc>
2055
2223
  <type name="gboolean" c:type="gboolean"/>
2056
2224
  </return-value>
2057
2225
  <parameters>
2058
2226
  <instance-parameter name="pixbuf" transfer-ownership="none">
2227
+ <doc xml:space="preserve">a #GdkPixbuf.</doc>
2059
2228
  <type name="Pixbuf" c:type="GdkPixbuf*"/>
2060
2229
  </instance-parameter>
2061
2230
  <parameter name="filename" transfer-ownership="none">
2231
+ <doc xml:space="preserve">name of file to save.</doc>
2062
2232
  <type name="utf8" c:type="const char*"/>
2063
2233
  </parameter>
2064
2234
  <parameter name="type" transfer-ownership="none">
2235
+ <doc xml:space="preserve">name of file format.</doc>
2065
2236
  <type name="utf8" c:type="const char*"/>
2066
2237
  </parameter>
2067
2238
  <parameter name="option_keys" transfer-ownership="none">
2068
- <type name="utf8" c:type="char**"/>
2239
+ <doc xml:space="preserve">name of options to set, %NULL-terminated</doc>
2240
+ <array c:type="char**">
2241
+ <type name="utf8" c:type="char*"/>
2242
+ </array>
2069
2243
  </parameter>
2070
2244
  <parameter name="option_values" transfer-ownership="none">
2071
- <type name="utf8" c:type="char**"/>
2245
+ <doc xml:space="preserve">values for named options</doc>
2246
+ <array c:type="char**">
2247
+ <type name="utf8" c:type="char*"/>
2248
+ </array>
2072
2249
  </parameter>
2073
2250
  </parameters>
2074
2251
  </method>
@@ -2147,7 +2324,10 @@ reasonable quality and speed.
2147
2324
  You can scale a sub-portion of @src by creating a sub-pixbuf
2148
2325
  pointing into @src; see gdk_pixbuf_new_subpixbuf().
2149
2326
 
2150
- For more complicated scaling/compositing see gdk_pixbuf_scale()
2327
+ If @dest_width and @dest_height are equal to the @src width and height, a
2328
+ copy of @src is returned, avoiding any scaling.
2329
+
2330
+ For more complicated scaling/alpha blending see gdk_pixbuf_scale()
2151
2331
  and gdk_pixbuf_composite().</doc>
2152
2332
  <return-value transfer-ownership="full">
2153
2333
  <doc xml:space="preserve">the new #GdkPixbuf, or %NULL if not enough memory could be
@@ -2282,7 +2462,7 @@ be at least as large as the width of the pixbuf.</doc>
2282
2462
  glib:get-type="gdk_pixbuf_alpha_mode_get_type"
2283
2463
  c:type="GdkPixbufAlphaMode">
2284
2464
  <doc xml:space="preserve">These values can be passed to
2285
- gdk_pixbuf_render_to_drawable_alpha() to control how the alpha
2465
+ gdk_pixbuf_xlib_render_to_drawable_alpha() to control how the alpha
2286
2466
  channel of an image should be handled. This function can create a
2287
2467
  bilevel clipping mask (black and white) and use it while painting
2288
2468
  the image. In the future, when the X Window System gets an alpha
@@ -2313,14 +2493,41 @@ back to a bilevel clipping mask.</doc>
2313
2493
  glib:type-name="GdkPixbufAnimation"
2314
2494
  glib:get-type="gdk_pixbuf_animation_get_type">
2315
2495
  <doc xml:space="preserve">An opaque struct representing an animation.</doc>
2496
+ <constructor name="new_from_file"
2497
+ c:identifier="gdk_pixbuf_animation_new_from_file"
2498
+ throws="1">
2499
+ <doc xml:space="preserve">Creates a new animation by loading it from a file. The file format is
2500
+ detected automatically. If the file's format does not support multi-frame
2501
+ images, then an animation with a single frame will be created. Possible errors
2502
+ are in the #GDK_PIXBUF_ERROR and #G_FILE_ERROR domains.</doc>
2503
+ <return-value transfer-ownership="full">
2504
+ <doc xml:space="preserve">A newly-created animation with a reference count of 1, or %NULL
2505
+ if any of several error conditions ocurred: the file could not be opened,
2506
+ there was no loader for the file's format, there was not enough memory to
2507
+ allocate the image buffer, or the image file contained invalid data.</doc>
2508
+ <type name="PixbufAnimation" c:type="GdkPixbufAnimation*"/>
2509
+ </return-value>
2510
+ <parameters>
2511
+ <parameter name="filename" transfer-ownership="none">
2512
+ <doc xml:space="preserve">Name of file to load, in the GLib file name encoding</doc>
2513
+ <type name="utf8" c:type="const char*"/>
2514
+ </parameter>
2515
+ </parameters>
2516
+ </constructor>
2316
2517
  <constructor name="new_from_file_utf8"
2317
2518
  c:identifier="gdk_pixbuf_animation_new_from_file_utf8"
2318
2519
  throws="1">
2520
+ <doc xml:space="preserve">Same as gdk_pixbuf_animation_new_from_file()</doc>
2319
2521
  <return-value transfer-ownership="full">
2522
+ <doc xml:space="preserve">A newly-created animation with a reference count of 1, or %NULL
2523
+ if any of several error conditions ocurred: the file could not be opened,
2524
+ there was no loader for the file's format, there was not enough memory to
2525
+ allocate the image buffer, or the image file contained invalid data.</doc>
2320
2526
  <type name="PixbufAnimation" c:type="GdkPixbufAnimation*"/>
2321
2527
  </return-value>
2322
2528
  <parameters>
2323
2529
  <parameter name="filename" transfer-ownership="none">
2530
+ <doc xml:space="preserve">Name of file to load, in the GLib file name encoding</doc>
2324
2531
  <type name="utf8" c:type="const char*"/>
2325
2532
  </parameter>
2326
2533
  </parameters>
@@ -2431,7 +2638,7 @@ result of the operation.</doc>
2431
2638
  allow-none="1"
2432
2639
  scope="async"
2433
2640
  closure="3">
2434
- <doc xml:space="preserve">a #GAsyncReadyCallback to call when the the pixbuf is loaded</doc>
2641
+ <doc xml:space="preserve">a #GAsyncReadyCallback to call when the pixbuf is loaded</doc>
2435
2642
  <type name="Gio.AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
2436
2643
  </parameter>
2437
2644
  <parameter name="user_data"