@img/sharp-libvips-dev 1.0.0 → 1.0.2

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 (230) hide show
  1. package/include/aom/aom_encoder.h +3 -3
  2. package/include/aom/aomcx.h +17 -8
  3. package/include/expat.h +21 -10
  4. package/include/expat_config.h +11 -5
  5. package/include/ffi.h +12 -25
  6. package/include/fontconfig/fontconfig.h +5 -3
  7. package/include/freetype2/freetype/config/ftoption.h +1 -1
  8. package/include/gio-unix-2.0/gio/gfiledescriptorbased.h +3 -7
  9. package/include/gio-unix-2.0/gio/gunixinputstream.h +0 -5
  10. package/include/gio-unix-2.0/gio/gunixoutputstream.h +0 -5
  11. package/include/glib-2.0/gio/gappinfo.h +0 -7
  12. package/include/glib-2.0/gio/gapplication.h +6 -0
  13. package/include/glib-2.0/gio/gapplicationcommandline.h +12 -1
  14. package/include/glib-2.0/gio/gasyncinitable.h +0 -7
  15. package/include/glib-2.0/gio/gasyncresult.h +0 -6
  16. package/include/glib-2.0/gio/gbufferedinputstream.h +0 -5
  17. package/include/glib-2.0/gio/gbufferedoutputstream.h +0 -5
  18. package/include/glib-2.0/gio/gbytesicon.h +0 -5
  19. package/include/glib-2.0/gio/gcancellable.h +0 -5
  20. package/include/glib-2.0/gio/gconverter.h +0 -7
  21. package/include/glib-2.0/gio/gconverterinputstream.h +0 -6
  22. package/include/glib-2.0/gio/gconverteroutputstream.h +0 -6
  23. package/include/glib-2.0/gio/gdatagrambased.h +0 -7
  24. package/include/glib-2.0/gio/gdatainputstream.h +0 -6
  25. package/include/glib-2.0/gio/gdataoutputstream.h +0 -6
  26. package/include/glib-2.0/gio/gdbusinterface.h +0 -8
  27. package/include/glib-2.0/gio/gdbusinterfaceskeleton.h +0 -8
  28. package/include/glib-2.0/gio/gdbusmessage.h +2 -1
  29. package/include/glib-2.0/gio/gdbusobjectmanagerclient.h +0 -8
  30. package/include/glib-2.0/gio/gdbusobjectmanagerserver.h +0 -8
  31. package/include/glib-2.0/gio/gdbusobjectproxy.h +0 -8
  32. package/include/glib-2.0/gio/gdbusobjectskeleton.h +0 -8
  33. package/include/glib-2.0/gio/gdbusproxy.h +0 -8
  34. package/include/glib-2.0/gio/gdebugcontroller.h +0 -8
  35. package/include/glib-2.0/gio/gdebugcontrollerdbus.h +0 -7
  36. package/include/glib-2.0/gio/gdtlsserverconnection.h +0 -8
  37. package/include/glib-2.0/gio/gemblem.h +0 -5
  38. package/include/glib-2.0/gio/gemblemedicon.h +0 -5
  39. package/include/glib-2.0/gio/gfile.h +0 -10
  40. package/include/glib-2.0/gio/gfileenumerator.h +0 -5
  41. package/include/glib-2.0/gio/gfileicon.h +0 -5
  42. package/include/glib-2.0/gio/gfileinfo.h +0 -5
  43. package/include/glib-2.0/gio/gfileinputstream.h +0 -8
  44. package/include/glib-2.0/gio/gfileiostream.h +0 -8
  45. package/include/glib-2.0/gio/gfilemonitor.h +0 -5
  46. package/include/glib-2.0/gio/gfilenamecompleter.h +0 -5
  47. package/include/glib-2.0/gio/gfileoutputstream.h +0 -8
  48. package/include/glib-2.0/gio/gfilterinputstream.h +0 -5
  49. package/include/glib-2.0/gio/gfilteroutputstream.h +0 -5
  50. package/include/glib-2.0/gio/gicon.h +0 -5
  51. package/include/glib-2.0/gio/ginitable.h +0 -7
  52. package/include/glib-2.0/gio/ginputstream.h +0 -5
  53. package/include/glib-2.0/gio/gio-autocleanups.h +4 -0
  54. package/include/glib-2.0/gio/gio-visibility.h +34 -0
  55. package/include/glib-2.0/gio/gioenums.h +6 -1
  56. package/include/glib-2.0/gio/giomodule.h +0 -5
  57. package/include/glib-2.0/gio/giostream.h +0 -5
  58. package/include/glib-2.0/gio/giotypes.h +5 -108
  59. package/include/glib-2.0/gio/gloadableicon.h +0 -6
  60. package/include/glib-2.0/gio/gmemoryinputstream.h +0 -5
  61. package/include/glib-2.0/gio/gmemoryoutputstream.h +0 -5
  62. package/include/glib-2.0/gio/gmountoperation.h +0 -6
  63. package/include/glib-2.0/gio/gnetworking.h +4 -0
  64. package/include/glib-2.0/gio/goutputstream.h +0 -9
  65. package/include/glib-2.0/gio/gpollableinputstream.h +0 -7
  66. package/include/glib-2.0/gio/gpollableoutputstream.h +0 -7
  67. package/include/glib-2.0/gio/gproxy.h +0 -7
  68. package/include/glib-2.0/gio/gproxyaddressenumerator.h +0 -8
  69. package/include/glib-2.0/gio/gseekable.h +0 -5
  70. package/include/glib-2.0/gio/gsettingsbackend.h +0 -5
  71. package/include/glib-2.0/gio/gsimpleactiongroup.h +0 -7
  72. package/include/glib-2.0/gio/gsimpleasyncresult.h +0 -5
  73. package/include/glib-2.0/gio/gsimpleproxyresolver.h +0 -5
  74. package/include/glib-2.0/gio/gsocket.h +13 -0
  75. package/include/glib-2.0/gio/gsocketaddressenumerator.h +0 -6
  76. package/include/glib-2.0/gio/gsocketconnectable.h +0 -5
  77. package/include/glib-2.0/gio/gtask.h +12 -0
  78. package/include/glib-2.0/gio/gthemedicon.h +0 -5
  79. package/include/glib-2.0/gio/gtlsserverconnection.h +0 -8
  80. package/include/glib-2.0/gio/gunixcredentialsmessage.h +0 -8
  81. package/include/glib-2.0/gio/gvfs.h +0 -5
  82. package/include/glib-2.0/gio/gvolume.h +2 -2
  83. package/include/glib-2.0/gio/gvolumemonitor.h +0 -5
  84. package/include/glib-2.0/girepository/gi-visibility.h +986 -0
  85. package/include/glib-2.0/girepository/giarginfo.h +100 -0
  86. package/include/glib-2.0/girepository/gibaseinfo.h +129 -0
  87. package/include/glib-2.0/girepository/gicallableinfo.h +119 -0
  88. package/include/glib-2.0/girepository/gicallbackinfo.h +60 -0
  89. package/include/glib-2.0/girepository/giconstantinfo.h +72 -0
  90. package/include/glib-2.0/girepository/gienuminfo.h +82 -0
  91. package/include/glib-2.0/girepository/gifieldinfo.h +84 -0
  92. package/include/glib-2.0/girepository/giflagsinfo.h +60 -0
  93. package/include/glib-2.0/girepository/gifunctioninfo.h +117 -0
  94. package/include/glib-2.0/girepository/giinterfaceinfo.h +120 -0
  95. package/include/glib-2.0/girepository/giobjectinfo.h +230 -0
  96. package/include/glib-2.0/girepository/gipropertyinfo.h +77 -0
  97. package/include/glib-2.0/girepository/giregisteredtypeinfo.h +75 -0
  98. package/include/glib-2.0/girepository/girepository-autocleanups.h +56 -0
  99. package/include/glib-2.0/girepository/girepository.h +247 -0
  100. package/include/glib-2.0/girepository/girffi.h +129 -0
  101. package/include/glib-2.0/girepository/gisignalinfo.h +72 -0
  102. package/include/glib-2.0/girepository/gistructinfo.h +102 -0
  103. package/include/glib-2.0/girepository/gitypeinfo.h +144 -0
  104. package/include/glib-2.0/girepository/gitypelib.h +61 -0
  105. package/include/glib-2.0/girepository/gitypes.h +421 -0
  106. package/include/glib-2.0/girepository/giunioninfo.h +105 -0
  107. package/include/glib-2.0/girepository/giunresolvedinfo.h +60 -0
  108. package/include/glib-2.0/girepository/givalueinfo.h +65 -0
  109. package/include/glib-2.0/girepository/givfuncinfo.h +88 -0
  110. package/include/glib-2.0/glib/deprecated/gcompletion.h +1 -1
  111. package/include/glib-2.0/glib/deprecated/grel.h +0 -23
  112. package/include/glib-2.0/glib/deprecated/gthread.h +10 -6
  113. package/include/glib-2.0/glib/gatomic.h +20 -20
  114. package/include/glib-2.0/glib/gbitlock.h +31 -0
  115. package/include/glib-2.0/glib/gbookmarkfile.h +39 -1
  116. package/include/glib-2.0/glib/gchecksum.h +0 -10
  117. package/include/glib-2.0/glib/gdate.h +0 -9
  118. package/include/glib-2.0/glib/gdatetime.h +33 -1
  119. package/include/glib-2.0/glib/gdir.h +5 -0
  120. package/include/glib-2.0/glib/ghmac.h +0 -9
  121. package/include/glib-2.0/glib/glib-autocleanups.h +4 -0
  122. package/include/glib-2.0/glib/glib-visibility.h +34 -0
  123. package/include/glib-2.0/glib/gmacros.h +1 -0
  124. package/include/glib-2.0/glib/gmessages.h +11 -0
  125. package/include/glib-2.0/glib/gpathbuf.h +0 -7
  126. package/include/glib-2.0/glib/gslice.h +2 -0
  127. package/include/glib-2.0/glib/gstdio.h +1 -1
  128. package/include/glib-2.0/glib/gstrfuncs.h +24 -18
  129. package/include/glib-2.0/glib/gstrvbuilder.h +4 -8
  130. package/include/glib-2.0/glib/gtestutils.h +5 -0
  131. package/include/glib-2.0/glib/gthread.h +216 -3
  132. package/include/glib-2.0/glib/gunicode.h +12 -2
  133. package/include/glib-2.0/glib/gvarianttype.h +1 -10
  134. package/include/glib-2.0/glib/gversionmacros.h +9 -0
  135. package/include/glib-2.0/glib/gwin32.h +4 -4
  136. package/include/glib-2.0/glib-unix.h +214 -0
  137. package/include/glib-2.0/gmodule/gmodule-visibility.h +34 -0
  138. package/include/glib-2.0/gobject/gbinding.h +0 -8
  139. package/include/glib-2.0/gobject/gbindinggroup.h +0 -8
  140. package/include/glib-2.0/gobject/gclosure.h +1 -9
  141. package/include/glib-2.0/gobject/genums.h +6 -6
  142. package/include/glib-2.0/gobject/glib-types.h +44 -0
  143. package/include/glib-2.0/gobject/gobject-autocleanups.h +4 -0
  144. package/include/glib-2.0/gobject/gobject-visibility.h +34 -0
  145. package/include/glib-2.0/gobject/gobject.h +1 -16
  146. package/include/glib-2.0/gobject/gparam.h +3 -12
  147. package/include/glib-2.0/gobject/gsignal.h +16 -6
  148. package/include/glib-2.0/gobject/gsignalgroup.h +0 -8
  149. package/include/glib-2.0/gobject/gtype.h +53 -20
  150. package/include/glib-2.0/gobject/gtypemodule.h +0 -7
  151. package/include/glib-2.0/gobject/gtypeplugin.h +0 -6
  152. package/include/glib-2.0/gobject/gvaluearray.h +0 -7
  153. package/include/glib-2.0/gobject/gvaluecollector.h +1 -11
  154. package/include/glib-2.0/gobject/gvaluetypes.h +2 -0
  155. package/include/hwy/aligned_allocator.h +171 -6
  156. package/include/hwy/base.h +1765 -543
  157. package/include/hwy/cache_control.h +24 -6
  158. package/include/hwy/detect_compiler_arch.h +23 -2
  159. package/include/hwy/detect_targets.h +56 -13
  160. package/include/hwy/foreach_target.h +24 -0
  161. package/include/hwy/highway.h +20 -3
  162. package/include/hwy/ops/arm_neon-inl.h +1086 -667
  163. package/include/hwy/ops/arm_sve-inl.h +1091 -235
  164. package/include/hwy/ops/emu128-inl.h +271 -196
  165. package/include/hwy/ops/generic_ops-inl.h +2270 -399
  166. package/include/hwy/ops/ppc_vsx-inl.h +1786 -563
  167. package/include/hwy/ops/rvv-inl.h +1043 -311
  168. package/include/hwy/ops/scalar-inl.h +189 -159
  169. package/include/hwy/ops/set_macros-inl.h +66 -6
  170. package/include/hwy/ops/shared-inl.h +175 -56
  171. package/include/hwy/ops/wasm_128-inl.h +153 -136
  172. package/include/hwy/ops/x86_128-inl.h +1647 -646
  173. package/include/hwy/ops/x86_256-inl.h +1003 -370
  174. package/include/hwy/ops/x86_512-inl.h +948 -353
  175. package/include/hwy/per_target.h +4 -0
  176. package/include/hwy/profiler.h +648 -0
  177. package/include/hwy/robust_statistics.h +2 -2
  178. package/include/hwy/targets.h +18 -11
  179. package/include/hwy/timer.h +11 -0
  180. package/include/lcms2.h +46 -7
  181. package/include/lcms2_plugin.h +4 -4
  182. package/include/libheif/heif_version.h +2 -2
  183. package/include/libpng16/png.h +32 -29
  184. package/include/libpng16/pngconf.h +2 -2
  185. package/include/libpng16/pnglibconf.h +7 -2
  186. package/include/librsvg-2.0/librsvg/rsvg-version.h +2 -2
  187. package/include/libxml2/libxml/HTMLparser.h +23 -0
  188. package/include/libxml2/libxml/SAX.h +0 -2
  189. package/include/libxml2/libxml/SAX2.h +0 -2
  190. package/include/libxml2/libxml/c14n.h +0 -2
  191. package/include/libxml2/libxml/dict.h +1 -0
  192. package/include/libxml2/libxml/encoding.h +16 -14
  193. package/include/libxml2/libxml/entities.h +4 -0
  194. package/include/libxml2/libxml/globals.h +15 -503
  195. package/include/libxml2/libxml/hash.h +57 -61
  196. package/include/libxml2/libxml/nanoftp.h +2 -2
  197. package/include/libxml2/libxml/parser.h +137 -18
  198. package/include/libxml2/libxml/parserInternals.h +1 -0
  199. package/include/libxml2/libxml/relaxng.h +2 -1
  200. package/include/libxml2/libxml/schemasInternals.h +1 -0
  201. package/include/libxml2/libxml/schematron.h +1 -0
  202. package/include/libxml2/libxml/threads.h +4 -11
  203. package/include/libxml2/libxml/tree.h +68 -20
  204. package/include/libxml2/libxml/uri.h +2 -1
  205. package/include/libxml2/libxml/valid.h +2 -0
  206. package/include/libxml2/libxml/xmlIO.h +65 -13
  207. package/include/libxml2/libxml/xmlerror.h +37 -8
  208. package/include/libxml2/libxml/xmlmemory.h +37 -40
  209. package/include/libxml2/libxml/xmlreader.h +6 -0
  210. package/include/libxml2/libxml/xmlregexp.h +2 -9
  211. package/include/libxml2/libxml/xmlsave.h +9 -0
  212. package/include/libxml2/libxml/xmlschemas.h +3 -0
  213. package/include/libxml2/libxml/xmlversion.h +28 -43
  214. package/include/libxml2/libxml/xpath.h +1 -1
  215. package/include/libxml2/libxml/xpathInternals.h +2 -1
  216. package/include/libxml2/libxml/xpointer.h +5 -4
  217. package/include/pango-1.0/pango/pango-features.h +3 -3
  218. package/include/pango-1.0/pango/pango-fontmap.h +7 -0
  219. package/include/pixman-1/pixman-version.h +3 -3
  220. package/include/pixman-1/pixman.h +9 -2
  221. package/include/png.h +32 -29
  222. package/include/pngconf.h +2 -2
  223. package/include/pnglibconf.h +7 -2
  224. package/include/vips/connection.h +9 -3
  225. package/include/vips/util.h +0 -9
  226. package/include/vips/version.h +4 -4
  227. package/include/zconf.h +3 -0
  228. package/include/zlib.h +3 -3
  229. package/package.json +1 -1
  230. package/versions.json +15 -15
