Skip to content

Commit 9a39a0a

Browse files
committed
update all the 3rd party lies built with tizen 2.3
1 parent d985627 commit 9a39a0a

File tree

19 files changed

+78
-49
lines changed

19 files changed

+78
-49
lines changed
-104 Bytes
Binary file not shown.
-84 Bytes
Binary file not shown.

jpeg/prebuilt/tizen/arm/libjpeg.a

-1.86 MB
Binary file not shown.

jpeg/prebuilt/tizen/x86/libjpeg.a

-3.75 MB
Binary file not shown.

png/include/tizen/png.h

+45-31
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
/* png.h - header file for PNG reference library
33
*
4-
* libpng version 1.6.12 - June 12, 2014
4+
* libpng version 1.6.16, December 22, 2014
55
* Copyright (c) 1998-2014 Glenn Randers-Pehrson
66
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
77
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
@@ -11,7 +11,7 @@
1111
* Authors and maintainers:
1212
* libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat
1313
* libpng versions 0.89c, June 1996, through 0.96, May 1997: Andreas Dilger
14-
* libpng versions 0.97, January 1998, through 1.6.12 - June 12, 2014: Glenn
14+
* libpng versions 0.97, January 1998, through 1.6.16, December 22, 2014: Glenn
1515
* See also "Contributing Authors", below.
1616
*
1717
* Note about libpng version numbers:
@@ -200,6 +200,18 @@
200200
* 1.6.11 16 10611 16.so.16.11[.0]
201201
* 1.6.12rc01-03 16 10612 16.so.16.12[.0]
202202
* 1.6.12 16 10612 16.so.16.12[.0]
203+
* 1.6.13beta01-04 16 10613 16.so.16.13[.0]
204+
* 1.6.13rc01-02 16 10613 16.so.16.13[.0]
205+
* 1.6.13 16 10613 16.so.16.13[.0]
206+
* 1.6.14beta01-07 16 10614 16.so.16.14[.0]
207+
* 1.6.14rc01-02 16 10614 16.so.16.14[.0]
208+
* 1.6.14 16 10614 16.so.16.14[.0]
209+
* 1.6.15beta01-08 16 10615 16.so.16.15[.0]
210+
* 1.6.15rc01-03 16 10615 16.so.16.15[.0]
211+
* 1.6.15 16 10615 16.so.16.15[.0]
212+
* 1.6.16beta01-03 16 10616 16.so.16.16[.0]
213+
* 1.6.16rc01-02 16 10616 16.so.16.16[.0]
214+
* 1.6.16 16 10616 16.so.16.16[.0]
203215
*
204216
* Henceforth the source version will match the shared-library major
205217
* and minor numbers; the shared-library major version number will be
@@ -231,7 +243,7 @@
231243
*
232244
* This code is released under the libpng license.
233245
*
234-
* libpng versions 1.2.6, August 15, 2004, through 1.6.12, June 12, 2014, are
246+
* libpng versions 1.2.6, August 15, 2004, through 1.6.16, December 22, 2014, are
235247
* Copyright (c) 2004, 2006-2014 Glenn Randers-Pehrson, and are
236248
* distributed according to the same disclaimer and license as libpng-1.2.5
237249
* with the following individual added to the list of Contributing Authors:
@@ -343,13 +355,13 @@
343355
* Y2K compliance in libpng:
344356
* =========================
345357
*
346-
* June 12, 2014
358+
* December 22, 2014
347359
*
348360
* Since the PNG Development group is an ad-hoc body, we can't make
349361
* an official declaration.
350362
*
351363
* This is your unofficial assurance that libpng from version 0.71 and
352-
* upward through 1.6.12 are Y2K compliant. It is my belief that
364+
* upward through 1.6.16 are Y2K compliant. It is my belief that
353365
* earlier versions were also Y2K compliant.
354366
*
355367
* Libpng only has two year fields. One is a 2-byte unsigned integer
@@ -411,17 +423,17 @@
411423
*/
412424

