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

Side by Side Diff: core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/opj_includes.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) 2005, Herve Drolon, FreeImage Team 7 * Copyright (c) 2005, Herve Drolon, FreeImage Team
8 * Copyright (c) 2008, 2011-2012, Centre National d'Etudes Spatiales (CNES), FR 8 * Copyright (c) 2008, 2011-2012, Centre National d'Etudes Spatiales (CNES), FR
9 * Copyright (c) 2012, CS Systemes d'Information, France 9 * Copyright (c) 2012, CS Systemes d'Information, France
10 * All rights reserved. 10 * All rights reserved.
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 _asm{ 129 _asm{
130 fld f 130 fld f
131 fistp i 131 fistp i
132 }; 132 };
133 133
134 return i; 134 return i;
135 #endif 135 #endif
136 } 136 }
137 #endif 137 #endif
138 138
139 #if defined(_MSC_VER) && (_MSC_VER < 1400)
140 #define vsnprintf _vsnprintf
141 #endif
142
139 #include "opj_inttypes.h" 143 #include "opj_inttypes.h"
140 #include "opj_clock.h" 144 #include "opj_clock.h"
141 #include "opj_malloc.h" 145 #include "opj_malloc.h"
142 #include "function_list.h" 146 #include "function_list.h"
143 #include "event.h" 147 #include "event.h"
144 #include "bio.h" 148 #include "bio.h"
145 #include "cio.h" 149 #include "cio.h"
146 150
147 #include "image.h" 151 #include "image.h"
148 #include "invert.h" 152 #include "invert.h"
(...skipping 22 matching lines...) Expand all
171 #ifdef USE_JPWL 175 #ifdef USE_JPWL
172 #include "openjpwl/jpwl.h" 176 #include "openjpwl/jpwl.h"
173 #endif /* USE_JPWL */ 177 #endif /* USE_JPWL */
174 /* <<JPWL */ 178 /* <<JPWL */
175 179
176 /* V2 */ 180 /* V2 */
177 #include "opj_codec.h" 181 #include "opj_codec.h"
178 182
179 183
180 #endif /* OPJ_INCLUDES_H */ 184 #endif /* OPJ_INCLUDES_H */
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698