@@ -127,6 +127,13 @@ static inline HWY_MAYBE_UNUSED const char* TargetName(int64_t target) {
127
127
  return "PPC10";
128
128
  #endif
129
129
 
130
+ #if HWY_ARCH_S390X
131
+ case HWY_Z14:
132
+ return "Z14";
133
+ case HWY_Z15:
134
+ return "Z15";
135
+ #endif
136
+
130
137
  #if HWY_ARCH_WASM
131
138
  case HWY_WASM:
132
139
  return "WASM";
@@ -245,20 +252,20 @@ static inline HWY_MAYBE_UNUSED const char* TargetName(int64_t target) {
245
252
  HWY_CHOOSE_RVV(func_name), /* RVV */ \
246
253
  nullptr /* reserved */
247
254
 
248
- #elif HWY_ARCH_PPC
255
+ #elif HWY_ARCH_PPC || HWY_ARCH_S390X
249
256
  // See HWY_ARCH_X86 above for details.
250
257
  #define HWY_MAX_DYNAMIC_TARGETS 9
251
258
  #define HWY_HIGHEST_TARGET_BIT HWY_HIGHEST_TARGET_BIT_PPC
252
- #define HWY_CHOOSE_TARGET_LIST(func_name) \
253
- nullptr, /* reserved */ \
254
- nullptr, /* reserved */ \
255
- nullptr, /* reserved */ \
256
- nullptr, /* reserved */ \
257
- HWY_CHOOSE_PPC10(func_name), /* PPC10 */ \
258
- HWY_CHOOSE_PPC9(func_name), /* PPC9 */ \
259
- HWY_CHOOSE_PPC8(func_name), /* PPC8 */ \
260
- nullptr, /* reserved (VSX or AltiVec) */ \
261
- nullptr /* reserved (VSX or AltiVec) */
259
+ #define HWY_CHOOSE_TARGET_LIST(func_name) \
260
+ nullptr, /* reserved */ \
261
+ nullptr, /* reserved */ \
262
+ nullptr, /* reserved */ \
263
+ nullptr, /* reserved */ \
264
+ HWY_CHOOSE_PPC10(func_name), /* PPC10 */ \
265
+ HWY_CHOOSE_PPC9(func_name), /* PPC9 */ \
266
+ HWY_CHOOSE_PPC8(func_name), /* PPC8 */ \
267
+ HWY_CHOOSE_Z15(func_name), /* Z15 */ \
268
+ HWY_CHOOSE_Z14(func_name) /* Z14 */
262
269
 
263
270
  #elif HWY_ARCH_WASM
264
271
  // See HWY_ARCH_X86 above for details.
@@ -50,6 +50,17 @@ HWY_DLLEXPORT double InvariantTicksPerSecond();
50
50
  HWY_DLLEXPORT uint64_t TimerResolution();
51
51
 
52
52
  } // namespace platform
53
+
54
+ struct Timestamp {
55
+ Timestamp() { t = platform::Now(); }
56
+ double t;
57
+ };
58
+
59
+ static inline double SecondsSince(const Timestamp& t0) {
60
+ const Timestamp t1;
61
+ return t1.t - t0.t;
62
+ }
63
+
53
64
  } // namespace hwy
