minor changes in header inclusions

This commit is contained in:
Antonin Descampe 2010-11-15 11:08:03 +00:00
parent 2b7f6f82be
commit 709068ef5b
7 changed files with 9 additions and 6 deletions

View File

@ -6,6 +6,7 @@ What's New for OpenJPEG
+ : added + : added
November 15, 2010 November 15, 2010
* [antonin] minor changes in header inclusions
* [antonin] complete rewrite of opj_convert.c with correct values (from winfried) * [antonin] complete rewrite of opj_convert.c with correct values (from winfried)
November 11, 2010 November 11, 2010

View File

@ -29,12 +29,13 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
#include <opj_config.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include <math.h> #include <math.h>
#include "../opj_config.h"
#include "openjpeg.h" #include "openjpeg.h"
#include "compat/getopt.h" #include "compat/getopt.h"
#include "convert.h" #include "convert.h"

View File

@ -1,4 +1,3 @@
#include <opj_config.h>
/* /*
* Copyright (c) 20010, Mathieu Malaterre, GDCM * Copyright (c) 20010, Mathieu Malaterre, GDCM
* All rights reserved. * All rights reserved.
@ -30,6 +29,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <math.h> #include <math.h>
#include "../opj_config.h"
#include "openjpeg.h" #include "openjpeg.h"
#include "../libopenjpeg/j2k.h" #include "../libopenjpeg/j2k.h"
#include "../libopenjpeg/jp2.h" #include "../libopenjpeg/jp2.h"

View File

@ -29,12 +29,13 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
#include <opj_config.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include <math.h> #include <math.h>
#include "../opj_config.h"
#include "openjpeg.h" #include "openjpeg.h"
#include "compat/getopt.h" #include "compat/getopt.h"
#include "convert.h" #include "convert.h"

View File

@ -28,7 +28,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
#include <opj_config.h> #include "../opj_config.h"
#ifdef HAVE_LIBLCMS2 #ifdef HAVE_LIBLCMS2
#include <math.h> #include <math.h>
#include <lcms2.h> #include <lcms2.h>
@ -38,7 +38,6 @@
#include <lcms.h> #include <lcms.h>
#endif #endif
#include "opj_includes.h" #include "opj_includes.h"
#include "opj_convert.h"
/** @defgroup JP2 JP2 - JPEG-2000 file format reader/writer */ /** @defgroup JP2 JP2 - JPEG-2000 file format reader/writer */
/*@{*/ /*@{*/

View File

@ -1,4 +1,3 @@
#include <opj_config.h>
/* /*
* Copyright (c) 2005, Hervé Drolon, FreeImage Team * Copyright (c) 2005, Hervé Drolon, FreeImage Team
* All rights reserved. * All rights reserved.
@ -29,6 +28,7 @@
#include <windows.h> #include <windows.h>
#endif /* WIN32 */ #endif /* WIN32 */
#include "../opj_config.h"
#include "opj_includes.h" #include "opj_includes.h"
/* ---------------------------------------------------------------------- */ /* ---------------------------------------------------------------------- */

View File

@ -104,6 +104,7 @@ static INLINE long lrintf(float f){
} }
#endif #endif
#include "opj_convert.h"
#include "j2k_lib.h" #include "j2k_lib.h"
#include "opj_malloc.h" #include "opj_malloc.h"
#include "event.h" #include "event.h"