413425
/* Version information for png.h - this should match the version in png.c */
414-
#define PNG_LIBPNG_VER_STRING "1.6.12"
426+
#define PNG_LIBPNG_VER_STRING "1.6.16"
415427
#define PNG_HEADER_VERSION_STRING \
416-
" libpng version 1.6.12 - June 12, 2014\n"
428+
" libpng version 1.6.16 - December 22, 2014\n"
417429

418430
#define PNG_LIBPNG_VER_SONUM 16
419431
#define PNG_LIBPNG_VER_DLLNUM 16
420432

421433
/* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */
422434
#define PNG_LIBPNG_VER_MAJOR 1
423435
#define PNG_LIBPNG_VER_MINOR 6
424-
#define PNG_LIBPNG_VER_RELEASE 12
436+
#define PNG_LIBPNG_VER_RELEASE 16
425437

426438
/* This should match the numeric part of the final component of
427439
* PNG_LIBPNG_VER_STRING, omitting any leading zero:
@@ -452,7 +464,7 @@
452464
* version 1.0.0 was mis-numbered 100 instead of 10000). From
453465
* version 1.0.1 it's xxyyzz, where x=major, y=minor, z=release
454466
*/
455-
#define PNG_LIBPNG_VER 10612 /* 1.6.12 */
467+
#define PNG_LIBPNG_VER 10616 /* 1.6.16 */
456468

457469
/* Library configuration: these options cannot be changed after
458470
* the library has been built.
@@ -557,7 +569,7 @@ extern "C" {
557569
/* This triggers a compiler error in png.c, if png.c and png.h
558570
* do not agree upon the version number.
559571
*/
560-
typedef char* png_libpng_version_1_6_12;
572+
typedef char* png_libpng_version_1_6_16;
561573

562574
/* Basic control structions. Read libpng-manual.txt or libpng.3 for more info.
563575
*
@@ -1170,7 +1182,7 @@ PNG_EXPORT(24, void, png_convert_from_struct_tm, (png_timep ptime,
11701182

11711183
/* Convert from time_t to png_time. Uses gmtime() */
11721184
PNG_EXPORT(25, void, png_convert_from_time_t, (png_timep ptime, time_t ttime));
1173-
#endif /* PNG_CONVERT_tIME_SUPPORTED */
1185+
#endif /* CONVERT_tIME */
11741186

