Include-what-you-use and removed (some few) unnecessary includes.

strukturag · Jan 17, 2017 · 51318e3 · 51318e3
1 parent 476b3ed
commit 51318e3
Show file tree

Hide file tree

Showing 40 changed files with 46 additions and 15 deletions.
diff --git a/libde265/configparam.h b/libde265/configparam.h
@@ -27,6 +27,7 @@
 #include "util.h"
 
 #include <climits>
+#include <utility>
 #include <vector>
 #include <string>
 #include <stddef.h>

diff --git a/libde265/deblock.cc b/libde265/deblock.cc
@@ -26,6 +26,9 @@
 
 #include <assert.h>
 
+#include <algorithm>
+#include <memory>
+#include <string>
 
 
 // 8.7.2.1 for both EDGE_HOR and EDGE_VER at the same time

diff --git a/libde265/decctx.cc b/libde265/decctx.cc
@@ -51,7 +51,8 @@
 #include "visualize.h"
 #endif
 
-#include <iostream> // TODO TMP
+#include <algorithm>
+#include <string>
 
 extern void thread_decode_CTB_row(void* d);
 extern void thread_decode_slice_segment(void* d);

diff --git a/libde265/decctx.h b/libde265/decctx.h
@@ -38,7 +38,9 @@
 #include "libde265/frame-dropper.h"
 #include "libde265/frontend-syntax-decoder.h"
 
+#include <deque>
 #include <memory>
+#include <vector>
 
 #define DE265_MAX_VPS_SETS 16   // this is the maximum as defined in the standard
 #define DE265_MAX_SPS_SETS 16   // this is the maximum as defined in the standard

diff --git a/libde265/dpb.h b/libde265/dpb.h
@@ -25,6 +25,7 @@
 #include "libde265/sps.h"
 
 #include <deque>
+#include <memory>
 #include <vector>
 
 class decoder_context;

diff --git a/libde265/encoder/algo/cb-intrapartmode.cc b/libde265/encoder/algo/cb-intrapartmode.cc
@@ -27,7 +27,6 @@
 #include <assert.h>
 #include <limits>
 #include <math.h>
-#include <iostream>
 
 
 #define ENCODER_DEVELOPMENT 1

diff --git a/libde265/encoder/algo/cb-mergeindex.cc b/libde265/encoder/algo/cb-mergeindex.cc
@@ -27,7 +27,7 @@
 #include <assert.h>
 #include <limits>
 #include <math.h>
-
+#include <memory>
 
 
 

diff --git a/libde265/encoder/algo/cb-split.cc b/libde265/encoder/algo/cb-split.cc
@@ -28,7 +28,6 @@
 #include <assert.h>
 #include <limits>
 #include <math.h>
-#include <iostream>
 
 
 // Utility function to encode all four children in a splitted CB.

diff --git a/libde265/encoder/algo/coding-options.cc b/libde265/encoder/algo/coding-options.cc
@@ -20,6 +20,8 @@
  * along with libde265.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <utility>
+
 #include "libde265/encoder/algo/coding-options.h"
 #include "libde265/encoder/encoder-context.h"
 

diff --git a/libde265/encoder/algo/coding-options.h b/libde265/encoder/algo/coding-options.h
@@ -23,6 +23,8 @@
 #ifndef CODING_OPTIONS_H
 #define CODING_OPTIONS_H
 
+#include <vector>
+
 #include "libde265/encoder/encoder-types.h"
 
 

diff --git a/libde265/encoder/algo/pb-mv.cc b/libde265/encoder/algo/pb-mv.cc
@@ -27,6 +27,7 @@
 #include <assert.h>
 #include <limits>
 #include <math.h>
+#include <memory>
 
 
 

diff --git a/libde265/encoder/algo/tb-intrapredmode.cc b/libde265/encoder/algo/tb-intrapredmode.cc
@@ -28,7 +28,6 @@
 #include <limits>
 #include <math.h>
 #include <algorithm>
