Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(548)

Side by Side Diff: core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/openjpeg.h

Issue 960183004: Upgrade openjpeg to revision 2997. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * The copyright in this software is being made available under the 2-clauses 2 * The copyright in this software is being made available under the 2-clauses
3 * BSD License, included below. This software may be subject to other third 3 * BSD License, included below. This software may be subject to other third
4 * party and contributor rights, including patent rights, and no such rights 4 * party and contributor rights, including patent rights, and no such rights
5 * are granted under this license. 5 * are granted under this license.
6 * 6 *
7 * Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium 7 * Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium
8 * Copyright (c) 2002-2014, Professor Benoit Macq 8 * Copyright (c) 2002-2014, Professor Benoit Macq
9 * Copyright (c) 2001-2003, David Janssens 9 * Copyright (c) 2001-2003, David Janssens
10 * Copyright (c) 2002-2003, Yannick Verschueren 10 * Copyright (c) 2002-2003, Yannick Verschueren
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 /* deprecated attribute */ 69 /* deprecated attribute */
70 #ifdef __GNUC__ 70 #ifdef __GNUC__
71 #define OPJ_DEPRECATED(func) func __attribute__ ((deprecated)) 71 #define OPJ_DEPRECATED(func) func __attribute__ ((deprecated))
72 #elif defined(_MSC_VER) 72 #elif defined(_MSC_VER)
73 #define OPJ_DEPRECATED(func) __declspec(deprecated) func 73 #define OPJ_DEPRECATED(func) __declspec(deprecated) func
74 #else 74 #else
75 #pragma message("WARNING: You need to implement DEPRECATED for this comp iler") 75 #pragma message("WARNING: You need to implement DEPRECATED for this comp iler")
76 #define OPJ_DEPRECATED(func) func 76 #define OPJ_DEPRECATED(func) func
77 #endif 77 #endif
78 78
79 // PDFium doesn't need to export any of these methods. 79 #if defined(OPJ_STATIC) || !defined(_WIN32)
80 #define OPJ_API 80 /* http://gcc.gnu.org/wiki/Visibility */
81 #define OPJ_LOCAL 81 #» if __GNUC__ >= 4
82 #define OPJ_CALLCONV 82 #» » if defined(OPJ_STATIC) /* static library uses "hidden" */
83 #» » » define OPJ_API __attribute__ ((visibility ("hidden")) )
84 #» » else
85 #» » » define OPJ_API __attribute__ ((visibility ("default") ))
86 #» » endif
87 #» » define OPJ_LOCAL __attribute__ ((visibility ("hidden")))
88 #» else
89 #» » define OPJ_API
90 #» » define OPJ_LOCAL
91 #» endif
92 #» define OPJ_CALLCONV
93 #else
94 #» define OPJ_CALLCONV __stdcall
95 /*
96 The following ifdef block is the standard way of creating macros which make expo rting
97 from a DLL simpler. All files within this DLL are compiled with the OPJ_EXPORTS
98 symbol defined on the command line. this symbol should not be defined on any pro ject
99 that uses this DLL. This way any other project whose source files include this f ile see
100 OPJ_API functions as being imported from a DLL, wheras this DLL sees symbols
101 defined with this macro as being exported.
102 */
103 #» if defined(OPJ_EXPORTS) || defined(DLL_EXPORT)
104 #» » define OPJ_API __declspec(dllexport)
105 #» else
106 #» » define OPJ_API __declspec(dllimport)
107 #» endif /* OPJ_EXPORTS */
108 #endif /* !OPJ_STATIC || !_WIN32 */
83 109
84 typedef int OPJ_BOOL; 110 typedef int OPJ_BOOL;
85 #define OPJ_TRUE 1 111 #define OPJ_TRUE 1
86 #define OPJ_FALSE 0 112 #define OPJ_FALSE 0
87 113
88 typedef char OPJ_CHAR; 114 typedef char OPJ_CHAR;
89 typedef float OPJ_FLOAT32; 115 typedef float OPJ_FLOAT32;
90 typedef double OPJ_FLOAT64; 116 typedef double OPJ_FLOAT64;
91 typedef unsigned char OPJ_BYTE; 117 typedef unsigned char OPJ_BYTE;
92 118
(...skipping 1435 matching lines...) Expand 10 before | Expand all | Expand 10 after
1528 OPJ_INT32 * p_dc_shift, 1554 OPJ_INT32 * p_dc_shift,
1529 OPJ_UINT32 pNbComp); 1555 OPJ_UINT32 pNbComp);
1530 1556
1531 1557
1532 1558
1533 #ifdef __cplusplus 1559 #ifdef __cplusplus
1534 } 1560 }
1535 #endif 1561 #endif
1536 1562
1537 #endif /* OPENJPEG_H */ 1563 #endif /* OPENJPEG_H */
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698