From 769982d058d8af8b2b4d5fa24bda35440bc0cde5 Mon Sep 17 00:00:00 2001
From: Julien Malik <julien.malik@paraiso.me>
Date: Sun, 27 Nov 2011 21:57:16 +0000
Subject: [PATCH] [trunk] clean up redundant includes already handled in
 opj_includes.h

---
 CHANGES                        | 1 +
 libopenjpeg/cidx_manager.c     | 2 --
 libopenjpeg/function_list.c    | 4 ----
 libopenjpeg/phix_manager.c     | 2 --
 libopenjpeg/ppix_manager.c     | 3 ---
 libopenjpeg/t1_generate_luts.c | 1 -
 libopenjpeg/thix_manager.c     | 3 ---
 libopenjpeg/tpix_manager.c     | 1 -
 8 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/CHANGES b/CHANGES
index 74ac2825..cf0214e2 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,7 @@ What's New for OpenJPEG
 + : added
 
 November 27, 2011
+* [jmalik] clean up redundant includes already handled in opj_includes.h
 * [jmalik] reverted changeset 1091 (see issue #103)
 
 November 24, 2011
diff --git a/libopenjpeg/cidx_manager.c b/libopenjpeg/cidx_manager.c
index b2ca1907..4b1c242c 100644
--- a/libopenjpeg/cidx_manager.c
+++ b/libopenjpeg/cidx_manager.c
@@ -29,8 +29,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <stdio.h>
-#include <stdlib.h>
 #include "opj_includes.h"
 
 
diff --git a/libopenjpeg/function_list.c b/libopenjpeg/function_list.c
index 206458ae..10a3baf3 100644
--- a/libopenjpeg/function_list.c
+++ b/libopenjpeg/function_list.c
@@ -24,10 +24,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-//#include "function_list.h"
-//#include "opj_includes.h"
-//#include "opj_malloc.h"
-
 #include "opj_includes.h"
 
 /**
diff --git a/libopenjpeg/phix_manager.c b/libopenjpeg/phix_manager.c
index 2d06aaf9..3b1d64eb 100644
--- a/libopenjpeg/phix_manager.c
+++ b/libopenjpeg/phix_manager.c
@@ -33,8 +33,6 @@
  *  \brief Modification of jpip.c from 2KAN indexer
  */
 
-#include <stdlib.h>
-#include <math.h>
 #include "opj_includes.h"
 
 
diff --git a/libopenjpeg/ppix_manager.c b/libopenjpeg/ppix_manager.c
index 41f6d0b4..f4c077aa 100644
--- a/libopenjpeg/ppix_manager.c
+++ b/libopenjpeg/ppix_manager.c
@@ -33,9 +33,6 @@
  *  \brief Modification of jpip.c from 2KAN indexer
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
 #include "opj_includes.h"
 
 /* 
diff --git a/libopenjpeg/t1_generate_luts.c b/libopenjpeg/t1_generate_luts.c
index 39880414..ffeff03e 100644
--- a/libopenjpeg/t1_generate_luts.c
+++ b/libopenjpeg/t1_generate_luts.c
@@ -31,7 +31,6 @@
  */
 
 #include "opj_includes.h"
-#include <math.h>
 
 static int t1_init_ctxno_zc(int f, int orient) {
 	int h, v, d, n, t, hv;
diff --git a/libopenjpeg/thix_manager.c b/libopenjpeg/thix_manager.c
index 3dd0be01..e1b8ab1b 100644
--- a/libopenjpeg/thix_manager.c
+++ b/libopenjpeg/thix_manager.c
@@ -33,9 +33,6 @@
  *  \brief Modification of jpip.c from 2KAN indexer
  */
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
 #include "opj_includes.h"
 
 /* 
diff --git a/libopenjpeg/tpix_manager.c b/libopenjpeg/tpix_manager.c
index c9133d53..9ae78333 100644
--- a/libopenjpeg/tpix_manager.c
+++ b/libopenjpeg/tpix_manager.c
@@ -33,7 +33,6 @@
  *  \brief Modification of jpip.c from 2KAN indexer
  */
 
-#include <math.h>
 #include "opj_includes.h"
 
 #define MAX(a,b) ((a)>(b)?(a):(b))