-#include <iostream>
 
 
 float get_intra_pred_mode_bits(const enum IntraPredMode candidates[3],

diff --git a/libde265/encoder/algo/tb-intrapredmode.h b/libde265/encoder/algo/tb-intrapredmode.h
@@ -23,6 +23,8 @@
 #ifndef TB_INTRAPREDMODE_H
 #define TB_INTRAPREDMODE_H
 
+#include <memory>
+
 #include "libde265/nal-parser.h"
 #include "libde265/decctx.h"
 #include "libde265/encoder/encoder-types.h"

diff --git a/libde265/encoder/algo/tb-rateestim.cc b/libde265/encoder/algo/tb-rateestim.cc
@@ -24,7 +24,6 @@
 #include "libde265/encoder/algo/tb-rateestim.h"
 #include "libde265/encoder/encoder-syntax.h"
 #include <assert.h>
-#include <iostream>
 
 
 float Algo_TB_RateEstimation_Exact::encode_transform_unit(encoder_context* ectx,

diff --git a/libde265/encoder/algo/tb-split.cc b/libde265/encoder/algo/tb-split.cc
@@ -28,7 +28,6 @@
 #include <assert.h>
 #include <limits>
 #include <math.h>
-#include <iostream>
 
 
 struct Logging_TB_Split : public Logging

diff --git a/libde265/encoder/algo/tb-split.h b/libde265/encoder/algo/tb-split.h
@@ -23,6 +23,8 @@
 #ifndef TB_SPLIT_H
 #define TB_SPLIT_H
 
+#include <memory>
+
 #include "libde265/nal-parser.h"
 #include "libde265/decctx.h"
 #include "libde265/encoder/encoder-types.h"

diff --git a/libde265/encoder/algo/tb-transform.cc b/libde265/encoder/algo/tb-transform.cc
@@ -28,7 +28,6 @@
 #include <assert.h>
 #include <limits>
 #include <math.h>
-#include <iostream>
 
 
 // DEPRECATED IN THIS FILE

diff --git a/libde265/encoder/encoder-context.cc b/libde265/encoder/encoder-context.cc
@@ -25,6 +25,7 @@
 #include "libde265/util.h"
 #include "libde265/image.h"
 
+#include <limits>
 #include <math.h>
 
 #define ENCODER_DEVELOPMENT 0

diff --git a/libde265/encoder/encoder-context.h b/libde265/encoder/encoder-context.h
@@ -32,6 +32,7 @@
 #include "libde265/en265.h"
 #include "libde265/util.h"
 
+#include <deque>
 #include <memory>
 
 

diff --git a/libde265/encoder/encoder-params.cc b/libde265/encoder/encoder-params.cc
@@ -20,6 +20,8 @@
  * along with libde265.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <vector>
+
 #include "encoder-params.h"
 
 

diff --git a/libde265/encoder/encoder-syntax.cc b/libde265/encoder/encoder-syntax.cc
@@ -27,7 +27,8 @@
 #include "intrapred.h"
 #include "libde265/transform.h"
 #include "libde265/fallback-dct.h"
-#include <iostream>
+#include <algorithm>
+#include <utility>
 
 
 #ifdef DE265_LOG_DEBUG

diff --git a/libde265/encoder/encoder-types.cc b/libde265/encoder/encoder-types.cc
@@ -28,6 +28,7 @@
 #include "libde265/transform.h"
 #include "libde265/fallback-dct.h"
 #include <iostream>
+#include <string>
 
 
 int allocTB = 0;

diff --git a/libde265/encoder/encoder-types.h b/libde265/encoder/encoder-types.h
@@ -29,6 +29,7 @@
 #include "libde265/alloc_pool.h"
 
 #include <memory>
+#include <vector>
 
 class encoder_context;
 class enc_cb;

diff --git a/libde265/encoder/encpicbuf.h b/libde265/encoder/encpicbuf.h
@@ -25,6 +25,7 @@
 #include "libde265/sps.h"
 
 #include <deque>
+#include <memory>
 #include <vector>
 
 

diff --git a/libde265/fallback-dct.cc b/libde265/fallback-dct.cc
@@ -28,7 +28,7 @@
 
 #include <assert.h>
 #include <algorithm>
-
+#include <utility>
 
 #define D 0
 

diff --git a/libde265/frame-dropper.h b/libde265/frame-dropper.h
@@ -35,6 +35,7 @@
 #include "libde265/image-unit.h"
 
 #include <memory>
+#include <vector>
 #include <deque>
 
 

diff --git a/libde265/image-unit.h b/libde265/image-unit.h
@@ -36,6 +36,7 @@
 #include "libde265/nal-parser.h"
 
 #include <memory>
+#include <vector>
 
 #define DE265_MAX_VPS_SETS 16   // this is the maximum as defined in the standard
 #define DE265_MAX_SPS_SETS 16   // this is the maximum as defined in the standard

diff --git a/libde265/image.cc b/libde265/image.cc
@@ -27,7 +27,7 @@
 #include <assert.h>
 
 #include <limits>
-
+#include <utility>
 
 #ifdef HAVE_MALLOC_H
 #include <malloc.h>

diff --git a/libde265/image.h b/libde265/image.h
@@ -30,6 +30,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <memory>
+#include <vector>
 #ifdef HAVE_STDBOOL_H
 #include <stdbool.h>
 #endif

diff --git a/libde265/intrapred.cc b/libde265/intrapred.cc
@@ -23,7 +23,7 @@
 #include "util.h"
 #include "encoder/encoder-types.h"
 #include <assert.h>
-
+#include <utility>
 
 #include <sys/types.h>
 #include <string.h>

diff --git a/libde265/motion.cc b/libde265/motion.cc
@@ -27,7 +27,7 @@
 #include "funcs.h"
 
 #include <assert.h>
-
+#include <memory>
 
 #include <sys/types.h>
 #include <signal.h>

diff --git a/libde265/nal-parser.h b/libde265/nal-parser.h
@@ -26,6 +26,7 @@
 #include "libde265/nal.h"
 #include "libde265/util.h"
 
+#include <memory>
 #include <vector>
 #include <queue>
 

diff --git a/libde265/pps.h b/libde265/pps.h
@@ -26,6 +26,7 @@
 #include "libde265/sps.h" // for scaling list only
 
 #include <vector>
+#include <string>
 #include <memory>
 
 #define DE265_MAX_TILE_COLUMNS 10

diff --git a/libde265/refpic.cc b/libde265/refpic.cc
@@ -29,7 +29,7 @@
 #elif defined(HAVE_ALLOCA_H)
 # include <alloca.h>
 #endif
-
+#include <vector>
 
 void ref_pic_set::reset()
 {

diff --git a/libde265/sao.cc b/libde265/sao.cc
@@ -22,6 +22,8 @@
 #include "util.h"
 #include "image-unit.h"
 
+#include <memory>
+#include <string>
 #include <stdlib.h>
 #include <string.h>
 

diff --git a/libde265/slice.cc b/libde265/slice.cc
@@ -35,7 +35,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include <iostream>
+#include <utility>
 
 #define LOCK de265_mutex_lock(&ctx->thread_pool.mutex)
 #define UNLOCK de265_mutex_unlock(&ctx->thread_pool.mutex)

diff --git a/libde265/slice.h b/libde265/slice.h
@@ -32,6 +32,7 @@
 #include "contextmodel.h"
 
 #include <vector>
+#include <string>
 #include <string.h>
 #include <memory>
 

diff --git a/libde265/sps.h b/libde265/sps.h
@@ -30,6 +30,7 @@
 
 #include <vector>
 #include <sstream>
+#include <string>
 
 class error_queue;
 

diff --git a/libde265/util.h b/libde265/util.h
@@ -30,8 +30,10 @@
 #endif
 
 #include <stdio.h>
+#include <memory>
 #include <string>
 #include <sstream>
+#include <utility>
 
 #include "libde265/de265.h"
 

diff --git a/libde265/vps.h b/libde265/vps.h
@@ -33,6 +33,7 @@
 #include "libde265/de265.h"
 #include "libde265/cabac.h"
 
+#include <string>
 #include <vector>
 
 class error_queue;
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,6 +20,8 @@ @@
      * along with libde265.  If not, see <http://www.gnu.org/licenses/>.
      */
+    #include <vector>
     #include "encoder-params.h"
@@ Expand Down @@