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

Side by Side Diff: core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/cio.c

Issue 589243004: Update openjpeg (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Update to openjpeg r2891 Created 6 years, 2 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 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 OPJ_BYTE * l_data_ptr = ((OPJ_BYTE *) p_value) + sizeof(OPJ_FLOAT32)-1; 144 OPJ_BYTE * l_data_ptr = ((OPJ_BYTE *) p_value) + sizeof(OPJ_FLOAT32)-1;
145 OPJ_UINT32 i; 145 OPJ_UINT32 i;
146 for (i=0;i<sizeof(OPJ_FLOAT32);++i) { 146 for (i=0;i<sizeof(OPJ_FLOAT32);++i) {
147 *(l_data_ptr--) = *(p_buffer++); 147 *(l_data_ptr--) = *(p_buffer++);
148 } 148 }
149 } 149 }
150 150
151 opj_stream_t* OPJ_CALLCONV opj_stream_create(OPJ_SIZE_T p_buffer_size,OPJ_BOOL l _is_input) 151 opj_stream_t* OPJ_CALLCONV opj_stream_create(OPJ_SIZE_T p_buffer_size,OPJ_BOOL l _is_input)
152 { 152 {
153 opj_stream_private_t * l_stream = 00; 153 opj_stream_private_t * l_stream = 00;
154 » l_stream = (opj_stream_private_t*) opj_malloc(sizeof(opj_stream_private_ t)); 154 » l_stream = (opj_stream_private_t*) opj_calloc(1,sizeof(opj_stream_privat e_t));
155 if (! l_stream) { 155 if (! l_stream) {
156 return 00; 156 return 00;
157 } 157 }
158 158
159 memset(l_stream,0,sizeof(opj_stream_private_t));
160 l_stream->m_buffer_size = p_buffer_size; 159 l_stream->m_buffer_size = p_buffer_size;
161 l_stream->m_stored_data = (OPJ_BYTE *) opj_malloc(p_buffer_size); 160 l_stream->m_stored_data = (OPJ_BYTE *) opj_malloc(p_buffer_size);
162 if (! l_stream->m_stored_data) { 161 if (! l_stream->m_stored_data) {
163 opj_free(l_stream); 162 opj_free(l_stream);
164 return 00; 163 return 00;
165 } 164 }
166 165
167 l_stream->m_current_data = l_stream->m_stored_data; 166 l_stream->m_current_data = l_stream->m_stored_data;
168 167
169 if (l_is_input) { 168 if (l_is_input) {
(...skipping 27 matching lines...) Expand all
197 if (l_stream) { 196 if (l_stream) {
198 if (l_stream->m_free_user_data_fn) { 197 if (l_stream->m_free_user_data_fn) {
199 l_stream->m_free_user_data_fn(l_stream->m_user_data); 198 l_stream->m_free_user_data_fn(l_stream->m_user_data);
200 } 199 }
201 opj_free(l_stream->m_stored_data); 200 opj_free(l_stream->m_stored_data);
202 l_stream->m_stored_data = 00; 201 l_stream->m_stored_data = 00;
203 opj_free(l_stream); 202 opj_free(l_stream);
204 } 203 }
205 } 204 }
206 205
207 void OPJ_CALLCONV opj_stream_destroy_v3(opj_stream_t* p_stream)
208 {
209 opj_stream_destroy(p_stream);
210 }
211
212 void OPJ_CALLCONV opj_stream_set_read_function(opj_stream_t* p_stream, opj_strea m_read_fn p_function) 206 void OPJ_CALLCONV opj_stream_set_read_function(opj_stream_t* p_stream, opj_strea m_read_fn p_function)
213 { 207 {
214 opj_stream_private_t* l_stream = (opj_stream_private_t*) p_stream; 208 opj_stream_private_t* l_stream = (opj_stream_private_t*) p_stream;
215 209
216 if ((!l_stream) || (! (l_stream->m_status & opj_stream_e_input))) { 210 if ((!l_stream) || (! (l_stream->m_status & opj_stream_e_input))) {
217 return; 211 return;
218 } 212 }
219 213
220 l_stream->m_read_fn = p_function; 214 l_stream->m_read_fn = p_function;
221 } 215 }
(...skipping 23 matching lines...) Expand all
245 { 239 {
246 opj_stream_private_t* l_stream = (opj_stream_private_t*) p_stream; 240 opj_stream_private_t* l_stream = (opj_stream_private_t*) p_stream;
247 241
248 if (! l_stream) { 242 if (! l_stream) {
249 return; 243 return;
250 } 244 }
251 245
252 l_stream->m_skip_fn = p_function; 246 l_stream->m_skip_fn = p_function;
253 } 247 }
254 248
255 void OPJ_CALLCONV opj_stream_set_user_data(opj_stream_t* p_stream, void * p_data ) 249 void OPJ_CALLCONV opj_stream_set_user_data(opj_stream_t* p_stream, void * p_data , opj_stream_free_user_data_fn p_function)
256 { 250 {
257 opj_stream_private_t* l_stream = (opj_stream_private_t*) p_stream; 251 opj_stream_private_t* l_stream = (opj_stream_private_t*) p_stream;
258 if (!l_stream) 252 if (!l_stream)
259 return;
260 l_stream->m_user_data = p_data;
261 }
262
263 void OPJ_CALLCONV opj_stream_set_user_data_v3(opj_stream_t* p_stream, void * p_d ata, opj_stream_free_user_data_fn p_function)
264 {
265 opj_stream_private_t* l_stream = (opj_stream_private_t*) p_stream;
266 if (!l_stream)
267 return; 253 return;
268 l_stream->m_user_data = p_data; 254 l_stream->m_user_data = p_data;
269 l_stream->m_free_user_data_fn = p_function; 255 l_stream->m_free_user_data_fn = p_function;
270 } 256 }
271 257
272 void OPJ_CALLCONV opj_stream_set_user_data_length(opj_stream_t* p_stream, OPJ_UI NT64 data_length) 258 void OPJ_CALLCONV opj_stream_set_user_data_length(opj_stream_t* p_stream, OPJ_UI NT64 data_length)
273 { 259 {
274 opj_stream_private_t* l_stream = (opj_stream_private_t*) p_stream; 260 opj_stream_private_t* l_stream = (opj_stream_private_t*) p_stream;
275 if (!l_stream) 261 if (!l_stream)
276 return; 262 return;
(...skipping 372 matching lines...) Expand 10 before | Expand all | Expand 10 after
649 OPJ_ARG_NOT_USED(p_user_data); 635 OPJ_ARG_NOT_USED(p_user_data);
650 return (OPJ_OFF_T) -1; 636 return (OPJ_OFF_T) -1;
651 } 637 }
652 638
653 OPJ_BOOL opj_stream_default_seek (OPJ_OFF_T p_nb_bytes, void * p_user_data) 639 OPJ_BOOL opj_stream_default_seek (OPJ_OFF_T p_nb_bytes, void * p_user_data)
654 { 640 {
655 OPJ_ARG_NOT_USED(p_nb_bytes); 641 OPJ_ARG_NOT_USED(p_nb_bytes);
656 OPJ_ARG_NOT_USED(p_user_data); 642 OPJ_ARG_NOT_USED(p_user_data);
657 return OPJ_FALSE; 643 return OPJ_FALSE;
658 } 644 }
OLDNEW
« no previous file with comments | « core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/cio.h ('k') | core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/dwt.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698