diff options
| author | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2012-01-30 09:17:57 +0000 |
|---|---|---|
| committer | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2012-01-30 09:17:57 +0000 |
| commit | 8e53bad7fb67359a4de7c62b2790aa383c047edd (patch) | |
| tree | 056a2009cb7dddf90a525452108a93614b48e99b | |
| parent | 9c51a37dbfbe89c46551bf457f05fec9b9a0492e (diff) | |
Another pass at getting this code to compile on windows
| -rw-r--r-- | applications/jpip/libopenjpip/index_manager.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/applications/jpip/libopenjpip/index_manager.c b/applications/jpip/libopenjpip/index_manager.c index 5a590fa2..db5cb52d 100644 --- a/applications/jpip/libopenjpip/index_manager.c +++ b/applications/jpip/libopenjpip/index_manager.c @@ -652,6 +652,13 @@ bool set_CODmkrdata( markeridx_param_t *codmkidx, codestream_param_t codestream, } +/* very very generic name see NOMINMAX */ +#ifdef min +#undef min +#endif +#ifdef max +#undef max +#endif Byte4_t max( Byte4_t n1, Byte4_t n2); Byte4_t min( Byte4_t n1, Byte4_t n2); @@ -698,6 +705,7 @@ Byte4_t get_tile_YSiz( SIZmarker_param_t SIZ, Byte4_t tile_id, int level) return tile_Yrange.maxvalue - tile_Yrange.minvalue; } +/* TODO: what is this code doing ? will all compiler be able to optimize the following ? */ Byte4_t max( Byte4_t n1, Byte4_t n2) { if( n1 < n2) |