@img/sharp-libvips-dev 1.0.4 → 1.1.0-rc1

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.
Files changed (114) hide show
  1. package/cplusplus/VImage.cpp +2 -2
  2. package/cplusplus/vips-operators.cpp +79 -3
  3. package/include/aom/aom.h +1 -1
  4. package/include/aom/aom_codec.h +4 -4
  5. package/include/aom/aom_decoder.h +1 -1
  6. package/include/aom/aom_encoder.h +3 -1
  7. package/include/aom/aom_external_partition.h +1 -1
  8. package/include/aom/aom_frame_buffer.h +1 -1
  9. package/include/aom/aom_image.h +1 -1
  10. package/include/aom/aom_integer.h +1 -9
  11. package/include/aom/aomcx.h +47 -4
  12. package/include/aom/aomdx.h +1 -1
  13. package/include/archive.h +2 -2
  14. package/include/archive_entry.h +7 -1
  15. package/include/cairo/cairo-version.h +1 -1
  16. package/include/expat.h +1 -1
  17. package/include/expat_config.h +3 -6
  18. package/include/freetype2/freetype/config/ftconfig.h +1 -1
  19. package/include/freetype2/freetype/config/ftheader.h +1 -1
  20. package/include/freetype2/freetype/config/ftoption.h +17 -1
  21. package/include/freetype2/freetype/config/ftstdlib.h +1 -1
  22. package/include/freetype2/freetype/config/integer-types.h +1 -1
  23. package/include/freetype2/freetype/config/mac-support.h +1 -1
  24. package/include/freetype2/freetype/config/public-macros.h +1 -1
  25. package/include/freetype2/freetype/freetype.h +35 -83
  26. package/include/freetype2/freetype/ftadvanc.h +1 -1
  27. package/include/freetype2/freetype/ftbbox.h +1 -1
  28. package/include/freetype2/freetype/ftbdf.h +1 -1
  29. package/include/freetype2/freetype/ftbitmap.h +1 -1
  30. package/include/freetype2/freetype/ftbzip2.h +1 -1
  31. package/include/freetype2/freetype/ftcache.h +1 -1
  32. package/include/freetype2/freetype/ftcid.h +1 -1
  33. package/include/freetype2/freetype/ftcolor.h +1 -1
  34. package/include/freetype2/freetype/ftdriver.h +75 -1
  35. package/include/freetype2/freetype/fterrdef.h +1 -1
  36. package/include/freetype2/freetype/fterrors.h +1 -1
  37. package/include/freetype2/freetype/ftfntfmt.h +1 -1
  38. package/include/freetype2/freetype/ftgasp.h +1 -1
  39. package/include/freetype2/freetype/ftglyph.h +1 -1
  40. package/include/freetype2/freetype/ftgxval.h +1 -1
  41. package/include/freetype2/freetype/ftgzip.h +1 -1
  42. package/include/freetype2/freetype/ftimage.h +17 -12
  43. package/include/freetype2/freetype/ftincrem.h +1 -1
  44. package/include/freetype2/freetype/ftlcdfil.h +1 -1
  45. package/include/freetype2/freetype/ftlist.h +1 -1
  46. package/include/freetype2/freetype/ftlzw.h +1 -1
  47. package/include/freetype2/freetype/ftmac.h +1 -1
  48. package/include/freetype2/freetype/ftmm.h +31 -2
  49. package/include/freetype2/freetype/ftmodapi.h +1 -1
  50. package/include/freetype2/freetype/ftmoderr.h +1 -1
  51. package/include/freetype2/freetype/ftotval.h +1 -1
  52. package/include/freetype2/freetype/ftoutln.h +2 -2
  53. package/include/freetype2/freetype/ftparams.h +1 -1
  54. package/include/freetype2/freetype/ftpfr.h +1 -1
  55. package/include/freetype2/freetype/ftrender.h +1 -1
  56. package/include/freetype2/freetype/ftsizes.h +1 -1
  57. package/include/freetype2/freetype/ftsnames.h +1 -1
  58. package/include/freetype2/freetype/ftstroke.h +1 -1
  59. package/include/freetype2/freetype/ftsynth.h +1 -1
  60. package/include/freetype2/freetype/ftsystem.h +1 -1
  61. package/include/freetype2/freetype/fttrigon.h +1 -1
  62. package/include/freetype2/freetype/fttypes.h +1 -1
  63. package/include/freetype2/freetype/ftwinfnt.h +1 -1
  64. package/include/freetype2/freetype/otsvg.h +1 -1
  65. package/include/freetype2/freetype/t1tables.h +1 -59
  66. package/include/freetype2/freetype/ttnameid.h +1 -1
  67. package/include/freetype2/freetype/tttables.h +4 -3
  68. package/include/freetype2/freetype/tttags.h +1 -1
  69. package/include/freetype2/ft2build.h +1 -1
  70. package/include/fribidi/fribidi-config.h +2 -2
  71. package/include/fribidi/fribidi-unicode-version.h +3 -3
  72. package/include/gio-unix-2.0/gio/gunixmounts.h +11 -2
  73. package/include/glib-2.0/gio/gioenums.h +2 -2
  74. package/include/glib-2.0/glib/gmain.h +52 -47
  75. package/include/glib-2.0/glib/gstring.h +4 -0
  76. package/include/glib-2.0/gobject/gobjectnotifyqueue.c +2 -2
  77. package/include/harfbuzz/hb-buffer.h +7 -0
  78. package/include/harfbuzz/hb-common.h +18 -0
  79. package/include/harfbuzz/hb-face.h +28 -0
  80. package/include/harfbuzz/hb-version.h +3 -3
  81. package/include/libpng16/png.h +13 -13
  82. package/include/libpng16/pngconf.h +4 -4
  83. package/include/libpng16/pnglibconf.h +1 -1
  84. package/include/librsvg-2.0/librsvg/rsvg-version.h +3 -3
  85. package/include/librsvg-2.0/librsvg/rsvg.h +2 -0
  86. package/include/libxml2/libxml/xmlexports.h +2 -2
  87. package/include/libxml2/libxml/xmlversion.h +4 -4
  88. package/include/png.h +13 -13
  89. package/include/pngconf.h +4 -4
  90. package/include/pnglibconf.h +1 -1
  91. package/include/tiffio.h +11 -11
  92. package/include/tiffvers.h +4 -4
  93. package/include/vips/VImage8.h +166 -60
  94. package/include/vips/arithmetic.h +9 -0
  95. package/include/vips/basic.h +8 -4
  96. package/include/vips/buf.h +0 -2
  97. package/include/vips/connection.h +0 -2
  98. package/include/vips/conversion.h +0 -3
  99. package/include/vips/create.h +11 -0
  100. package/include/vips/enumtypes.h +3 -3
  101. package/include/vips/foreign.h +4 -18
  102. package/include/vips/header.h +7 -0
  103. package/include/vips/image.h +7 -2
  104. package/include/vips/interpolate.h +2 -3
  105. package/include/vips/memory.h +19 -1
  106. package/include/vips/operation.h +2 -7
  107. package/include/vips/private.h +7 -0
  108. package/include/vips/util.h +6 -15
  109. package/include/vips/version.h +8 -8
  110. package/include/vips/vips.h +2 -0
  111. package/include/vips/vips8 +19 -12
  112. package/include/zlib.h +3 -3
  113. package/package.json +1 -1
  114. package/versions.json +14 -14
