From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Thu, 23 Jan 2014 01:13:27 +0000 (+0100)
Subject: Another round of include-what-you-use.
X-Git-Tag: 1.0~57
X-Git-Url: https://git.sesse.net/?p=movit;a=commitdiff_plain;h=9651a4eaae012cdc49c1aa38197861e04f62e91e

Another round of include-what-you-use.
---

diff --git a/blur_effect_test.cpp b/blur_effect_test.cpp
index 1718e7d..4114bcb 100644
--- a/blur_effect_test.cpp
+++ b/blur_effect_test.cpp
@@ -1,4 +1,5 @@
 // Unit tests for BlurEffect.
+#include <GL/glew.h>
 #include <math.h>
 #include <string.h>
 
diff --git a/colorspace_conversion_effect.h b/colorspace_conversion_effect.h
index b21f72e..ab8a8aa 100644
--- a/colorspace_conversion_effect.h
+++ b/colorspace_conversion_effect.h
@@ -8,8 +8,8 @@
 // We don't do any fancy gamut mapping or similar; colors that are out-of-gamut
 // will simply stay out-of-gamut, and probably clip in the output stage.
 
-#include <string>
 #include <Eigen/Core>
+#include <string>
 
 #include "effect.h"
 #include "image_format.h"
diff --git a/deconvolution_sharpen_effect_test.cpp b/deconvolution_sharpen_effect_test.cpp
index 8daeb67..ba821ce 100644
--- a/deconvolution_sharpen_effect_test.cpp
+++ b/deconvolution_sharpen_effect_test.cpp
@@ -1,5 +1,6 @@
 // Unit tests for DeconvolutionSharpenEffect.
 
+#include <GL/glew.h>
 #include <math.h>
 #include <stdlib.h>
 
diff --git a/demo.cpp b/demo.cpp
index a425566..b401f05 100644
--- a/demo.cpp
+++ b/demo.cpp
@@ -21,7 +21,6 @@
 #include <setjmp.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <sys/time.h>
 #include <time.h>
 
diff --git a/diffusion_effect_test.cpp b/diffusion_effect_test.cpp
index 5558f4f..9faa7ba 100644
--- a/diffusion_effect_test.cpp
+++ b/diffusion_effect_test.cpp
@@ -1,5 +1,7 @@
 // Unit tests for DiffusionEffect.
 
+#include <GL/glew.h>
+
 #include "diffusion_effect.h"
 #include "effect_chain.h"
 #include "gtest/gtest.h"
diff --git a/dither_effect.cpp b/dither_effect.cpp
index 62355b2..14132bd 100644
--- a/dither_effect.cpp
+++ b/dither_effect.cpp
@@ -1,5 +1,6 @@
 #include <GL/glew.h>
 #include <assert.h>
+#include <stdio.h>
 #include <algorithm>
 
 #include "dither_effect.h"
diff --git a/effect.cpp b/effect.cpp
index 9cd611f..93ba41a 100644
--- a/effect.cpp
+++ b/effect.cpp
@@ -6,7 +6,6 @@
 
 #include "effect.h"
 #include "effect_util.h"
-#include "util.h"
 
 using namespace std;
 
diff --git a/effect_chain.cpp b/effect_chain.cpp
index d80c4f8..114670c 100644
--- a/effect_chain.cpp
+++ b/effect_chain.cpp
@@ -11,6 +11,7 @@
 #include <algorithm>
 #include <set>
 #include <stack>
+#include <utility>
 #include <vector>
 
 #include "alpha_division_effect.h"
diff --git a/effect_chain_test.cpp b/effect_chain_test.cpp
index fed8b91..ab71b4b 100644
--- a/effect_chain_test.cpp
+++ b/effect_chain_test.cpp
@@ -9,6 +9,7 @@
 #include "effect_chain.h"
 #include "flat_input.h"
 #include "gtest/gtest.h"
+#include "init.h"
 #include "input.h"
 #include "mirror_effect.h"
 #include "multiply_effect.h"