11751187
#ifdef PNG_READ_EXPAND_SUPPORTED
11761188
/* Expand data to 24-bit RGB, or 8-bit grayscale, with alpha if available. */
@@ -1376,7 +1388,7 @@ PNG_EXPORT(39, void, png_set_filler, (png_structrp png_ptr, png_uint_32 filler,
13761388
/* Add an alpha byte to 8-bit Gray or 24-bit RGB images. */
13771389
PNG_EXPORT(40, void, png_set_add_alpha, (png_structrp png_ptr,
13781390
png_uint_32 filler, int flags));
1379-
#endif /* PNG_READ_FILLER_SUPPORTED || PNG_WRITE_FILLER_SUPPORTED */
1391+
#endif /* READ_FILLER || WRITE_FILLER */
13801392

13811393
#if defined(PNG_READ_SWAP_SUPPORTED) || defined(PNG_WRITE_SWAP_SUPPORTED)
13821394
/* Swap bytes in 16-bit depth files. */
@@ -1640,7 +1652,7 @@ PNG_FIXED_EXPORT(209, void, png_set_filter_heuristics_fixed,
16401652
(png_structrp png_ptr, int heuristic_method, int num_weights,
16411653
png_const_fixed_point_p filter_weights,
16421654
png_const_fixed_point_p filter_costs))
1643-
#endif /* PNG_WRITE_WEIGHTED_FILTER_SUPPORTED */
1655+
#endif /* WRITE_WEIGHTED_FILTER */
16441656

16451657
/* Heuristic used for row filter selection. These defines should NOT be
16461658
* changed.
@@ -1696,7 +1708,7 @@ PNG_EXPORT(225, void, png_set_text_compression_window_bits,
16961708

16971709
PNG_EXPORT(226, void, png_set_text_compression_method, (png_structrp png_ptr,
16981710
int method));
1699-
#endif /* PNG_WRITE_CUSTOMIZE_ZTXT_COMPRESSION_SUPPORTED */
1711+
#endif /* WRITE_CUSTOMIZE_ZTXT_COMPRESSION */
17001712

17011713
/* These next functions are called for input/output, memory, and error
17021714
* handling. They are in the file pngrio.c, pngwio.c, and pngerror.c,
@@ -1863,7 +1875,7 @@ PNG_EXPORT(220, png_uint_32, png_process_data_skip, (png_structrp));
18631875
*/
18641876
PNG_EXPORT(93, void, png_progressive_combine_row, (png_const_structrp png_ptr,
18651877
png_bytep old_row, png_const_bytep new_row));
1866-
#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */
1878+
#endif /* PROGRESSIVE_READ */
18671879

18681880
PNG_EXPORTA(94, png_voidp, png_malloc, (png_const_structrp png_ptr,
18691881
png_alloc_size_t size), PNG_ALLOCATED);
@@ -2064,7 +2076,7 @@ PNG_EXPORT(128, png_int_32, png_get_x_offset_microns,
20642076
PNG_EXPORT(129, png_int_32, png_get_y_offset_microns,
20652077
(png_const_structrp png_ptr, png_const_inforp info_ptr));
20662078

2067-
#endif /* PNG_EASY_ACCESS_SUPPORTED */
2079+
#endif /* EASY_ACCESS */
20682080

20692081
#ifdef PNG_READ_SUPPORTED
20702082
/* Returns pointer to signature string read from PNG header */
@@ -2316,7 +2328,7 @@ PNG_FIXED_EXPORT(213, void, png_set_sCAL_fixed, (png_const_structrp png_ptr,
23162328
PNG_EXPORT(171, void, png_set_sCAL_s, (png_const_structrp png_ptr,
23172329
png_inforp info_ptr, int unit,
23182330
png_const_charp swidth, png_const_charp sheight));
2319-
#endif /* PNG_sCAL_SUPPORTED */
2331+
#endif /* sCAL */
23202332

23212333
#ifdef PNG_SET_UNKNOWN_CHUNKS_SUPPORTED
23222334
/* Provide the default handling for all unknown chunks or, optionally, for
@@ -2544,8 +2556,8 @@ PNG_FIXED_EXPORT(212, png_fixed_point, png_get_y_offset_inches_fixed,
25442556
PNG_EXPORT(198, png_uint_32, png_get_pHYs_dpi, (png_const_structrp png_ptr,
25452557
png_const_inforp info_ptr, png_uint_32 *res_x, png_uint_32 *res_y,
25462558
int *unit_type));
2547-
# endif /* PNG_pHYs_SUPPORTED */
2548-
#endif /* PNG_INCH_CONVERSIONS_SUPPORTED */
2559+
# endif /* pHYs */
2560+
#endif /* INCH_CONVERSIONS */
25492561

25502562
/* Added in libpng-1.4.0 */
25512563
#ifdef PNG_IO_STATE_SUPPORTED
@@ -2568,7 +2580,7 @@ PNG_EXPORT(216, png_uint_32, png_get_io_chunk_type,
25682580
# define PNG_IO_CHUNK_CRC 0x0080 /* currently at the chunk crc */
25692581
# define PNG_IO_MASK_OP 0x000f /* current operation: reading/writing */
25702582
# define PNG_IO_MASK_LOC 0x00f0 /* current location: sig/hdr/data/crc */
2571-
#endif /* ?PNG_IO_STATE_SUPPORTED */
2583+
#endif /* IO_STATE */
25722584

25732585
/* Interlace support. The following macros are always defined so that if
25742586
* libpng interlace handling is turned off the macros may be used to handle
@@ -2672,7 +2684,7 @@ PNG_EXPORT(216, png_uint_32, png_get_io_chunk_type,
26722684
(composite) = (png_uint_16)(((png_uint_32)(fg) * (png_uint_32)(alpha) + \
26732685
(png_uint_32)(bg)*(png_uint_32)(65535 - (png_uint_32)(alpha)) + \
26742686
32767) / 65535)
2675-
#endif /* PNG_READ_COMPOSITE_NODIV_SUPPORTED */
2687+
#endif /* READ_COMPOSITE_NODIV */
26762688

26772689
#ifdef PNG_READ_INT_FUNCTIONS_SUPPORTED
26782690
PNG_EXPORT(201, png_uint_32, png_get_uint_32, (png_const_bytep buf));
@@ -2742,6 +2754,8 @@ PNG_EXPORT(207, void, png_save_uint_16, (png_bytep buf, unsigned int i));
27422754
# endif
27432755
#endif
27442756

2757+
#if defined(PNG_SIMPLIFIED_READ_SUPPORTED) || \
2758+
defined(PNG_SIMPLIFIED_WRITE_SUPPORTED)
27452759
/*******************************************************************************
27462760
* SIMPLIFIED API
27472761
*******************************************************************************
@@ -2813,7 +2827,7 @@ typedef struct
28132827
# define PNG_IMAGE_WARNING 1
28142828
# define PNG_IMAGE_ERROR 2
28152829
/*
2816-
* The result is a two bit code such that a value more than 1 indicates
2830+
* The result is a two-bit code such that a value more than 1 indicates
28172831
* a failure in the API just called:
28182832
*
28192833
* 0 - no warning or error
@@ -3098,7 +3112,7 @@ PNG_EXPORT(234, int, png_image_begin_read_from_file, (png_imagep image,
30983112
PNG_EXPORT(235, int, png_image_begin_read_from_stdio, (png_imagep image,
30993113
FILE* file));
31003114
/* The PNG header is read from the stdio FILE object. */
3101-
#endif /* PNG_STDIO_SUPPORTED */
3115+
#endif /* STDIO */
31023116

31033117
PNG_EXPORT(236, int, png_image_begin_read_from_memory, (png_imagep image,
31043118
png_const_voidp memory, png_size_t size));
@@ -3143,7 +3157,7 @@ PNG_EXPORT(238, void, png_image_free, (png_imagep image));
31433157
/* Free any data allocated by libpng in image->opaque, setting the pointer to
31443158
* NULL. May be called at any time after the structure is initialized.
31453159
*/
3146-
#endif /* PNG_SIMPLIFIED_READ_SUPPORTED */
3160+
#endif /* SIMPLIFIED_READ */
31473161

31483162
#ifdef PNG_SIMPLIFIED_WRITE_SUPPORTED
31493163
#ifdef PNG_STDIO_SUPPORTED
@@ -3189,11 +3203,12 @@ PNG_EXPORT(240, int, png_image_write_to_stdio, (png_imagep image, FILE *file,
31893203
*
31903204
* Note that the write API does not support interlacing or sub-8-bit pixels.
31913205
*/
3192-
#endif /* PNG_STDIO_SUPPORTED */
3193-
#endif /* PNG_SIMPLIFIED_WRITE_SUPPORTED */
3206+
#endif /* STDIO */
3207+
#endif /* SIMPLIFIED_WRITE */
31943208
/*******************************************************************************
31953209
* END OF SIMPLIFIED API
31963210
******************************************************************************/
3211+
#endif /* SIMPLIFIED_{READ|WRITE} */
31973212

31983213
#ifdef PNG_CHECK_FOR_INVALID_INDEX_SUPPORTED
31993214
PNG_EXPORT(242, void, png_set_check_for_invalid_index,
@@ -3241,19 +3256,18 @@ PNG_EXPORT(243, int, png_get_palette_max, (png_const_structp png_ptr,
32413256

32423257
PNG_EXPORT(244, int, png_set_option, (png_structrp png_ptr, int option,
32433258
int onoff));
3244-
#endif
3259+
#endif /* SET_OPTION */
32453260

32463261
/*******************************************************************************
32473262
* END OF HARDWARE AND SOFTWARE OPTIONS
32483263
******************************************************************************/
32493264

3250-
/* Maintainer: Put new public prototypes here ^, in libpng.3, and project
3251-
* defs, scripts/pnglibconf.h, and scripts/pnglibconf.h.prebuilt
3265+
/* Maintainer: Put new public prototypes here ^, in libpng.3, in project
3266+
* defs, and in scripts/symbols.def.
32523267
*/
32533268

32543269
/* The last ordinal number (this is the *last* one already used; the next
3255-
* one to use is one more than this.) Maintainer, remember to add an entry to
3256-
* scripts/symbols.def as well.
3270+
* one to use is one more than this.)
32573271
*/
32583272
#ifdef PNG_EXPORT_LAST_ORDINAL
32593273
PNG_EXPORT_LAST_ORDINAL(244);

png/include/tizen/pngconf.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
/* pngconf.h - machine configurable file for libpng
33
*
4-
* libpng version 1.6.12 - June 12, 2014
4+
* libpng version 1.6.16,December 22, 2014
55
*
66
* Copyright (c) 1998-2014 Glenn Randers-Pehrson
77
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)

png/include/tizen/pnglibconf.h

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
/* libpng 1.6.12 STANDARD API DEFINITION */
2-
31
/* pnglibconf.h - library build configuration */
42

5-
/* Libpng version 1.6.12 - June 12, 2014 */
3+
/* libpng version 1.6.16,December 22, 2014 */
64

75
/* Copyright (c) 1998-2014 Glenn Randers-Pehrson */
86

@@ -200,7 +198,7 @@
200198
#define PNG_TEXT_Z_DEFAULT_STRATEGY 0
201199
#define PNG_WEIGHT_SHIFT 8
202200
#define PNG_ZBUF_SIZE 8192
203-
#define PNG_ZLIB_VERNUM 0 /* unknown */
201+
#define PNG_ZLIB_VERNUM 0x1280
204202
#define PNG_Z_DEFAULT_COMPRESSION (-1)
205203
#define PNG_Z_DEFAULT_NOFILTER_STRATEGY 0
206204
#define PNG_Z_DEFAULT_STRATEGY 1

png/prebuilt/tizen/arm/libpng.a

-2 MB
Binary file not shown.

png/prebuilt/tizen/x86/libpng.a

-1.89 MB
Binary file not shown.

tiff/include/tizen/tiffconf.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -86,13 +86,13 @@
8686
#define PACKBITS_SUPPORT 1
8787

8888
/* Support Pixar log-format algorithm (requires Zlib) */
89-
#define PIXARLOG_SUPPORT 1
89+
/* #undef PIXARLOG_SUPPORT */
9090

9191
/* Support ThunderScan 4-bit RLE algorithm */
9292
#define THUNDER_SUPPORT 1
9393

9494
/* Support Deflate compression */
95-
#define ZIP_SUPPORT 1
95+
/* #undef ZIP_SUPPORT */
9696

9797
/* Support strip chopping (whether or not to convert single-strip uncompressed
9898
images to mutiple strips of ~8Kb to reduce memory usage) */

tiff/prebuilt/tizen/arm/libtiff.a

-3.53 MB
Binary file not shown.

tiff/prebuilt/tizen/x86/libtiff.a

-3.31 MB
Binary file not shown.

webp/include/tizen/decode.h

+7-3
Original file line numberDiff line numberDiff line change
@@ -444,16 +444,20 @@ struct WebPDecoderOptions {
444444
int dithering_strength; // dithering strength (0=Off, 100=full)
445445
#if WEBP_DECODER_ABI_VERSION > 0x0203
446446
int flip; // flip output vertically
447+
#endif
448+
#if WEBP_DECODER_ABI_VERSION > 0x0204
447449
int alpha_dithering_strength; // alpha dithering strength in [0..100]
448450
#endif
449451

450452
// Unused for now:
451453
int force_rotation; // forced rotation (to be applied _last_)
452454
int no_enhancement; // if true, discard enhancement layer
453-
#if WEBP_DECODER_ABI_VERSION > 0x0203
454-
uint32_t pad[3]; // padding for later use
455-
#else
455+
#if WEBP_DECODER_ABI_VERSION < 0x0203
456456
uint32_t pad[5]; // padding for later use
457+
#elif WEBP_DECODER_ABI_VERSION < 0x0204
458+
uint32_t pad[4]; // padding for later use
459+
#else
460+
uint32_t pad[3]; // padding for later use
457461
#endif
458462
};
459463

webp/include/tizen/encode.h

+17-5
Original file line numberDiff line numberDiff line change
@@ -231,14 +231,14 @@ struct WebPMemoryWriter {
231231
// The following must be called first before any use.
232232
WEBP_EXTERN(void) WebPMemoryWriterInit(WebPMemoryWriter* writer);
233233

234-
#if WEBP_ENCODER_ABI_VERSION > 0x0202
234+
#if WEBP_ENCODER_ABI_VERSION > 0x0203
235235
// The following must be called to deallocate writer->mem memory. The 'writer'
236236
// object itself is not deallocated.
237237
WEBP_EXTERN(void) WebPMemoryWriterClear(WebPMemoryWriter* writer);
238238
#endif
239239
// The custom writer to be used with WebPMemoryWriter as custom_ptr. Upon
240240
// completion, writer.mem and writer.size will hold the coded data.
241-
#if WEBP_ENCODER_ABI_VERSION > 0x0202
241+
#if WEBP_ENCODER_ABI_VERSION > 0x0203
242242
// writer.mem must be freed by calling WebPMemoryWriterClear.
243243
#else
244244
// writer.mem must be freed by calling 'free(writer.mem)'.
@@ -419,7 +419,9 @@ WEBP_EXTERN(int) WebPPictureView(const WebPPicture* src,
419419
WEBP_EXTERN(int) WebPPictureIsView(const WebPPicture* picture);
420420

421421
// Rescale a picture to new dimension width x height.
422-
// Now gamma correction is applied.
422+
// If either 'width' or 'height' (but not both) is 0 the corresponding
423+
// dimension will be calculated preserving the aspect ratio.
424+
// No gamma correction is applied.
423425
// Returns false in case of error (invalid parameter or insufficient memory).
424426
WEBP_EXTERN(int) WebPPictureRescale(WebPPicture* pic, int width, int height);
425427

@@ -446,13 +448,14 @@ WEBP_EXTERN(int) WebPPictureImportBGRA(
446448
WEBP_EXTERN(int) WebPPictureImportBGRX(
447449
WebPPicture* picture, const uint8_t* bgrx, int bgrx_stride);
448450

449-
// Converts picture->argb data to the YUVA format specified by 'colorspace'.
451+
// Converts picture->argb data to the YUV420A format. The 'colorspace'
452+
// parameter is deprecated and should be equal to WEBP_YUV420.
450453
// Upon return, picture->use_argb is set to false. The presence of real
451454
// non-opaque transparent values is detected, and 'colorspace' will be
452455
// adjusted accordingly. Note that this method is lossy.
453456
// Returns false in case of error.
454457
WEBP_EXTERN(int) WebPPictureARGBToYUVA(WebPPicture* picture,
455-
WebPEncCSP colorspace);
458+
WebPEncCSP /*colorspace = WEBP_YUV420*/);
456459

457460
// Same as WebPPictureARGBToYUVA(), but the conversion is done using
458461
// pseudo-random dithering with a strength 'dithering' between
@@ -461,6 +464,15 @@ WEBP_EXTERN(int) WebPPictureARGBToYUVA(WebPPicture* picture,
461464
WEBP_EXTERN(int) WebPPictureARGBToYUVADithered(
462465
WebPPicture* picture, WebPEncCSP colorspace, float dithering);
463466

467+
#if WEBP_ENCODER_ABI_VERSION > 0x0204
468+
// Performs 'smart' RGBA->YUVA420 downsampling and colorspace conversion.
469+
// Downsampling is handled with extra care in case of color clipping. This
470+
// method is roughly 2x slower than WebPPictureARGBToYUVA() but produces better
471+
// YUV representation.
472+
// Returns false in case of error.
473+
WEBP_EXTERN(int) WebPPictureSmartARGBToYUVA(WebPPicture* picture);
474+
#endif
475+
464476
// Converts picture->yuv to picture->argb and sets picture->use_argb to true.
465477
// The input format must be YUV_420 or YUV_420A.
466478
// Note that the use of this method is discouraged if one has access to the

0 commit comments

Comments
 (0)