@@ -1,7 +1,7 @@
1
1
 
2
2
  /* png.h - header file for PNG reference library
3
3
  *
4
- * libpng version 1.6.43
4
+ * libpng version 1.6.44
5
5
  *
6
6
  * Copyright (c) 2018-2024 Cosmin Truta
7
7
  * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
@@ -15,7 +15,7 @@
15
15
  * libpng versions 0.89, June 1996, through 0.96, May 1997: Andreas Dilger
16
16
  * libpng versions 0.97, January 1998, through 1.6.35, July 2018:
17
17
  * Glenn Randers-Pehrson
18
- * libpng versions 1.6.36, December 2018, through 1.6.43, February 2024:
18
+ * libpng versions 1.6.36, December 2018, through 1.6.44, September 2024:
19
19
  * Cosmin Truta
20
20
  * See also "Contributing Authors", below.
21
21
  */
@@ -239,7 +239,7 @@
239
239
  * ...
240
240
  * 1.5.30 15 10530 15.so.15.30[.0]
241
241
  * ...
242
- * 1.6.43 16 10643 16.so.16.43[.0]
242
+ * 1.6.44 16 10644 16.so.16.44[.0]
243
243
  *
244
244
  * Henceforth the source version will match the shared-library major and
245
245
  * minor numbers; the shared-library major version number will be used for