diff --git a/fft_pass_effect.cpp b/fft_pass_effect.cpp
index b3c3cf6..9e1b7b5 100644
--- a/fft_pass_effect.cpp
+++ b/fft_pass_effect.cpp
@@ -1,7 +1,8 @@
 #include <GL/glew.h>
+#include <math.h>
 
-#include "fft_pass_effect.h"
 #include "effect_util.h"
+#include "fft_pass_effect.h"
 #include "util.h"
 
 using namespace std;
diff --git a/fft_pass_effect.h b/fft_pass_effect.h
index b3e025b..f12bda7 100644
--- a/fft_pass_effect.h
+++ b/fft_pass_effect.h
@@ -50,8 +50,9 @@
 // scaling), and as fp16 has quite limited range at times, this can be relevant
 // on some GPUs for larger sizes.
 
-#include <stdio.h>
 #include <GL/glew.h>
+#include <assert.h>
+#include <stdio.h>
 #include <string>
 
 #include "effect.h"
diff --git a/fft_pass_effect_test.cpp b/fft_pass_effect_test.cpp
index 6a6406c..1d6693c 100644
--- a/fft_pass_effect_test.cpp
+++ b/fft_pass_effect_test.cpp
@@ -1,11 +1,14 @@
 // Unit tests for FFTPassEffect.
 
 #include <math.h>
+#include <stdlib.h>
+#include <string.h>
 
 #include "effect_chain.h"
+#include "fft_pass_effect.h"
+#include "glew.h"
 #include "gtest/gtest.h"
 #include "image_format.h"
-#include "fft_pass_effect.h"
 #include "multiply_effect.h"
 #include "test_util.h"
 
diff --git a/gamma_compression_effect.cpp b/gamma_compression_effect.cpp
index 3d4fd12..a90d67a 100644
--- a/gamma_compression_effect.cpp
+++ b/gamma_compression_effect.cpp
@@ -1,9 +1,7 @@
-#include <math.h>
-#include <string.h>
 #include <assert.h>
 
-#include "gamma_compression_effect.h"
 #include "effect_util.h"
+#include "gamma_compression_effect.h"
 #include "util.h"
 
 using namespace std;
diff --git a/gamma_compression_effect.h b/gamma_compression_effect.h
index 342e026..9577e02 100644
--- a/gamma_compression_effect.h
+++ b/gamma_compression_effect.h
@@ -9,6 +9,7 @@
 // Note that Movit's internal formats generally do not have enough accuracy
 // for 12-bit input or output.
 
+#include <GL/glew.h>
 #include <string>
 
 #include "effect.h"
diff --git a/gamma_compression_effect_test.cpp b/gamma_compression_effect_test.cpp
index 465d239..41a700c 100644
--- a/gamma_compression_effect_test.cpp
+++ b/gamma_compression_effect_test.cpp
@@ -5,9 +5,11 @@
 // However, the accuracy tests are somewhat simpler, since we
 // only need to care about absolute errors and not relative.
 
-#include <math.h>
 #include <GL/glew.h>
+#include <math.h>
+
 #include "gtest/gtest.h"
+#include "gtest/gtest-message.h"
 #include "image_format.h"
 #include "test_util.h"
 
diff --git a/gamma_expansion_effect.cpp b/gamma_expansion_effect.cpp
index f51dc21..696815e 100644
--- a/gamma_expansion_effect.cpp
+++ b/gamma_expansion_effect.cpp
@@ -1,4 +1,3 @@
-#include <math.h>
 #include <assert.h>
 
 #include "effect_util.h"
diff --git a/gamma_expansion_effect.h b/gamma_expansion_effect.h
index af0d0a9..92f0517 100644
--- a/gamma_expansion_effect.h
+++ b/gamma_expansion_effect.h
@@ -9,6 +9,7 @@
 // Note that Movit's internal formats generally do not have enough accuracy
 // for 12-bit input or output.
 
+#include <GL/glew.h>
 #include <string>
 
 #include "effect.h"