54
65
 
55
66
  #endif // HIGHWAY_HWY_TIMER_H_
package/include/lcms2.h CHANGED
@@ -23,7 +23,7 @@
23
23
  //
24
24
  //---------------------------------------------------------------------------------
25
25
  //
26
- // Version 2.15
26
+ // Version 2.16
27
27
  //
28
28
 
29
29
  #ifndef _lcms2_H
@@ -76,12 +76,15 @@
76
76
 
77
77
  #ifndef CMS_USE_CPP_API
78
78
  # ifdef __cplusplus
79
+ # if __cplusplus >= 201703L
80
+ # define CMS_NO_REGISTER_KEYWORD 1
81
+ # endif
79
82
  extern "C" {
80
83
  # endif
81
84
  #endif
82
85
 
83
86
  // Version/release
84
- #define LCMS_VERSION 2150
87
+ #define LCMS_VERSION 2160
85
88
 
86
89
  // I will give the chance of redefining basic types for compilers that are not fully C99 compliant
87
90
  #ifndef CMS_BASIC_TYPES_ALREADY_DEFINED
@@ -325,7 +328,8 @@ typedef enum {
325
328
  cmsSigUInt8ArrayType = 0x75693038, // 'ui08'
326
329
  cmsSigVcgtType = 0x76636774, // 'vcgt'
327
330
  cmsSigViewingConditionsType = 0x76696577, // 'view'
328
- cmsSigXYZType = 0x58595A20 // 'XYZ '
331
+ cmsSigXYZType = 0x58595A20, // 'XYZ '
332
+ cmsSigMHC2Type = 0x4D484332 // 'MHC2'
329
333
 
330
334
 
331
335
  } cmsTagTypeSignature;
@@ -403,7 +407,8 @@ typedef enum {
403
407
  cmsSigVcgtTag = 0x76636774, // 'vcgt'
404
408
  cmsSigMetaTag = 0x6D657461, // 'meta'
405
409
  cmsSigcicpTag = 0x63696370, // 'cicp'
406
- cmsSigArgyllArtsTag = 0x61727473 // 'arts'
410
+ cmsSigArgyllArtsTag = 0x61727473, // 'arts'
411
+ cmsSigMHC2Tag = 0x4D484332 // 'MHC2'
407
412
 
408
413
  } cmsTagSignature;
409
414
 
@@ -948,6 +953,7 @@ typedef void* cmsHTRANSFORM;
948
953
  #define TYPE_RGB_DBL (FLOAT_SH(1)|COLORSPACE_SH(PT_RGB)|CHANNELS_SH(3)|BYTES_SH(0))
949
954
  #define TYPE_BGR_DBL (FLOAT_SH(1)|COLORSPACE_SH(PT_RGB)|CHANNELS_SH(3)|BYTES_SH(0)|DOSWAP_SH(1))
950
955
  #define TYPE_CMYK_DBL (FLOAT_SH(1)|COLORSPACE_SH(PT_CMYK)|CHANNELS_SH(4)|BYTES_SH(0))
956
+ #define TYPE_OKLAB_DBL (FLOAT_SH(1)|COLORSPACE_SH(PT_MCH3)|CHANNELS_SH(3)|BYTES_SH(0))
951
957
 
952
958
  // IEEE 754-2008 "half"
953
959
  #define TYPE_GRAY_HALF_FLT (FLOAT_SH(1)|COLORSPACE_SH(PT_GRAY)|CHANNELS_SH(1)|BYTES_SH(2))
@@ -1048,6 +1054,19 @@ typedef struct {
1048
1054
 
1049
1055
  } cmsVideoSignalType;
1050
1056
 
1057
+ typedef struct {
1058
+ cmsUInt32Number CurveEntries;
1059
+ cmsFloat64Number* RedCurve;
1060
+ cmsFloat64Number* GreenCurve;
1061
+ cmsFloat64Number* BlueCurve;
1062
+
1063
+ cmsFloat64Number MinLuminance; // ST.2086 min luminance in nits
1064
+ cmsFloat64Number PeakLuminance; // ST.2086 peak luminance in nits
1065
+
1066
+ cmsFloat64Number XYZ2XYZmatrix[3][4];
1067
+
1068
+ } cmsMHC2Type;
1069
+
1051
1070
 
1052
1071
 
1053
1072
  // Get LittleCMS version (for shared objects) -----------------------------------------------------------------------------
@@ -1220,7 +1239,8 @@ CMSAPI cmsBool CMSEXPORT cmsIsToneCurveMonotonic(const cmsToneCurve* t
1220
1239
  CMSAPI cmsBool CMSEXPORT cmsIsToneCurveDescending(const cmsToneCurve* t);
1221
1240
  CMSAPI cmsInt32Number CMSEXPORT cmsGetToneCurveParametricType(const cmsToneCurve* t);
1222
1241
  CMSAPI cmsFloat64Number CMSEXPORT cmsEstimateGamma(const cmsToneCurve* t, cmsFloat64Number Precision);
1223
- CMSAPI cmsFloat64Number* CMSEXPORT cmsGetToneCurveParams(const cmsToneCurve* t);
1242
+
1243
+ CMSAPI const cmsCurveSegment* CMSEXPORT cmsGetToneCurveSegment(cmsInt32Number n, const cmsToneCurve* t);
1224
1244
 
1225
1245
  // Tone curve tabular estimation
1226
1246
  CMSAPI cmsUInt32Number CMSEXPORT cmsGetToneCurveEstimatedTableEntries(const cmsToneCurve* t);
@@ -1314,8 +1334,11 @@ CMSAPI cmsBool CMSEXPORT cmsSliceSpaceFloat(cmsUInt32Number nInputs, c
1314
1334
 
1315
1335
  typedef struct _cms_MLU_struct cmsMLU;
1316
1336
 
1317
- #define cmsNoLanguage "\0\0"
1318
- #define cmsNoCountry "\0\0"
1337
+ #define cmsNoLanguage "\0\0"
1338
+ #define cmsNoCountry "\0\0"
1339
+
1340
+ // Special language/country to retrieve unicode field for description in V2 profiles. Use with care.
1341
+ #define cmsV2Unicode "\xff\xff"
1319
1342
 
1320
1343
  CMSAPI cmsMLU* CMSEXPORT cmsMLUalloc(cmsContext ContextID, cmsUInt32Number nItems);
1321
1344
  CMSAPI void CMSEXPORT cmsMLUfree(cmsMLU* mlu);
@@ -1327,6 +1350,9 @@ CMSAPI cmsBool CMSEXPORT cmsMLUsetASCII(cmsMLU* mlu,
1327
1350
  CMSAPI cmsBool CMSEXPORT cmsMLUsetWide(cmsMLU* mlu,
1328
1351
  const char LanguageCode[3], const char CountryCode[3],
1329
1352
  const wchar_t* WideString);
1353
+ CMSAPI cmsBool CMSEXPORT cmsMLUsetUTF8(cmsMLU* mlu,
1354
+ const char LanguageCode[3], const char CountryCode[3],
1355
+ const char* UTF8String);
1330
1356
 
1331
1357
  CMSAPI cmsUInt32Number CMSEXPORT cmsMLUgetASCII(const cmsMLU* mlu,
1332
1358
  const char LanguageCode[3], const char CountryCode[3],
@@ -1335,6 +1361,10 @@ CMSAPI cmsUInt32Number CMSEXPORT cmsMLUgetASCII(const cmsMLU* mlu,
1335
1361
  CMSAPI cmsUInt32Number CMSEXPORT cmsMLUgetWide(const cmsMLU* mlu,
1336
1362
  const char LanguageCode[3], const char CountryCode[3],
1337
1363
  wchar_t* Buffer, cmsUInt32Number BufferSize);
1364
+ CMSAPI cmsUInt32Number CMSEXPORT cmsMLUgetUTF8(const cmsMLU* mlu,
1365
+ const char LanguageCode[3], const char CountryCode[3],
1366
+ char* Buffer, cmsUInt32Number BufferSize);
1367
+
1338
1368
 
1339
1369
  CMSAPI cmsBool CMSEXPORT cmsMLUgetTranslation(const cmsMLU* mlu,
1340
1370
  const char LanguageCode[3], const char CountryCode[3],
@@ -1559,6 +1589,10 @@ CMSAPI cmsUInt32Number CMSEXPORT cmsGetProfileInfoASCII(cmsHPROFILE hProfile,
1559
1589
  const char LanguageCode[3], const char CountryCode[3],
1560
1590
  char* Buffer, cmsUInt32Number BufferSize);
1561
1591
 
1592
+ CMSAPI cmsUInt32Number CMSEXPORT cmsGetProfileInfoUTF8(cmsHPROFILE hProfile, cmsInfoType Info,
1593
+ const char LanguageCode[3], const char CountryCode[3],
1594
+ char* Buffer, cmsUInt32Number BufferSize);
1595
+
1562
1596
  // IO handlers ----------------------------------------------------------------------------------------------------------
1563
1597
 
1564
1598
  typedef struct _cms_io_handler cmsIOHANDLER;
@@ -1621,6 +1655,9 @@ CMSAPI cmsHPROFILE CMSEXPORT cmsCreateInkLimitingDeviceLinkTHR(cmsContext C
1621
1655
 
1622
1656
  CMSAPI cmsHPROFILE CMSEXPORT cmsCreateInkLimitingDeviceLink(cmsColorSpaceSignature ColorSpace, cmsFloat64Number Limit);
1623
1657
 
1658
+ CMSAPI cmsHPROFILE CMSEXPORT cmsCreateDeviceLinkFromCubeFile(const char* cFileName);
1659
+
1660
+ CMSAPI cmsHPROFILE CMSEXPORT cmsCreateDeviceLinkFromCubeFileTHR(cmsContext ContextID, const char* cFileName);
1624
1661
 
1625
1662
  CMSAPI cmsHPROFILE CMSEXPORT cmsCreateLab2ProfileTHR(cmsContext ContextID, const cmsCIExyY* WhitePoint);
1626
1663
  CMSAPI cmsHPROFILE CMSEXPORT cmsCreateLab2Profile(const cmsCIExyY* WhitePoint);
@@ -1633,6 +1670,8 @@ CMSAPI cmsHPROFILE CMSEXPORT cmsCreateXYZProfile(void);
1633
1670
  CMSAPI cmsHPROFILE CMSEXPORT cmsCreate_sRGBProfileTHR(cmsContext ContextID);
1634
1671
  CMSAPI cmsHPROFILE CMSEXPORT cmsCreate_sRGBProfile(void);
1635
1672
 
1673
+ CMSAPI cmsHPROFILE CMSEXPORT cmsCreate_OkLabProfile(cmsContext ctx);
1674
+
1636
1675
  CMSAPI cmsHPROFILE CMSEXPORT cmsCreateBCHSWabstractProfileTHR(cmsContext ContextID,
1637
1676
  cmsUInt32Number nLUTPoints,
1638
1677
  cmsFloat64Number Bright,
@@ -603,9 +603,9 @@ typedef void (* _cmsTransformFn)(struct _cmstransform_struct *CMMcargo, //
603
603
  typedef void (*_cmsTransform2Fn)(struct _cmstransform_struct *CMMcargo,
604
604
  const void* InputBuffer,
605
605
  void* OutputBuffer,
606
- cmsUInt32Number PixelsPerLine,
607
- cmsUInt32Number LineCount,
608
- const cmsStride* Stride);
606
+ cmsUInt32Number PixelsPerLine,
607
+ cmsUInt32Number LineCount,
608
+ const cmsStride* Stride);
609
609
 
610
610
  typedef cmsBool (* _cmsTransformFactory)(_cmsTransformFn* xform,
611
611
  void** UserData,
@@ -648,7 +648,7 @@ typedef struct {
648
648
  } cmsPluginTransform;
649
649
 
650
650
  //----------------------------------------------------------------------------------------------------------
651
- // Mutex
651
+ // Mutex
652
652
 
653
653
  typedef void* (* _cmsCreateMutexFnPtrType)(cmsContext ContextID);
654
654
  typedef void (* _cmsDestroyMutexFnPtrType)(cmsContext ContextID, void* mtx);
@@ -28,10 +28,10 @@
28
28
  #define LIBHEIF_HEIF_VERSION_H
29
29
 
30
30
  /* Numeric representation of the version */
31
- #define LIBHEIF_NUMERIC_VERSION ((1<<24) | (17<<16) | (3<<8) | 0)
31
+ #define LIBHEIF_NUMERIC_VERSION ((1<<24) | (17<<16) | (6<<8) | 0)
32
32
 
33
33
  /* Version string */
34
- #define LIBHEIF_VERSION "1.17.3"
34
+ #define LIBHEIF_VERSION "1.17.6"
35
35
 
36
36
  #define LIBHEIF_PLUGIN_DIRECTORY "/target/lib/libheif"
37
37
 
@@ -1,9 +1,9 @@
1
1
 
2
2
  /* png.h - header file for PNG reference library
3
3
  *
4
- * libpng version 1.6.40
4
+ * libpng version 1.6.43
5
5
  *
6
- * Copyright (c) 2018-2023 Cosmin Truta
6
+ * Copyright (c) 2018-2024 Cosmin Truta
7
7
  * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
8
8
  * Copyright (c) 1996-1997 Andreas Dilger
9
9
  * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
@@ -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.40, June 2023:
18
+ * libpng versions 1.6.36, December 2018, through 1.6.43, February 2024:
19
19
  * Cosmin Truta
20
20
  * See also "Contributing Authors", below.
21
21
  */
@@ -27,8 +27,8 @@
27
27
  * PNG Reference Library License version 2
28
28
  * ---------------------------------------
29
29
  *
30
- * * Copyright (c) 1995-2023 The PNG Reference Library Authors.
31
- * * Copyright (c) 2018-2023 Cosmin Truta.
30
+ * * Copyright (c) 1995-2024 The PNG Reference Library Authors.
31
+ * * Copyright (c) 2018-2024 Cosmin Truta.
32
32
  * * Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson.
33
33
  * * Copyright (c) 1996-1997 Andreas Dilger.
34
34
  * * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
@@ -239,7 +239,7 @@
239
239
  * ...
240
240
  * 1.5.30 15 10530 15.so.15.30[.0]
241
241
  * ...
242
- * 1.6.40 16 10640 16.so.16.40[.0]
242
+ * 1.6.43 16 10643 16.so.16.43[.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
@@ -255,9 +255,6 @@
255
255
  * to the info_ptr or png_ptr members through png.h, and the compiled
256
256
  * application is loaded with a different version of the library.
257
257
  *
258
- * DLLNUM will change each time there are forward or backward changes
259
- * in binary compatibility (e.g., when a new feature is added).
260
- *
261
258
  * See libpng.txt or libpng.3 for more information. The PNG specification
262
259
  * is available as a W3C Recommendation and as an ISO/IEC Standard; see
263
260
  * <https://www.w3.org/TR/2003/REC-PNG-20031110/>
@@ -278,19 +275,21 @@
278
275
  */
279
276
 
280
277
  /* Version information for png.h - this should match the version in png.c */
281
- #define PNG_LIBPNG_VER_STRING "1.6.40"
282
- #define PNG_HEADER_VERSION_STRING " libpng version 1.6.40 - June 21, 2023\n"
278
+ #define PNG_LIBPNG_VER_STRING "1.6.43"
279
+ #define PNG_HEADER_VERSION_STRING " libpng version " PNG_LIBPNG_VER_STRING "\n"
283
280
 
284
- #define PNG_LIBPNG_VER_SONUM 16
285
- #define PNG_LIBPNG_VER_DLLNUM 16
281
+ /* The versions of shared library builds should stay in sync, going forward */
282
+ #define PNG_LIBPNG_VER_SHAREDLIB 16
283
+ #define PNG_LIBPNG_VER_SONUM PNG_LIBPNG_VER_SHAREDLIB /* [Deprecated] */
284
+ #define PNG_LIBPNG_VER_DLLNUM PNG_LIBPNG_VER_SHAREDLIB /* [Deprecated] */
286
285
 
287
286
  /* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */
288
287
  #define PNG_LIBPNG_VER_MAJOR 1
289
288
  #define PNG_LIBPNG_VER_MINOR 6
290
- #define PNG_LIBPNG_VER_RELEASE 40
289
+ #define PNG_LIBPNG_VER_RELEASE 43
291
290
 
292
291
  /* This should be zero for a public release, or non-zero for a
293
- * development version. [Deprecated]
292
+ * development version.
294
293
  */
295
294
  #define PNG_LIBPNG_VER_BUILD 0
296
295
 
@@ -318,7 +317,7 @@
318
317
  * From version 1.0.1 it is:
319
318
  * XXYYZZ, where XX=major, YY=minor, ZZ=release
320
319
  */
321
- #define PNG_LIBPNG_VER 10640 /* 1.6.40 */
320
+ #define PNG_LIBPNG_VER 10643 /* 1.6.43 */
322
321
 
323
322
  /* Library configuration: these options cannot be changed after
324
323
  * the library has been built.
@@ -428,7 +427,7 @@ extern "C" {
428
427
  /* This triggers a compiler error in png.c, if png.c and png.h
429
428
  * do not agree upon the version number.
430
429
  */
431
- typedef char* png_libpng_version_1_6_40;
430
+ typedef char* png_libpng_version_1_6_43;
432
431
 
433
432
  /* Basic control structions. Read libpng-manual.txt or libpng.3 for more info.
434
433
  *
@@ -849,7 +848,7 @@ PNG_FUNCTION(void, (PNGCAPI *png_longjmp_ptr), PNGARG((jmp_buf, int)), typedef);
849
848
  #define PNG_TRANSFORM_GRAY_TO_RGB 0x2000 /* read only */
850
849
  /* Added to libpng-1.5.4 */
851
850
  #define PNG_TRANSFORM_EXPAND_16 0x4000 /* read only */
852
- #if INT_MAX >= 0x8000 /* else this might break */
851
+ #if ~0U > 0xffffU /* or else this might break on a 16-bit machine */
853
852
  #define PNG_TRANSFORM_SCALE_16 0x8000 /* read only */
854
853
  #endif
855
854
 
@@ -908,15 +907,15 @@ PNG_EXPORT(2, void, png_set_sig_bytes, (png_structrp png_ptr, int num_bytes));
908
907
  /* Check sig[start] through sig[start + num_to_check - 1] to see if it's a
909
908
  * PNG file. Returns zero if the supplied bytes match the 8-byte PNG
910
909
  * signature, and non-zero otherwise. Having num_to_check == 0 or
911
- * start > 7 will always fail (ie return non-zero).
910
+ * start > 7 will always fail (i.e. return non-zero).
912
911
  */
913
912
  PNG_EXPORT(3, int, png_sig_cmp, (png_const_bytep sig, size_t start,
914
913
  size_t num_to_check));
915
914
 
916
915
  /* Simple signature checking function. This is the same as calling
917
- * png_check_sig(sig, n) := !png_sig_cmp(sig, 0, n).
916
+ * png_check_sig(sig, n) := (png_sig_cmp(sig, 0, n) == 0).
918
917
  */
919
- #define png_check_sig(sig, n) !png_sig_cmp((sig), 0, (n))
918
+ #define png_check_sig(sig, n) (png_sig_cmp((sig), 0, (n)) == 0) /* DEPRECATED */
920
919
 
921
920
  /* Allocate and initialize png_ptr struct for reading, and any other memory. */
922
921
  PNG_EXPORTA(4, png_structp, png_create_read_struct,
@@ -1730,12 +1729,9 @@ PNG_EXPORT(97, void, png_free, (png_const_structrp png_ptr, png_voidp ptr));
1730
1729
  PNG_EXPORT(98, void, png_free_data, (png_const_structrp png_ptr,
1731
1730
  png_inforp info_ptr, png_uint_32 free_me, int num));
1732
1731
 
1733
- /* Reassign responsibility for freeing existing data, whether allocated
1732
+ /* Reassign the responsibility for freeing existing data, whether allocated
1734
1733
  * by libpng or by the application; this works on the png_info structure passed
1735
- * in, it does not change the state for other png_info structures.
1736
- *
1737
- * It is unlikely that this function works correctly as of 1.6.0 and using it
1738
- * may result either in memory leaks or double free of allocated data.
1734
+ * in, without changing the state for other png_info structures.
1739
1735
  */
1740
1736
  PNG_EXPORT(99, void, png_data_freer, (png_const_structrp png_ptr,
1741
1737
  png_inforp info_ptr, int freer, png_uint_32 mask));
@@ -3207,11 +3203,18 @@ PNG_EXPORT(245, int, png_image_write_to_memory, (png_imagep image, void *memory,
3207
3203
  #ifdef PNG_MIPS_MSA_API_SUPPORTED
3208
3204
  # define PNG_MIPS_MSA 6 /* HARDWARE: MIPS Msa SIMD instructions supported */
3209
3205
  #endif
3210
- #define PNG_IGNORE_ADLER32 8
3206
+ #ifdef PNG_DISABLE_ADLER32_CHECK_SUPPORTED
3207
+ # define PNG_IGNORE_ADLER32 8 /* SOFTWARE: disable Adler32 check on IDAT */
3208
+ #endif
3211
3209
  #ifdef PNG_POWERPC_VSX_API_SUPPORTED
3212
- # define PNG_POWERPC_VSX 10 /* HARDWARE: PowerPC VSX SIMD instructions supported */
3210
+ # define PNG_POWERPC_VSX 10 /* HARDWARE: PowerPC VSX SIMD instructions
3211
+ * supported */
3213
3212
  #endif
3214
- #define PNG_OPTION_NEXT 12 /* Next option - numbers must be even */
3213
+ #ifdef PNG_MIPS_MMI_API_SUPPORTED
3214
+ # define PNG_MIPS_MMI 12 /* HARDWARE: MIPS MMI SIMD instructions supported */
3215
+ #endif
3216
+
3217
+ #define PNG_OPTION_NEXT 14 /* Next option - numbers must be even */
3215
3218
 
3216
3219
  /* Return values: NOTE: there are four values and 'off' is *not* zero */
3217
3220
  #define PNG_OPTION_UNSET 0 /* Unset - defaults to off */
@@ -1,9 +1,9 @@
1
1
 
2
2
  /* pngconf.h - machine-configurable file for libpng
3
3
  *
4
- * libpng version 1.6.40
4
+ * libpng version 1.6.43
5
5
  *
6
- * Copyright (c) 2018-2022 Cosmin Truta
6
+ * Copyright (c) 2018-2024 Cosmin Truta
7
7
  * Copyright (c) 1998-2002,2004,2006-2016,2018 Glenn Randers-Pehrson
8
8
  * Copyright (c) 1996-1997 Andreas Dilger
9
9
  * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
@@ -1,8 +1,8 @@
1
1
  /* pnglibconf.h - library build configuration */
2
2
 
3
- /* libpng version 1.6.40 */
3
+ /* libpng version 1.6.43 */
4
4
 
5
- /* Copyright (c) 2018-2023 Cosmin Truta */
5
+ /* Copyright (c) 2018-2024 Cosmin Truta */
6
6
  /* Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson */
7
7
 
8
8
  /* This code is released under the libpng license. */
@@ -27,6 +27,7 @@
27
27
  #define PNG_COLORSPACE_SUPPORTED
28
28
  #define PNG_CONSOLE_IO_SUPPORTED
29
29
  #define PNG_CONVERT_tIME_SUPPORTED
30
+ /*#undef PNG_DISABLE_ADLER32_CHECK_SUPPORTED*/
30
31
  #define PNG_EASY_ACCESS_SUPPORTED
31
32
  /*#undef PNG_ERROR_NUMBERS_SUPPORTED*/
32
33
  #define PNG_ERROR_TEXT_SUPPORTED
@@ -41,6 +42,10 @@
41
42
  #define PNG_INCH_CONVERSIONS_SUPPORTED
42
43
  #define PNG_INFO_IMAGE_SUPPORTED
43
44
  #define PNG_IO_STATE_SUPPORTED
45
+ /*#undef PNG_MIPS_MMI_API_SUPPORTED*/
46
+ /*#undef PNG_MIPS_MMI_CHECK_SUPPORTED*/
47
+ /*#undef PNG_MIPS_MSA_API_SUPPORTED*/
48
+ /*#undef PNG_MIPS_MSA_CHECK_SUPPORTED*/
44
49
  #define PNG_MNG_FEATURES_SUPPORTED
45
50
  #define PNG_POINTER_INDEXING_SUPPORTED
46
51
  /*#undef PNG_POWERPC_VSX_API_SUPPORTED*/
@@ -7,7 +7,7 @@
7
7
 
8
8
  #define LIBRSVG_MAJOR_VERSION (2)
9
9
  #define LIBRSVG_MINOR_VERSION (57)
10
- #define LIBRSVG_MICRO_VERSION (0)
11
- #define LIBRSVG_VERSION "2.57.0"
10
+ #define LIBRSVG_MICRO_VERSION (2)
11
+ #define LIBRSVG_VERSION "2.57.2"
12
12
 
13
13
  #endif
@@ -80,6 +80,23 @@ struct _htmlEntityDesc {
80
80
  const char *desc; /* the description */
81
81
  };
82
82
 
83
+ /** DOC_DISABLE */
84
+ #ifdef LIBXML_SAX1_ENABLED
85
+ #define XML_GLOBALS_HTML \
86
+ XML_OP(htmlDefaultSAXHandler, xmlSAXHandlerV1, XML_DEPRECATED)
87
+ #else
88
+ #define XML_GLOBALS_HTML
89
+ #endif
90
+
91
+ #define XML_OP XML_DECLARE_GLOBAL
92
+ XML_GLOBALS_HTML
93
+ #undef XML_OP
94
+
95
+ #if defined(LIBXML_THREAD_ENABLED) && !defined(XML_GLOBALS_NO_REDEFINITION)
96
+ #define htmlDefaultSAXHandler XML_GLOBAL_MACRO(htmlDefaultSAXHandler)
97
+ #endif
98
+ /** DOC_ENABLE */
99
+
83
100
  /*
84
101
  * There is only few public functions.
85
102
  */
@@ -316,5 +333,11 @@ XMLPUBFUN htmlStatus htmlNodeStatus(const htmlNodePtr, int) ;
316
333
  }
317
334
  #endif
318
335
 
336
+ #else /* LIBXML_HTML_ENABLED */
337
+
338
+ /** DOC_DISABLE */
339
+ #define XML_GLOBALS_HTML
340
+ /** DOC_ENABLE */
341
+
319
342
  #endif /* LIBXML_HTML_ENABLED */
320
343
  #endif /* __HTML_PARSER_H__ */
@@ -12,8 +12,6 @@
12
12
  #ifndef __XML_SAX_H__
13
13
  #define __XML_SAX_H__
14
14
 
15
- #include <stdio.h>
16
- #include <stdlib.h>
17
15
  #include <libxml/xmlversion.h>
18
16
  #include <libxml/parser.h>
19
17
 
@@ -12,8 +12,6 @@
12
12
  #ifndef __XML_SAX2_H__
13
13
  #define __XML_SAX2_H__
14
14
 
15
- #include <stdio.h>
16
- #include <stdlib.h>
17
15
  #include <libxml/xmlversion.h>
18
16
  #include <libxml/parser.h>
19
17
 
@@ -20,7 +20,6 @@
20
20
  #include <libxml/xmlversion.h>
21
21
 
22
22
  #ifdef LIBXML_C14N_ENABLED
23
- #ifdef LIBXML_OUTPUT_ENABLED
24
23
 
25
24
  #include <libxml/tree.h>
26
25
  #include <libxml/xpath.h>
@@ -122,7 +121,6 @@ XMLPUBFUN int
122
121
  }
123
122
  #endif /* __cplusplus */
124
123
 
125
- #endif /* LIBXML_OUTPUT_ENABLED */
126
124
  #endif /* LIBXML_C14N_ENABLED */
127
125
  #endif /* __XML_C14N_H__ */
128
126
 
@@ -13,6 +13,7 @@
13
13
 
14
14
  #include <stddef.h>
15
15
  #include <libxml/xmlversion.h>
16
+ #include <libxml/xmlstring.h>
16
17
 
17
18
  #ifdef __cplusplus
18
19
  extern "C" {
@@ -32,6 +32,15 @@
32
32
  extern "C" {
33
33
  #endif
34
34
 
35
+ typedef enum {
36
+ XML_ENC_ERR_SUCCESS = 0,
37
+ XML_ENC_ERR_SPACE = -1,
38
+ XML_ENC_ERR_INPUT = -2,
39
+ XML_ENC_ERR_PARTIAL = -3,
40
+ XML_ENC_ERR_INTERNAL = -4,
41
+ XML_ENC_ERR_MEMORY = -5
42
+ } xmlCharEncError;
43
+
35
44
  /*
36
45
  * xmlCharEncoding:
37
46
  *
@@ -142,14 +151,6 @@ struct _xmlCharEncodingHandler {
142
151
  #endif /* LIBXML_ICU_ENABLED */
143
152
  };
144
153
 
145
- #ifdef __cplusplus
146
- }
147
- #endif
148
- #include <libxml/tree.h>
149
- #ifdef __cplusplus
150
- extern "C" {
151
- #endif
152
-
153
154
  /*
154
155
  * Interfaces for encoding handlers.
155
156
  */
@@ -194,20 +195,21 @@ XMLPUBFUN xmlCharEncoding
194
195
  xmlDetectCharEncoding (const unsigned char *in,
195
196
  int len);
196
197
 
198
+ struct _xmlBuffer;
197
199
  XMLPUBFUN int
198
200
  xmlCharEncOutFunc (xmlCharEncodingHandler *handler,
199
- xmlBufferPtr out,
200
- xmlBufferPtr in);
201
+ struct _xmlBuffer *out,
202
+ struct _xmlBuffer *in);
201
203
 
202
204
  XMLPUBFUN int
203
205
  xmlCharEncInFunc (xmlCharEncodingHandler *handler,
204
- xmlBufferPtr out,
205
- xmlBufferPtr in);
206
+ struct _xmlBuffer *out,
207
+ struct _xmlBuffer *in);
206
208
  XML_DEPRECATED
207
209
  XMLPUBFUN int
208
210
  xmlCharEncFirstLine (xmlCharEncodingHandler *handler,
209
- xmlBufferPtr out,
210
- xmlBufferPtr in);
211
+ struct _xmlBuffer *out,
212
+ struct _xmlBuffer *in);
211
213
  XMLPUBFUN int
212
214
  xmlCharEncCloseFunc (xmlCharEncodingHandler *handler);
213
215
 
@@ -12,7 +12,9 @@
12
12
  #define __XML_ENTITIES_H__
13
13
 
14
14
  #include <libxml/xmlversion.h>
15
+ #define XML_TREE_INTERNALS
15
16
  #include <libxml/tree.h>
17
+ #undef XML_TREE_INTERNALS
16
18
 
17
19
  #ifdef __cplusplus
18
20
  extern "C" {
@@ -85,6 +87,8 @@ XMLPUBFUN xmlEntityPtr
85
87
  const xmlChar *ExternalID,
86
88
  const xmlChar *SystemID,
87
89
  const xmlChar *content);
90
+ XMLPUBFUN void
91
+ xmlFreeEntity (xmlEntityPtr entity);
88
92
  XMLPUBFUN xmlEntityPtr
89
93
  xmlAddDocEntity (xmlDocPtr doc,
90
94
  const xmlChar *name,