@@ -275,7 +275,7 @@
275
275
  */
276
276
 
277
277
  /* Version information for png.h - this should match the version in png.c */
278
- #define PNG_LIBPNG_VER_STRING "1.6.43"
278
+ #define PNG_LIBPNG_VER_STRING "1.6.44"
279
279
  #define PNG_HEADER_VERSION_STRING " libpng version " PNG_LIBPNG_VER_STRING "\n"
280
280
 
281
281
  /* The versions of shared library builds should stay in sync, going forward */
@@ -286,18 +286,18 @@
286
286
  /* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */
287
287
  #define PNG_LIBPNG_VER_MAJOR 1
288
288
  #define PNG_LIBPNG_VER_MINOR 6
289
- #define PNG_LIBPNG_VER_RELEASE 43
289
+ #define PNG_LIBPNG_VER_RELEASE 44
290
290
 
291
291
  /* This should be zero for a public release, or non-zero for a
292
292
  * development version.
293
293
  */
294
- #define PNG_LIBPNG_VER_BUILD 0
294
+ #define PNG_LIBPNG_VER_BUILD 0
295
295
 
296
296
  /* Release Status */
297
- #define PNG_LIBPNG_BUILD_ALPHA 1
298
- #define PNG_LIBPNG_BUILD_BETA 2
299
- #define PNG_LIBPNG_BUILD_RC 3
300
- #define PNG_LIBPNG_BUILD_STABLE 4
297
+ #define PNG_LIBPNG_BUILD_ALPHA 1
298
+ #define PNG_LIBPNG_BUILD_BETA 2
299
+ #define PNG_LIBPNG_BUILD_RC 3
300
+ #define PNG_LIBPNG_BUILD_STABLE 4
301
301
  #define PNG_LIBPNG_BUILD_RELEASE_STATUS_MASK 7
302
302
 
303
303
  /* Release-Specific Flags */
@@ -317,7 +317,7 @@
317
317
  * From version 1.0.1 it is:
318
318
  * XXYYZZ, where XX=major, YY=minor, ZZ=release
319
319
  */
320
- #define PNG_LIBPNG_VER 10643 /* 1.6.43 */
320
+ #define PNG_LIBPNG_VER 10644 /* 1.6.44 */
321
321
 
322
322
  /* Library configuration: these options cannot be changed after
323
323
  * the library has been built.
@@ -427,7 +427,7 @@ extern "C" {
427
427
  /* This triggers a compiler error in png.c, if png.c and png.h
428
428
  * do not agree upon the version number.
429
429
  */
430
- typedef char* png_libpng_version_1_6_43;
430
+ typedef char* png_libpng_version_1_6_44;
431
431
 
432
432
  /* Basic control structions. Read libpng-manual.txt or libpng.3 for more info.
433
433
  *
@@ -824,7 +824,7 @@ typedef PNG_CALLBACK(int, *png_user_chunk_ptr, (png_structp,
824
824
  * your compiler. This may be very difficult - try using a different compiler
825
825
  * to build the library!
826
826
  */
