@img/sharp-libvips-dev 1.2.3 → 1.2.4
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.
- package/include/archive.h +2 -2
- package/include/archive_entry.h +1 -1
- package/include/expat.h +3 -2
- package/include/expat_config.h +3 -3
- package/include/harfbuzz/hb-ot-layout.h +6 -0
- package/include/harfbuzz/hb-script-list.h +1 -1
- package/include/harfbuzz/hb-subset.h +5 -0
- package/include/harfbuzz/hb-version.h +3 -3
- package/include/jconfig.h +37 -14
- package/include/jerror.h +47 -42
- package/include/jmorecfg.h +21 -18
- package/include/jpeglib.h +216 -132
- package/include/librsvg-2.0/librsvg/rsvg-version.h +2 -2
- package/include/libxml2/libxml/tree.h +19 -19
- package/include/libxml2/libxml/valid.h +0 -1
- package/include/libxml2/libxml/xmlIO.h +8 -8
- package/include/libxml2/libxml/xmlexports.h +5 -1
- package/include/libxml2/libxml/xmlversion.h +4 -4
- package/include/tiff.h +1 -0
- package/include/tiffconf.h +1 -1
- package/include/tiffio.h +23 -5
- package/include/tiffvers.h +4 -4
- package/include/vips/version.h +4 -4
- package/package.json +1 -1
- package/versions.json +9 -9
|
@@ -296,11 +296,11 @@ typedef xmlNotation *xmlNotationPtr;
|
|
|
296
296
|
*/
|
|
297
297
|
struct _xmlNotation {
|
|
298
298
|
/** Notation name */
|
|
299
|
-
const xmlChar *name
|
|
299
|
+
const xmlChar *name;
|
|
300
300
|
/** Public identifier, if any */
|
|
301
|
-
const xmlChar *PublicID
|
|
301
|
+
const xmlChar *PublicID;
|
|
302
302
|
/** System identifier, if any */
|
|
303
|
-
const xmlChar *SystemID
|
|
303
|
+
const xmlChar *SystemID;
|
|
304
304
|
};
|
|
305
305
|
|
|
306
306
|
/**
|
|
@@ -375,11 +375,11 @@ struct _xmlAttribute {
|
|
|
375
375
|
struct _xmlDoc *doc;
|
|
376
376
|
|
|
377
377
|
/** next in hash table */
|
|
378
|
-
struct _xmlAttribute *nexth
|
|
378
|
+
struct _xmlAttribute *nexth;
|
|
379
379
|
/** attribute type */
|
|
380
|
-
xmlAttributeType atype
|
|
380
|
+
xmlAttributeType atype;
|
|
381
381
|
/** attribute default */
|
|
382
|
-
xmlAttributeDefault def
|
|
382
|
+
xmlAttributeDefault def;
|
|
383
383
|
/** default value */
|
|
384
384
|
xmlChar *defaultValue;
|
|
385
385
|
/** enumeration tree if any */
|
|
@@ -387,7 +387,7 @@ struct _xmlAttribute {
|
|
|
387
387
|
/** namespace prefix if any */
|
|
388
388
|
const xmlChar *prefix;
|
|
389
389
|
/** element name */
|
|
390
|
-
const xmlChar *elem
|
|
390
|
+
const xmlChar *elem;
|
|
391
391
|
};
|
|
392
392
|
|
|
393
393
|
/**
|
|
@@ -478,13 +478,13 @@ struct _xmlElement {
|
|
|
478
478
|
struct _xmlDoc *doc;
|
|
479
479
|
|
|
480
480
|
/** element type */
|
|
481
|
-
xmlElementTypeVal etype
|
|
481
|
+
xmlElementTypeVal etype;
|
|
482
482
|
/** allowed element content */
|
|
483
|
-
xmlElementContent *content
|
|
483
|
+
xmlElementContent *content;
|
|
484
484
|
/** list of declared attributes */
|
|
485
|
-
xmlAttribute *attributes
|
|
485
|
+
xmlAttribute *attributes;
|
|
486
486
|
/** namespace prefix if any */
|
|
487
|
-
const xmlChar *prefix
|
|
487
|
+
const xmlChar *prefix;
|
|
488
488
|
#ifdef LIBXML_REGEXP_ENABLED
|
|
489
489
|
/** validating regexp */
|
|
490
490
|
xmlRegexp *contModel XML_DEPRECATED_MEMBER;
|
|
@@ -564,19 +564,19 @@ struct _xmlDtd {
|
|
|
564
564
|
/* End of common part */
|
|
565
565
|
|
|
566
566
|
/** hash table for notations if any */
|
|
567
|
-
void *notations
|
|
567
|
+
void *notations;
|
|
568
568
|
/** hash table for elements if any */
|
|
569
|
-
void *elements
|
|
569
|
+
void *elements;
|
|
570
570
|
/** hash table for attributes if any */
|
|
571
|
-
void *attributes
|
|
571
|
+
void *attributes;
|
|
572
572
|
/** hash table for entities if any */
|
|
573
|
-
void *entities
|
|
573
|
+
void *entities;
|
|
574
574
|
/** public identifier */
|
|
575
|
-
xmlChar *ExternalID
|
|
575
|
+
xmlChar *ExternalID;
|
|
576
576
|
/** system identifier */
|
|
577
|
-
xmlChar *SystemID
|
|
577
|
+
xmlChar *SystemID;
|
|
578
578
|
/** hash table for parameter entities if any */
|
|
579
|
-
void *pentities
|
|
579
|
+
void *pentities;
|
|
580
580
|
};
|
|
581
581
|
|
|
582
582
|
/** Attribute of an element */
|
|
@@ -823,7 +823,7 @@ struct _xmlDoc {
|
|
|
823
823
|
/** external subset */
|
|
824
824
|
struct _xmlDtd *extSubset;
|
|
825
825
|
/** used to hold the XML namespace if needed */
|
|
826
|
-
struct _xmlNs *oldNs
|
|
826
|
+
struct _xmlNs *oldNs;
|
|
827
827
|
/** version string from XML declaration */
|
|
828
828
|
xmlChar *version;
|
|
829
829
|
/** actual encoding if any */
|
|
@@ -148,20 +148,20 @@ struct _xmlParserInputBuffer {
|
|
|
148
148
|
* Output buffer
|
|
149
149
|
*/
|
|
150
150
|
struct _xmlOutputBuffer {
|
|
151
|
-
void* context
|
|
152
|
-
xmlOutputWriteCallback writecallback
|
|
153
|
-
xmlOutputCloseCallback closecallback
|
|
151
|
+
void* context;
|
|
152
|
+
xmlOutputWriteCallback writecallback;
|
|
153
|
+
xmlOutputCloseCallback closecallback;
|
|
154
154
|
|
|
155
155
|
/* I18N conversions to UTF-8 */
|
|
156
|
-
xmlCharEncodingHandler *encoder
|
|
156
|
+
xmlCharEncodingHandler *encoder;
|
|
157
157
|
|
|
158
158
|
/* Local buffer encoded in UTF-8 or ISOLatin */
|
|
159
|
-
xmlBuf *buffer
|
|
159
|
+
xmlBuf *buffer;
|
|
160
160
|
/* if encoder != NULL buffer for output */
|
|
161
|
-
xmlBuf *conv
|
|
161
|
+
xmlBuf *conv;
|
|
162
162
|
/* total number of byte written */
|
|
163
|
-
int written
|
|
164
|
-
int error
|
|
163
|
+
int written;
|
|
164
|
+
int error;
|
|
165
165
|
};
|
|
166
166
|
#endif /* LIBXML_OUTPUT_ENABLED */
|
|
167
167
|
|
|
@@ -55,8 +55,12 @@
|
|
|
55
55
|
#ifndef XML_DEPRECATED
|
|
56
56
|
#if defined(IN_LIBXML)
|
|
57
57
|
#define XML_DEPRECATED
|
|
58
|
-
#elif __GNUC__ * 100 + __GNUC_MINOR__ >=
|
|
58
|
+
#elif __GNUC__ * 100 + __GNUC_MINOR__ >= 405
|
|
59
|
+
/* GCC 4.5+ supports deprecated with message */
|
|
59
60
|
#define XML_DEPRECATED __attribute__((deprecated("See https://gnome.pages.gitlab.gnome.org/libxml2/html/deprecated.html")))
|
|
61
|
+
#elif __GNUC__ * 100 + __GNUC_MINOR__ >= 301
|
|
62
|
+
/* GCC 3.1+ supports deprecated without message */
|
|
63
|
+
#define XML_DEPRECATED __attribute__((deprecated))
|
|
60
64
|
#elif defined(_MSC_VER) && _MSC_VER >= 1400
|
|
61
65
|
/* Available since Visual Studio 2005 */
|
|
62
66
|
#define XML_DEPRECATED __declspec(deprecated("See https://gnome.pages.gitlab.gnome.org/libxml2/html/deprecated.html"))
|
|
@@ -16,17 +16,17 @@
|
|
|
16
16
|
/**
|
|
17
17
|
* the version string like "1.2.3"
|
|
18
18
|
*/
|
|
19
|
-
#define LIBXML_DOTTED_VERSION "2.15.
|
|
19
|
+
#define LIBXML_DOTTED_VERSION "2.15.1"
|
|
20
20
|
|
|
21
21
|
/**
|
|
22
22
|
* the version number: 1.2.3 value is 10203
|
|
23
23
|
*/
|
|
24
|
-
#define LIBXML_VERSION
|
|
24
|
+
#define LIBXML_VERSION 21501
|
|
25
25
|
|
|
26
26
|
/**
|
|
27
27
|
* the version number string, 1.2.3 value is "10203"
|
|
28
28
|
*/
|
|
29
|
-
#define LIBXML_VERSION_STRING "
|
|
29
|
+
#define LIBXML_VERSION_STRING "21501"
|
|
30
30
|
|
|
31
31
|
/**
|
|
32
32
|
* extra version information, used to show a git commit description
|
|
@@ -37,7 +37,7 @@
|
|
|
37
37
|
* Macro to check that the libxml version in use is compatible with
|
|
38
38
|
* the version the software has been compiled against
|
|
39
39
|
*/
|
|
40
|
-
#define LIBXML_TEST_VERSION xmlCheckVersion(
|
|
40
|
+
#define LIBXML_TEST_VERSION xmlCheckVersion(21501);
|
|
41
41
|
|
|
42
42
|
#if 0
|
|
43
43
|
/**
|
package/include/tiff.h
CHANGED
|
@@ -216,6 +216,7 @@ typedef enum
|
|
|
216
216
|
#define COMPRESSION_ZSTD 50000 /* ZSTD: WARNING not registered in Adobe-maintained registry */
|
|
217
217
|
#define COMPRESSION_WEBP 50001 /* WEBP: WARNING not registered in Adobe-maintained registry */
|
|
218
218
|
#define COMPRESSION_JXL 50002 /* JPEGXL: WARNING not registered in Adobe-maintained registry */
|
|
219
|
+
#define COMPRESSION_JXL_DNG_1_7 52546 /* JPEGXL from DNG 1.7 specification */
|
|
219
220
|
#define TIFFTAG_PHOTOMETRIC 262 /* photometric interpretation */
|
|
220
221
|
#define PHOTOMETRIC_MINISWHITE 0 /* min value is white */
|
|
221
222
|
#define PHOTOMETRIC_MINISBLACK 1 /* min value is black */
|
package/include/tiffconf.h
CHANGED
|
@@ -90,7 +90,7 @@
|
|
|
90
90
|
/* Support NeXT 2-bit RLE algorithm */
|
|
91
91
|
#define NEXT_SUPPORT 1
|
|
92
92
|
|
|
93
|
-
/* Support Old JPEG
|
|
93
|
+
/* Support Old JPEG compression (read contrib/ojpeg/README first! Compilation
|
|
94
94
|
fails with unpatched IJG JPEG library) */
|
|
95
95
|
/* #undef OJPEG_SUPPORT */
|
|
96
96
|
|
package/include/tiffio.h
CHANGED
|
@@ -45,12 +45,14 @@ typedef struct tiff TIFF;
|
|
|
45
45
|
* to pass tag types and values uses the types defined in
|
|
46
46
|
* tiff.h directly.
|
|
47
47
|
*
|
|
48
|
-
* NB: ttag_t
|
|
48
|
+
* NB: ttag_t -> deprecated and replaced by uint32_t
|
|
49
|
+
* is unsigned int and not unsigned short because
|
|
49
50
|
* ANSI C requires that the type before the ellipsis be a
|
|
50
51
|
* promoted type (i.e. one of int, unsigned int, pointer,
|
|
51
52
|
* or double) and because we defined pseudo-tags that are
|
|
52
53
|
* outside the range of legal Aldus-assigned tags.
|
|
53
|
-
* NB: tsize_t
|
|
54
|
+
* NB: tsize_t -> deprecated and replaced by tmsize_t
|
|
55
|
+
* is signed and not unsigned because some functions
|
|
54
56
|
* return -1.
|
|
55
57
|
* NB: toff_t is not off_t for many reasons; TIFFs max out at
|
|
56
58
|
* 32-bit file offsets, and BigTIFF maxes out at 64-bit
|
|
@@ -66,10 +68,11 @@ typedef TIFF_SSIZE_T tmsize_t;
|
|
|
66
68
|
#define TIFF_TMSIZE_T_MAX (tmsize_t)(SIZE_MAX >> 1)
|
|
67
69
|
|
|
68
70
|
typedef uint64_t toff_t; /* file offset */
|
|
71
|
+
typedef uint32_t tdir_t; /* directory index */
|
|
72
|
+
|
|
69
73
|
/* the following are deprecated and should be replaced by their defining
|
|
70
74
|
counterparts */
|
|
71
75
|
typedef uint32_t ttag_t; /* directory tag */
|
|
72
|
-
typedef uint32_t tdir_t; /* directory index */
|
|
73
76
|
typedef uint16_t tsample_t; /* sample number */
|
|
74
77
|
typedef uint32_t tstrile_t; /* strip or tile number */
|
|
75
78
|
typedef tstrile_t tstrip_t; /* strip number */
|
|
@@ -151,6 +154,18 @@ typedef struct
|
|
|
151
154
|
float d_gammaB;
|
|
152
155
|
} TIFFDisplay;
|
|
153
156
|
|
|
157
|
+
/* YCbCr->RGB support for TIFFYCbCrToRGBInit() and TIFFYCbCrToRGB()
|
|
158
|
+
* Attention:
|
|
159
|
+
* Functions TIFFYCbCrToRGBInit() and TIFFYCbCrToRGB() require a user provided
|
|
160
|
+
* large memory buffer, where several tables can be setup.
|
|
161
|
+
* The pointers to these tables are stored in the structure TIFFYCbCrToRGB,
|
|
162
|
+
* which is located at the beginning of the buffer. Thus, this memory has to be
|
|
163
|
+
* allocated as follows:
|
|
164
|
+
* TIFFYCbCrToRGB *ycbcr = (TIFFYCbCrToRGB *)_TIFFmalloc(
|
|
165
|
+
* TIFFroundup_32(sizeof(TIFFYCbCrToRGB), sizeof(long)) +
|
|
166
|
+
* 4 * 256 * sizeof(TIFFRGBValue) + 2 * 256 * sizeof(int) +
|
|
167
|
+
* 3 * 256 * sizeof(int32_t));
|
|
168
|
+
*/
|
|
154
169
|
typedef struct
|
|
155
170
|
{ /* YCbCr->RGB support */
|
|
156
171
|
TIFFRGBValue *clamptab; /* range clamping table */
|
|
@@ -508,6 +523,9 @@ extern int TIFFReadRGBAImageOriented(TIFF *, uint32_t, uint32_t, uint32_t *,
|
|
|
508
523
|
TIFFOpenOptionsSetMaxCumulatedMemAlloc(TIFFOpenOptions *opts,
|
|
509
524
|
tmsize_t max_cumulated_mem_alloc);
|
|
510
525
|
extern void
|
|
526
|
+
TIFFOpenOptionsSetWarnAboutUnknownTags(TIFFOpenOptions *opts,
|
|
527
|
+
int warn_about_unknown_tags);
|
|
528
|
+
extern void
|
|
511
529
|
TIFFOpenOptionsSetErrorHandlerExtR(TIFFOpenOptions *opts,
|
|
512
530
|
TIFFErrorHandlerExtR handler,
|
|
513
531
|
void *errorhandler_user_data);
|
|
@@ -590,7 +608,7 @@ extern int TIFFReadRGBAImageOriented(TIFF *, uint32_t, uint32_t, uint32_t *,
|
|
|
590
608
|
extern uint64_t TIFFGetStrileByteCountWithErr(TIFF *tif, uint32_t strile,
|
|
591
609
|
int *pbErr);
|
|
592
610
|
|
|
593
|
-
#
|
|
611
|
+
#if LOGLUV_PUBLIC
|
|
594
612
|
#define U_NEU 0.210526316
|
|
595
613
|
#define V_NEU 0.473684211
|
|
596
614
|
#define UVSCALE 410.
|
|
@@ -634,7 +652,7 @@ extern int TIFFReadRGBAImageOriented(TIFF *, uint32_t, uint32_t, uint32_t *,
|
|
|
634
652
|
****************************************************************************/
|
|
635
653
|
typedef struct
|
|
636
654
|
{
|
|
637
|
-
|
|
655
|
+
uint32_t field_tag; /* field's tag */
|
|
638
656
|
short field_readcount; /* read count/TIFF_VARIABLE/TIFF_SPP */
|
|
639
657
|
short field_writecount; /* write count/TIFF_VARIABLE */
|
|
640
658
|
TIFFDataType field_type; /* type of associated data */
|
package/include/tiffvers.h
CHANGED
|
@@ -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.7.
|
|
11
|
+
#define TIFFLIB_VERSION_STR "LIBTIFF, Version 4.7.1\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
|
|
19
|
+
#define TIFFLIB_VERSION 20250911
|
|
20
20
|
|
|
21
21
|
/* The following defines have been added in 4.5.0 */
|
|
22
22
|
#define TIFFLIB_MAJOR_VERSION 4
|
|
23
23
|
#define TIFFLIB_MINOR_VERSION 7
|
|
24
|
-
#define TIFFLIB_MICRO_VERSION
|
|
25
|
-
#define TIFFLIB_VERSION_STR_MAJ_MIN_MIC "4.7.
|
|
24
|
+
#define TIFFLIB_MICRO_VERSION 1
|
|
25
|
+
#define TIFFLIB_VERSION_STR_MAJ_MIN_MIC "4.7.1"
|
|
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
|
package/include/vips/version.h
CHANGED
|
@@ -4,16 +4,16 @@
|
|
|
4
4
|
#ifndef VIPS_VERSION_H
|
|
5
5
|
#define VIPS_VERSION_H
|
|
6
6
|
|
|
7
|
-
#define VIPS_VERSION "8.17.
|
|
8
|
-
#define VIPS_VERSION_STRING "8.17.
|
|
7
|
+
#define VIPS_VERSION "8.17.3"
|
|
8
|
+
#define VIPS_VERSION_STRING "8.17.3"
|
|
9
9
|
#define VIPS_MAJOR_VERSION (8)
|
|
10
10
|
#define VIPS_MINOR_VERSION (17)
|
|
11
|
-
#define VIPS_MICRO_VERSION (
|
|
11
|
+
#define VIPS_MICRO_VERSION (3)
|
|
12
12
|
|
|
13
13
|
/* The ABI version, as used for library versioning.
|
|
14
14
|
*/
|
|
15
15
|
#define VIPS_LIBRARY_CURRENT (61)
|
|
16
|
-
#define VIPS_LIBRARY_REVISION (
|
|
16
|
+
#define VIPS_LIBRARY_REVISION (3)
|
|
17
17
|
#define VIPS_LIBRARY_AGE (19)
|
|
18
18
|
|
|
19
19
|
#define VIPS_CONFIG "enable debug: false\nenable deprecated: false\nenable modules: false\nenable C++ binding: true\nenable RAD load/save: false\nenable Analyze7 load: false\nenable PPM load/save: false\nenable GIF load: true\nFFTs with fftw: false\nSIMD support with libhwy: true\nICC profile support with lcms2: true\ndeflate compression with zlib: true\ntext rendering with pangocairo: true\nfont file support with fontconfig: true\nEXIF metadata support with libexif: true\nJPEG load/save with libjpeg: true\nJXL load/save with libjxl: false (dynamic module: false)\nJPEG2000 load/save with OpenJPEG: false\nPNG load/save with spng: true\nimage quantisation with imagequant: true\nTIFF load/save with libtiff-4: true\nimage pyramid save with libarchive: true\nHEIC/AVIF load/save with libheif: true (dynamic module: false)\nWebP load/save with libwebp: true\nPDF load with PDFium or Poppler: false (dynamic module: false)\nSVG load with librsvg-2.0: true\nEXR load with OpenEXR: false\nWSI load with OpenSlide: false (dynamic module: false)\nMatlab load with Matio: false\nNIfTI load/save with libnifti: false\nFITS load/save with cfitsio: false\nGIF save with cgif: true\nMagick load/save with MagickCore: false (dynamic module: false)"
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@img/sharp-libvips-dev",
|
|
3
|
-
"version": "1.2.
|
|
3
|
+
"version": "1.2.4",
|
|
4
4
|
"description": "Header files and C++ sources for libvips and dependencies required when compiling sharp from source",
|
|
5
5
|
"author": "Lovell Fuller <npm@lovell.info>",
|
|
6
6
|
"homepage": "https://sharp.pixelplumbing.com",
|
package/versions.json
CHANGED
|
@@ -1,30 +1,30 @@
|
|
|
1
1
|
{
|
|
2
2
|
"aom": "3.13.1",
|
|
3
|
-
"archive": "3.8.
|
|
3
|
+
"archive": "3.8.2",
|
|
4
4
|
"cairo": "1.18.4",
|
|
5
5
|
"cgif": "0.5.0",
|
|
6
6
|
"exif": "0.6.25",
|
|
7
|
-
"expat": "2.7.
|
|
7
|
+
"expat": "2.7.3",
|
|
8
8
|
"ffi": "3.5.2",
|
|
9
9
|
"fontconfig": "2.17.1",
|
|
10
10
|
"freetype": "2.14.1",
|
|
11
11
|
"fribidi": "1.0.16",
|
|
12
|
-
"glib": "2.86.
|
|
13
|
-
"harfbuzz": "
|
|
12
|
+
"glib": "2.86.1",
|
|
13
|
+
"harfbuzz": "12.1.0",
|
|
14
14
|
"heif": "1.20.2",
|
|
15
15
|
"highway": "1.3.0",
|
|
16
16
|
"imagequant": "2.4.1",
|
|
17
17
|
"lcms": "2.17",
|
|
18
|
-
"mozjpeg": "
|
|
18
|
+
"mozjpeg": "0826579",
|
|
19
19
|
"pango": "1.57.0",
|
|
20
20
|
"pixman": "0.46.4",
|
|
21
21
|
"png": "1.6.50",
|
|
22
22
|
"proxy-libintl": "0.5",
|
|
23
|
-
"rsvg": "2.61.
|
|
23
|
+
"rsvg": "2.61.2",
|
|
24
24
|
"spng": "0.7.4",
|
|
25
|
-
"tiff": "4.7.
|
|
26
|
-
"vips": "8.17.
|
|
25
|
+
"tiff": "4.7.1",
|
|
26
|
+
"vips": "8.17.3",
|
|
27
27
|
"webp": "1.6.0",
|
|
28
|
-
"xml2": "2.15.
|
|
28
|
+
"xml2": "2.15.1",
|
|
29
29
|
"zlib-ng": "2.2.5"
|
|
30
30
|
}
|