diff options
| author | Mickael Savinaud <savmickael@users.noreply.github.com> | 2011-08-10 09:33:33 +0000 |
|---|---|---|
| committer | Mickael Savinaud <savmickael@users.noreply.github.com> | 2011-08-10 09:33:33 +0000 |
| commit | 7812030886663e64bc6cae27dec153eded3de6d7 (patch) | |
| tree | ae707df3878bec0424615abf7c84066aa02e1057 | |
| parent | 6fb9794200d0d096ef2ee8734fd10c920cc0febe (diff) | |
moved the definition of OPJ_ARG_NOT_USED from opj_includes.h to openjpeg.h
| -rw-r--r-- | CHANGES | 1 | ||||
| -rw-r--r-- | libopenjpeg/openjpeg.h | 2 | ||||
| -rw-r--r-- | libopenjpeg/opj_includes.h | 3 |
3 files changed, 3 insertions, 3 deletions
@@ -10,6 +10,7 @@ August 10, 2011 ! [mickael] add copyright header into new test functions. * [mickael] fixed glibc error with broken2 and broken4 images. * [mickael] fixed segfault with 123.j2c and bug.j2c images (thanks to Tim Mattox for his improvement). +! [mickael] moved the definition of OPJ_ARG_NOT_USED from opj_includes.h to openjpeg.h August 9, 2011 - [antonin] removed xcode project files (cmake and autotools are now the only supported build methods) diff --git a/libopenjpeg/openjpeg.h b/libopenjpeg/openjpeg.h index dfc4dc64..c46d896f 100644 --- a/libopenjpeg/openjpeg.h +++ b/libopenjpeg/openjpeg.h @@ -63,6 +63,8 @@ typedef int opj_bool; #define OPJ_TRUE 1 #define OPJ_FALSE 0 +// Avoid compile-time warning because parameter is not used +#define OPJ_ARG_NOT_USED(x) (void)(x) /* ========================================================== Useful constant definitions diff --git a/libopenjpeg/opj_includes.h b/libopenjpeg/opj_includes.h index 8da9dbdc..53a0c4a7 100644 --- a/libopenjpeg/opj_includes.h +++ b/libopenjpeg/opj_includes.h @@ -104,9 +104,6 @@ static INLINE long lrintf(float f){ } #endif -// Avoid compile-time warning because parameter is not used -#define OPJ_ARG_NOT_USED(x) (void)(x) - #include "j2k_lib.h" #include "opj_malloc.h" #include "event.h" |