827
- PNG_FUNCTION(void, (PNGCAPI *png_longjmp_ptr), PNGARG((jmp_buf, int)), typedef);
827
+ PNG_FUNCTION(void, (PNGCAPI *png_longjmp_ptr), (jmp_buf, int), typedef);
828
828
  #endif
829
829
 
830
830
  /* Transform masks for the high-level interface */
@@ -1,7 +1,7 @@
1
1
 
2
2
  /* pngconf.h - machine-configurable file for libpng
3
3
  *
4
- * libpng version 1.6.43
4
+ * libpng version 1.6.44
5
5
  *
6
6
  * Copyright (c) 2018-2024 Cosmin Truta
7
7
  * Copyright (c) 1998-2002,2004,2006-2016,2018 Glenn Randers-Pehrson
@@ -88,7 +88,7 @@
88
88
 
89
89
  /* The PNGARG macro was used in versions of libpng prior to 1.6.0 to protect
90
90
  * against legacy (pre ISOC90) compilers that did not understand function
91
- * prototypes. It is not required for modern C compilers.
91
+ * prototypes. [Deprecated.]
92
92
  */
93
93
  #ifndef PNGARG
94
94
  # define PNGARG(arglist) arglist
@@ -298,7 +298,7 @@
298
298
 
299
299
  #ifndef PNG_EXPORTA
300
300
  # define PNG_EXPORTA(ordinal, type, name, args, attributes) \