diff --git a/gamma_expansion_effect_test.cpp b/gamma_expansion_effect_test.cpp
index 452b46c..0e7670d 100644
--- a/gamma_expansion_effect_test.cpp
+++ b/gamma_expansion_effect_test.cpp
@@ -1,10 +1,11 @@
 // Unit tests for GammaExpansionEffect.
 
-#include <math.h>
 #include <GL/glew.h>
+#include <math.h>
 
 #include "gamma_expansion_effect.h"
 #include "gtest/gtest.h"
+#include "gtest/gtest-message.h"
 #include "test_util.h"
 
 TEST(GammaExpansionEffectTest, sRGB_KeyValues) {
diff --git a/glow_effect_test.cpp b/glow_effect_test.cpp
index b8eff4b..4570d6f 100644
--- a/glow_effect_test.cpp
+++ b/glow_effect_test.cpp
@@ -1,5 +1,6 @@
 // Unit tests for GlowEffect.
 
+#include <GL/glew.h>
 #include <math.h>
 
 #include "effect_chain.h"
diff --git a/lift_gamma_gain_effect_test.cpp b/lift_gamma_gain_effect_test.cpp
index 9850ba2..a9e866d 100644
--- a/lift_gamma_gain_effect_test.cpp
+++ b/lift_gamma_gain_effect_test.cpp
@@ -1,5 +1,7 @@
 // Unit tests for LiftGammaGainEffect.
 
+#include <GL/glew.h>
+
 #include "effect_chain.h"
 #include "gtest/gtest.h"
 #include "image_format.h"
diff --git a/multiply_effect.cpp b/multiply_effect.cpp
index 3e35810..e0fc534 100644
--- a/multiply_effect.cpp
+++ b/multiply_effect.cpp
@@ -1,5 +1,3 @@
-#include <GL/glew.h>
-
 #include "multiply_effect.h"
 #include "util.h"
 
diff --git a/padding_effect_test.cpp b/padding_effect_test.cpp
index c9c8ef1..36e7790 100644
--- a/padding_effect_test.cpp
+++ b/padding_effect_test.cpp
@@ -1,5 +1,6 @@
 // Unit tests for AlphaMultiplicationEffect.
 
+#include <GL/glew.h>
 #include <stddef.h>
 
 #include "effect_chain.h"
diff --git a/resample_effect_test.cpp b/resample_effect_test.cpp
index a9c6923..9525536 100644
--- a/resample_effect_test.cpp
+++ b/resample_effect_test.cpp
@@ -1,10 +1,11 @@
 // Unit tests for ResampleEffect.
 
+#include <GL/glew.h>
 #include <math.h>
-#include <iomanip>
 
 #include "effect_chain.h"
 #include "flat_input.h"
+#include "glew.h"
 #include "gtest/gtest.h"
 #include "image_format.h"
 #include "resample_effect.h"
diff --git a/resource_pool.cpp b/resource_pool.cpp
index b074247..81a6bd4 100644
--- a/resource_pool.cpp
+++ b/resource_pool.cpp
@@ -1,14 +1,15 @@
-#include "resource_pool.h"
-
-#include <stdio.h>
+#include <assert.h>
 #include <pthread.h>
-
+#include <stdio.h>
+#include <stdlib.h>
 #include <algorithm>
 #include <map>
 #include <string>
 #include <utility>
 
+#include "glew.h"
 #include "init.h"
+#include "resource_pool.h"
 #include "util.h"
 
 using namespace std;
diff --git a/resource_pool.h b/resource_pool.h
index 50e0da2..ae89d9f 100644
--- a/resource_pool.h
+++ b/resource_pool.h
@@ -16,12 +16,13 @@
 // safely called from multiple threads at the same time, provided they have
 // separate (but sharing) OpenGL contexts.
 
+#include <GL/glew.h>
+#include <pthread.h>
+#include <stddef.h>
 #include <list>
 #include <map>
 #include <string>
 #include <utility>
-#include <GL/glew.h>
-#include <pthread.h>
 
 class ResourcePool {
 public:
diff --git a/test_util.cpp b/test_util.cpp
index be34583..59c0ef4 100644
--- a/test_util.cpp
+++ b/test_util.cpp
@@ -1,11 +1,12 @@
 #include <assert.h>
-#include <gtest/gtest-message.h>
 #include <math.h>
 #include <stdio.h>
 #include <algorithm>
 
 #include "flat_input.h"
+#include "glew.h"
 #include "gtest/gtest.h"
+#include "gtest/gtest-message.h"
 #include "init.h"
 #include "resource_pool.h"
 #include "test_util.h"
diff --git a/unsharp_mask_effect_test.cpp b/unsharp_mask_effect_test.cpp
index 8dbefc2..a44c407 100644
--- a/unsharp_mask_effect_test.cpp
+++ b/unsharp_mask_effect_test.cpp
@@ -1,5 +1,6 @@
 // Unit tests for UnsharpMaskEffect.
 
+#include <GL/glew.h>
 #include <math.h>
 
 #include "effect_chain.h"
diff --git a/util.cpp b/util.cpp
index 6b1de53..9c2ce59 100644
--- a/util.cpp
+++ b/util.cpp
@@ -2,6 +2,7 @@
 #include <assert.h>
 #include <math.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <Eigen/Core>
 
diff --git a/vignette_effect.cpp b/vignette_effect.cpp
index 6a9a340..38bb878 100644
--- a/vignette_effect.cpp
+++ b/vignette_effect.cpp
@@ -1,9 +1,10 @@
 #include <GL/glew.h>
+#include <assert.h>
 #include <math.h>
 
 #include "effect_util.h"
-#include "vignette_effect.h"
 #include "util.h"
+#include "vignette_effect.h"
 
 using namespace std;
 
diff --git a/vignette_effect_test.cpp b/vignette_effect_test.cpp
index ecd52b5..5d79d2d 100644
--- a/vignette_effect_test.cpp
+++ b/vignette_effect_test.cpp
@@ -1,12 +1,13 @@
 // Unit tests for VignetteEffect.
 
+#include <GL/glew.h>
 #include <math.h>
 
 #include "effect_chain.h"
-#include "vignette_effect.h"
 #include "gtest/gtest.h"
 #include "image_format.h"
 #include "test_util.h"
+#include "vignette_effect.h"
 
 TEST(VignetteEffectTest, HugeInnerRadiusDoesNothing) {
 	const int size = 4;
diff --git a/white_balance_effect.cpp b/white_balance_effect.cpp
index 53c49e4..ef60e7a 100644
--- a/white_balance_effect.cpp
+++ b/white_balance_effect.cpp
@@ -6,6 +6,7 @@
 #include "colorspace_conversion_effect.h"
 #include "d65.h"
 #include "effect_util.h"
+#include "image_format.h"
 #include "util.h"
 #include "white_balance_effect.h"
 
diff --git a/white_balance_effect_test.cpp b/white_balance_effect_test.cpp
index 4cd2ae0..99afce5 100644
--- a/white_balance_effect_test.cpp
+++ b/white_balance_effect_test.cpp
@@ -1,6 +1,6 @@
 // Unit tests for WhiteBalanceEffect.
 
-#include <iomanip>
+#include <GL/glew.h>
 
 #include "effect_chain.h"
 #include "gtest/gtest.h"
diff --git a/ycbcr_input_test.cpp b/ycbcr_input_test.cpp
index f9be193..4beaaa3 100644
--- a/ycbcr_input_test.cpp
+++ b/ycbcr_input_test.cpp
@@ -1,13 +1,14 @@
 // Unit tests for YCbCrInput.
 // FIXME: This class really ought to support mipmaps.
 
+#include <GL/glew.h>
 #include <stddef.h>
 
 #include "effect_chain.h"
 #include "gtest/gtest.h"
 #include "test_util.h"
-#include "ycbcr_input.h"
 #include "util.h"
+#include "ycbcr_input.h"
 
 TEST(YCbCrInput, Simple444) {
 	const int width = 1;