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

Unified Diff: core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/opj_malloc.h

Issue 589243004: Update openjpeg (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Update to openjpeg r2891 Created 6 years, 3 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 side-by-side diff with in-line comments
Download patch
Index: core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/opj_malloc.h
diff --git a/core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/opj_malloc.h b/core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/opj_malloc.h
index f2fe82f1a319e9b1aa7b54d779be06d866c64f73..5007b0c9e237afc82c158bc50af622ac7964f978 100644
--- a/core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/opj_malloc.h
+++ b/core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/opj_malloc.h
@@ -50,7 +50,6 @@ Allocate an uninitialized memory block
@param size Bytes to allocate
@return Returns a void pointer to the allocated space, or NULL if there is insufficient memory available
*/
-
#ifdef ALLOC_PERF_OPT
void * OPJ_CALLCONV opj_malloc(size_t size);
#else
@@ -161,6 +160,7 @@ void * OPJ_CALLCONV opj_realloc(void * m, size_t s);
#else
#define opj_realloc(m, s) realloc(m, s)
#endif
+#endif
/**
Deallocates or frees a memory block.
@@ -175,10 +175,11 @@ void OPJ_CALLCONV opj_free(void * m);
#ifdef __GNUC__
#pragma GCC poison malloc calloc realloc free
#endif
-#endif
+
/* ----------------------------------------------------------------------- */
/*@}*/
/*@}*/
#endif /* __OPJ_MALLOC_H */
+
« no previous file with comments | « core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/opj_config_private.h ('k') | core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/pi.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698