301
- PNG_FUNCTION(PNG_EXPORT_TYPE(type), (PNGAPI name), PNGARG(args), \
301
+ PNG_FUNCTION(PNG_EXPORT_TYPE(type), (PNGAPI name), args, \
302
302
  PNG_LINKAGE_API attributes)
303
303
  #endif
304
304
 
@@ -316,7 +316,7 @@
316
316
  #endif
317
317
 
318
318
  #ifndef PNG_CALLBACK
319
- # define PNG_CALLBACK(type, name, args) type (PNGCBAPI name) PNGARG(args)
319
+ # define PNG_CALLBACK(type, name, args) type (PNGCBAPI name) args
320
320
  #endif
321
321
 
322
322
  /* Support for compiler specific function attributes. These are used
@@ -1,6 +1,6 @@
1
1
  /* pnglibconf.h - library build configuration */
2
2
 
3
- /* libpng version 1.6.43 */
3
+ /* libpng version 1.6.44 */
4
4
 
5
5
  /* Copyright (c) 2018-2024 Cosmin Truta */
6
6
  /* Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson */
@@ -6,8 +6,8 @@
6
6
  #define RSVG_VERSION_H
7
7
 
8
8
  #define LIBRSVG_MAJOR_VERSION (2)
9
- #define LIBRSVG_MINOR_VERSION (58)
10
- #define LIBRSVG_MICRO_VERSION (93)
11
- #define LIBRSVG_VERSION "2.58.93"
9
+ #define LIBRSVG_MINOR_VERSION (59)
10
+ #define LIBRSVG_MICRO_VERSION (1)
11
+ #define LIBRSVG_VERSION "2.59.1"
12
12
 
13
13
  #endif
@@ -1172,6 +1172,8 @@ gboolean rsvg_handle_set_stylesheet (RsvgHandle *handle,
1172
1172
  * rsvg_handle_render_document() (or any of the other rendering
1173
1173
  * functions) will return an error with domain `G_IO_ERROR`, and code
1174
1174
  * `G_IO_ERROR_CANCELLED`.
1175
+ *
1176
+ * Since: 2.59.0
1175
1177
  */
1176
1178
  RSVG_API
1177
1179
  void rsvg_handle_set_cancellable_for_rendering (RsvgHandle *handle,
@@ -67,7 +67,7 @@
67
67
  #define XML_DEPRECATED
68
68
  #elif __GNUC__ * 100 + __GNUC_MINOR__ >= 301
69
69
  #define XML_DEPRECATED __attribute__((deprecated))
70
- #elif _MSC_VER >= 1400
70
+ #elif defined(_MSC_VER) && _MSC_VER >= 1400
71
71
  /* Available since Visual Studio 2005 */
72
72
  #define XML_DEPRECATED __declspec(deprecated)
73
73
  #else
@@ -100,7 +100,7 @@
100
100
  #define XML_POP_WARNINGS \
101
101
  _Pragma("GCC diagnostic pop")
102
102
 
103
- #elif _MSC_VER >= 1400
103
+ #elif defined(_MSC_VER) && _MSC_VER >= 1400
104
104
 
105
105
  #define XML_IGNORE_FPTR_CAST_WARNINGS __pragma(warning(push))
106
106
  #define XML_POP_WARNINGS __pragma(warning(pop))
@@ -15,21 +15,21 @@
15
15
  *
16
16
  * the version string like "1.2.3"
17
17
  */
18
- #define LIBXML_DOTTED_VERSION "2.13.3"
18
+ #define LIBXML_DOTTED_VERSION "2.13.4"
19
19
 
20
20
  /**
21
21
  * LIBXML_VERSION:
22
22
  *
23
23
  * the version number: 1.2.3 value is 10203
24
24
  */
25
- #define LIBXML_VERSION 21303
25
+ #define LIBXML_VERSION 21304
26
26
 
27
27
  /**
28
28
  * LIBXML_VERSION_STRING:
29
29
  *
30
30
  * the version number string, 1.2.3 value is "10203"
31
31
  */
32
- #define LIBXML_VERSION_STRING "21303"
32
+ #define LIBXML_VERSION_STRING "21304"
33
33
 
34
34
  /**
35
35
  * LIBXML_VERSION_EXTRA:
@@ -44,7 +44,7 @@
44
44
  * Macro to check that the libxml version in use is compatible with
45
45
  * the version the software has been compiled against
46
46
  */
47
- #define LIBXML_TEST_VERSION xmlCheckVersion(21303);
47
+ #define LIBXML_TEST_VERSION xmlCheckVersion(21304);
48
48
 
49
49
  /**
50
50
  * LIBXML_THREAD_ENABLED:
package/include/png.h CHANGED
@@ -1,7 +1,7 @@
1
1
 
2
2
  /* png.h - header file for PNG reference library
3
3
  *
4
- * libpng version 1.6.43
4
+ * libpng version 1.6.44
5
5
  *
6
6
  * Copyright (c) 2018-2024 Cosmin Truta
7
7
  * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
@@ -15,7 +15,7 @@
15
15
  * libpng versions 0.89, June 1996, through 0.96, May 1997: Andreas Dilger
16
16
  * libpng versions 0.97, January 1998, through 1.6.35, July 2018:
17
17
  * Glenn Randers-Pehrson
18
- * libpng versions 1.6.36, December 2018, through 1.6.43, February 2024:
18
+ * libpng versions 1.6.36, December 2018, through 1.6.44, September 2024:
19
19
  * Cosmin Truta
20
20
  * See also "Contributing Authors", below.
21
21
  */
@@ -239,7 +239,7 @@
239
239
  * ...
240
240
  * 1.5.30 15 10530 15.so.15.30[.0]
241
241
  * ...
242
- * 1.6.43 16 10643 16.so.16.43[.0]
242
+ * 1.6.44 16 10644 16.so.16.44[.0]
243
243
  *
244
244
  * Henceforth the source version will match the shared-library major and
245
245
  * minor numbers; the shared-library major version number will be used for
@@ -275,7 +275,7 @@
275
275
  */
276
276
 
277
277
  /* Version information for png.h - this should match the version in png.c */
278
- #define PNG_LIBPNG_VER_STRING "1.6.43"
278
+ #define PNG_LIBPNG_VER_STRING "1.6.44"
279
279
  #define PNG_HEADER_VERSION_STRING " libpng version " PNG_LIBPNG_VER_STRING "\n"
280
280
 
281
281
  /* The versions of shared library builds should stay in sync, going forward */
@@ -286,18 +286,18 @@
286
286
  /* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */
287
287
  #define PNG_LIBPNG_VER_MAJOR 1
288
288
  #define PNG_LIBPNG_VER_MINOR 6
289
- #define PNG_LIBPNG_VER_RELEASE 43
289
+ #define PNG_LIBPNG_VER_RELEASE 44
290
290
 
291
291
  /* This should be zero for a public release, or non-zero for a
292
292
  * development version.
293
293
  */
294
- #define PNG_LIBPNG_VER_BUILD 0
294
+ #define PNG_LIBPNG_VER_BUILD 0
295
295
 
296
296
  /* Release Status */
297
- #define PNG_LIBPNG_BUILD_ALPHA 1
298
- #define PNG_LIBPNG_BUILD_BETA 2
299
- #define PNG_LIBPNG_BUILD_RC 3
300
- #define PNG_LIBPNG_BUILD_STABLE 4
297
+ #define PNG_LIBPNG_BUILD_ALPHA 1
298
+ #define PNG_LIBPNG_BUILD_BETA 2
299
+ #define PNG_LIBPNG_BUILD_RC 3
300
+ #define PNG_LIBPNG_BUILD_STABLE 4
301
301
  #define PNG_LIBPNG_BUILD_RELEASE_STATUS_MASK 7
302
302
 
303
303
  /* Release-Specific Flags */
@@ -317,7 +317,7 @@
317
317
  * From version 1.0.1 it is:
318
318
  * XXYYZZ, where XX=major, YY=minor, ZZ=release
319
319
  */
320
- #define PNG_LIBPNG_VER 10643 /* 1.6.43 */
320
+ #define PNG_LIBPNG_VER 10644 /* 1.6.44 */
321
321
 
322
322
  /* Library configuration: these options cannot be changed after
323
323
  * the library has been built.
@@ -427,7 +427,7 @@ extern "C" {
427
427
  /* This triggers a compiler error in png.c, if png.c and png.h
428
428
  * do not agree upon the version number.
429
429
  */
430
- typedef char* png_libpng_version_1_6_43;
430
+ typedef char* png_libpng_version_1_6_44;
431
431
 
432
432
  /* Basic control structions. Read libpng-manual.txt or libpng.3 for more info.
433
433
  *
@@ -824,7 +824,7 @@ typedef PNG_CALLBACK(int, *png_user_chunk_ptr, (png_structp,
824
824
  * your compiler. This may be very difficult - try using a different compiler
825
825
  * to build the library!
826
826
  */
827
- PNG_FUNCTION(void, (PNGCAPI *png_longjmp_ptr), PNGARG((jmp_buf, int)), typedef);
827
+ PNG_FUNCTION(void, (PNGCAPI *png_longjmp_ptr), (jmp_buf, int), typedef);
828
828
  #endif
829
829
 
830
830
  /* Transform masks for the high-level interface */
package/include/pngconf.h CHANGED
@@ -1,7 +1,7 @@
1
1
 
2
2
  /* pngconf.h - machine-configurable file for libpng
3
3
  *
4
- * libpng version 1.6.43
4
+ * libpng version 1.6.44
5
5
  *
6
6
  * Copyright (c) 2018-2024 Cosmin Truta
7
7
  * Copyright (c) 1998-2002,2004,2006-2016,2018 Glenn Randers-Pehrson
@@ -88,7 +88,7 @@
88
88
 
89
89
  /* The PNGARG macro was used in versions of libpng prior to 1.6.0 to protect
90
90
  * against legacy (pre ISOC90) compilers that did not understand function
91
- * prototypes. It is not required for modern C compilers.
91
+ * prototypes. [Deprecated.]
92
92
  */
93
93
  #ifndef PNGARG
94
94
  # define PNGARG(arglist) arglist
@@ -298,7 +298,7 @@
298
298
 
299
299
  #ifndef PNG_EXPORTA
300
300
  # define PNG_EXPORTA(ordinal, type, name, args, attributes) \
301
- PNG_FUNCTION(PNG_EXPORT_TYPE(type), (PNGAPI name), PNGARG(args), \
301
+ PNG_FUNCTION(PNG_EXPORT_TYPE(type), (PNGAPI name), args, \
302
302
  PNG_LINKAGE_API attributes)
303
303
  #endif
304
304
 
@@ -316,7 +316,7 @@
316
316
  #endif
317
317
 
318
318
  #ifndef PNG_CALLBACK
319
- # define PNG_CALLBACK(type, name, args) type (PNGCBAPI name) PNGARG(args)
319
+ # define PNG_CALLBACK(type, name, args) type (PNGCBAPI name) args
320
320
  #endif
321
321
 
322
322
  /* Support for compiler specific function attributes. These are used
@@ -1,6 +1,6 @@
1
1
  /* pnglibconf.h - library build configuration */
2
2
 
3
- /* libpng version 1.6.43 */
3
+ /* libpng version 1.6.44 */
4
4
 
5
5
  /* Copyright (c) 2018-2024 Cosmin Truta */
6
6
  /* Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson */
package/include/tiffio.h CHANGED
@@ -77,10 +77,6 @@ typedef tstrile_t ttile_t; /* tile number */
77
77
  typedef tmsize_t tsize_t; /* i/o size in bytes */
78
78
  typedef void *tdata_t; /* image data ref */
79
79
 
80
- #if !defined(__WIN32__) && (defined(_WIN32) || defined(WIN32))
81
- #define __WIN32__
82
- #endif
83
-
84
80
  /*
85
81
  * On windows you should define USE_WIN32_FILEIO if you are using tif_win32.c
86
82
  * or AVOID_WIN32_FILEIO if you are using something else (like tif_unix.c).
@@ -88,7 +84,7 @@ typedef void *tdata_t; /* image data ref */
88
84
  * By default tif_unix.c is assumed.
89
85
  */
90
86
 
91
- #if defined(_WINDOWS) || defined(__WIN32__) || defined(_Windows)
87
+ #if defined(_WIN32)
92
88
  #if !defined(__CYGWIN) && !defined(AVOID_WIN32_FILEIO) && \
93
89
  !defined(USE_WIN32_FILEIO)
94
90
  #define AVOID_WIN32_FILEIO
@@ -98,11 +94,11 @@ typedef void *tdata_t; /* image data ref */
98
94
  #if defined(USE_WIN32_FILEIO)
99
95
  #define VC_EXTRALEAN
100
96
  #include <windows.h>
101
- #ifdef __WIN32__
97
+ #ifdef _WIN32
102
98
  DECLARE_HANDLE(thandle_t); /* Win32 file handle */
103
99
  #else
104
100
  typedef HFILE thandle_t; /* client data handle */
105
- #endif /* __WIN32__ */
101
+ #endif /* _WIN32 */
106
102
  #else
107
103
  typedef void *thandle_t; /* client data handle */
108
104
  #endif /* USE_WIN32_FILEIO */
@@ -311,14 +307,15 @@ extern "C"
311
307
  /*
312
308
  * Auxiliary functions.
313
309
  */
314
-
310
+ #ifndef TIFF_DO_NOT_USE_NON_EXT_ALLOC_FUNCTIONS
315
311
  extern void *_TIFFmalloc(tmsize_t s);
316
312
  extern void *_TIFFcalloc(tmsize_t nmemb, tmsize_t siz);
317
313
  extern void *_TIFFrealloc(void *p, tmsize_t s);
314
+ extern void _TIFFfree(void *p);
315
+ #endif
318
316
  extern void _TIFFmemset(void *p, int v, tmsize_t c);
319
317
  extern void _TIFFmemcpy(void *d, const void *s, tmsize_t c);
320
318
  extern int _TIFFmemcmp(const void *p1, const void *p2, tmsize_t c);
321
- extern void _TIFFfree(void *p);
322
319
 
323
320
  /*
324
321
  ** Stuff, related to tag handling and creating custom tags.
@@ -508,6 +505,9 @@ extern int TIFFReadRGBAImageOriented(TIFF *, uint32_t, uint32_t, uint32_t *,
508
505
  TIFFOpenOptionsSetMaxSingleMemAlloc(TIFFOpenOptions *opts,
509
506
  tmsize_t max_single_mem_alloc);
510
507
  extern void
508
+ TIFFOpenOptionsSetMaxCumulatedMemAlloc(TIFFOpenOptions *opts,
509
+ tmsize_t max_cumulated_mem_alloc);
510
+ extern void
511
511
  TIFFOpenOptionsSetErrorHandlerExtR(TIFFOpenOptions *opts,
512
512
  TIFFErrorHandlerExtR handler,
513
513
  void *errorhandler_user_data);
@@ -518,11 +518,11 @@ extern int TIFFReadRGBAImageOriented(TIFF *, uint32_t, uint32_t, uint32_t *,
518
518
 
519
519
  extern TIFF *TIFFOpen(const char *, const char *);
520
520
  extern TIFF *TIFFOpenExt(const char *, const char *, TIFFOpenOptions *opts);
521
- #ifdef __WIN32__
521
+ #ifdef _WIN32
522
522
  extern TIFF *TIFFOpenW(const wchar_t *, const char *);
523
523
  extern TIFF *TIFFOpenWExt(const wchar_t *, const char *,
524
524
  TIFFOpenOptions *opts);
525
- #endif /* __WIN32__ */
525
+ #endif /* _WIN32 */
526
526
  extern TIFF *TIFFFdOpen(int, const char *, const char *);
527
527
  extern TIFF *TIFFFdOpenExt(int, const char *, const char *,
528
528
  TIFFOpenOptions *opts);
@@ -8,7 +8,7 @@
8
8
  * Furthermore, configure_file variables of type "@VAR@" are
9
9
  * modified by clang-format and won't be substituted by CMake.
10
10
  */
11
- #define TIFFLIB_VERSION_STR "LIBTIFF, Version 4.6.0\nCopyright (c) 1988-1996 Sam Leffler\nCopyright (c) 1991-1996 Silicon Graphics, Inc."
11
+ #define TIFFLIB_VERSION_STR "LIBTIFF, Version 4.7.0\nCopyright (c) 1988-1996 Sam Leffler\nCopyright (c) 1991-1996 Silicon Graphics, Inc."
12
12
  /*
13
13
  * This define can be used in code that requires
14
14
  * compilation-related definitions specific to a
@@ -16,13 +16,13 @@
16
16
  * version checking should be done based on the
17
17
  * string returned by TIFFGetVersion.
18
18
  */
19
- #define TIFFLIB_VERSION 20230908
19
+ #define TIFFLIB_VERSION 20240911
20
20
 
21
21
  /* The following defines have been added in 4.5.0 */
22
22
  #define TIFFLIB_MAJOR_VERSION 4
23
- #define TIFFLIB_MINOR_VERSION 6
23
+ #define TIFFLIB_MINOR_VERSION 7
24
24
  #define TIFFLIB_MICRO_VERSION 0
25
- #define TIFFLIB_VERSION_STR_MAJ_MIN_MIC "4.6.0"
25
+ #define TIFFLIB_VERSION_STR_MAJ_MIN_MIC "4.7.0"
26
26
 
27
27
  /* Macro added in 4.5.0. Returns TRUE if the current libtiff version is
28
28
  * greater or equal to major.minor.micro