Another round of include-what-you-use.

diff --git a/blur_effect_test.cpp b/blur_effect_test.cpp
index 1718e7dca7e6997929049c8b3868ba063ded6b78..4114bcbc45bff018a271f8d360b388bbde85bca6 100644 (file)
--- a/blur_effect_test.cpp
+++ b/blur_effect_test.cpp
@@ -1,4 +1,5 @@
 // Unit tests for BlurEffect.
 // Unit tests for BlurEffect.

+#include <GL/glew.h>

 #include <math.h>
 #include <string.h>
 
 #include <math.h>
 #include <string.h>
 

diff --git a/colorspace_conversion_effect.h b/colorspace_conversion_effect.h
index b21f72e1a8b6b8782e332aedfaca2455d3f9644b..ab8a8aa3ea630a7ebb98bc729b5b2ae643c87d8c 100644 (file)
--- 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.
 
 // 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 <Eigen/Core>

+#include <string>

 
 #include "effect.h"
 #include "image_format.h"
 
 #include "effect.h"
 #include "image_format.h"

diff --git a/deconvolution_sharpen_effect_test.cpp b/deconvolution_sharpen_effect_test.cpp
index 8daeb675969397bb3be460911e5b8491d0b3e78b..ba821cee6231a6f133827f743325b448ab772300 100644 (file)
--- a/deconvolution_sharpen_effect_test.cpp
+++ b/deconvolution_sharpen_effect_test.cpp
@@ -1,5 +1,6 @@
 // Unit tests for DeconvolutionSharpenEffect.
 
 // Unit tests for DeconvolutionSharpenEffect.
 

+#include <GL/glew.h>

 #include <math.h>
 #include <stdlib.h>
 
 #include <math.h>
 #include <stdlib.h>
 

diff --git a/demo.cpp b/demo.cpp
index a42556651d00588accacc44343bb19cc60da3255..b401f0574f21dcb904ac61dab1d854137838c510 100644 (file)
--- a/demo.cpp
+++ b/demo.cpp
@@ -21,7 +21,6 @@
 #include <setjmp.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <setjmp.h>
 #include <stdio.h>
 #include <stdlib.h>

-#include <string.h>

 #include <sys/time.h>
 #include <time.h>
 
 #include <sys/time.h>
 #include <time.h>
 

diff --git a/diffusion_effect_test.cpp b/diffusion_effect_test.cpp
index 5558f4f39e1c8138fb6e1fb0e77586db00227f21..9faa7baf7443f426003edc02a73d9dd8852f52bd 100644 (file)
--- a/diffusion_effect_test.cpp
+++ b/diffusion_effect_test.cpp
@@ -1,5 +1,7 @@
 // Unit tests for DiffusionEffect.
 
 // Unit tests for DiffusionEffect.
 

+#include <GL/glew.h>
+

 #include "diffusion_effect.h"
 #include "effect_chain.h"
 #include "gtest/gtest.h"
 #include "diffusion_effect.h"
 #include "effect_chain.h"
 #include "gtest/gtest.h"

diff --git a/dither_effect.cpp b/dither_effect.cpp
index 62355b248fc406db1980e9ec76f9bde7afdd92ba..14132bd43407bda72a7d2a8ca86f785bc9e1fab1 100644 (file)
--- a/dither_effect.cpp
+++ b/dither_effect.cpp
@@ -1,5 +1,6 @@
 #include <GL/glew.h>
 #include <assert.h>
 #include <GL/glew.h>
 #include <assert.h>

+#include <stdio.h>

 #include <algorithm>
 
 #include "dither_effect.h"
 #include <algorithm>
 
 #include "dither_effect.h"

diff --git a/effect.cpp b/effect.cpp
index 9cd611f8518ed3cd2a4d58c8dd2bb7a69ce0cfb0..93ba41a09bef116324cb956d473d6c3cac8e2a23 100644 (file)
--- a/effect.cpp
+++ b/effect.cpp
@@ -6,7 +6,6 @@
 
 #include "effect.h"
 #include "effect_util.h"
 
 #include "effect.h"
 #include "effect_util.h"

-#include "util.h"

 
 using namespace std;
 
 
 using namespace std;
 

diff --git a/effect_chain.cpp b/effect_chain.cpp
index d80c4f82a28b33c39c983b38f02894ad514979e1..114670c913d304daedcdc48acbbdaec24246b1ef 100644 (file)
--- a/effect_chain.cpp
+++ b/effect_chain.cpp
@@ -11,6 +11,7 @@
 #include <algorithm>
 #include <set>
 #include <stack>
 #include <algorithm>
 #include <set>
 #include <stack>

+#include <utility>

 #include <vector>
 
 #include "alpha_division_effect.h"
 #include <vector>
 
 #include "alpha_division_effect.h"

diff --git a/effect_chain_test.cpp b/effect_chain_test.cpp
index fed8b91b693f42ef6796307d3039d3d29d668663..ab71b4b5026ebfd1b5649849f5754700ed85ee4f 100644 (file)
--- 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 "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"
 #include "input.h"
 #include "mirror_effect.h"
 #include "multiply_effect.h"

diff --git a/fft_pass_effect.cpp b/fft_pass_effect.cpp
index b3c3cf6a32c553087ac8fb52c923347b5c8010ce..9e1b7b54af52bfcc087fff958a1f31e5cf7128f0 100644 (file)
--- a/fft_pass_effect.cpp
+++ b/fft_pass_effect.cpp
@@ -1,7 +1,8 @@
 #include <GL/glew.h>
 #include <GL/glew.h>

+#include <math.h>

 
 

-#include "fft_pass_effect.h"

 #include "effect_util.h"
 #include "effect_util.h"

+#include "fft_pass_effect.h"

 #include "util.h"
 
 using namespace std;
 #include "util.h"
 
 using namespace std;

diff --git a/fft_pass_effect.h b/fft_pass_effect.h
index b3e025b1a1284bb0415b04320ba08e491b1fc3f9..f12bda7e416ce3eeefe0f02e55ea4f0bbefa59a9 100644 (file)
--- 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.
 
 // 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 <GL/glew.h>

+#include <assert.h>
+#include <stdio.h>

 #include <string>
 
 #include "effect.h"
 #include <string>
 
 #include "effect.h"

diff --git a/fft_pass_effect_test.cpp b/fft_pass_effect_test.cpp
index 6a6406c0a7fa67899e663c3f259828bce66f4201..1d6693c09ac694d39076a9ef296efa231826bc62 100644 (file)
--- a/fft_pass_effect_test.cpp
+++ b/fft_pass_effect_test.cpp
@@ -1,11 +1,14 @@
 // Unit tests for FFTPassEffect.
 
 #include <math.h>
 // Unit tests for FFTPassEffect.
 
 #include <math.h>

+#include <stdlib.h>
+#include <string.h>

 
 #include "effect_chain.h"
 
 #include "effect_chain.h"

+#include "fft_pass_effect.h"
+#include "glew.h"

 #include "gtest/gtest.h"
 #include "image_format.h"
 #include "gtest/gtest.h"
 #include "image_format.h"

-#include "fft_pass_effect.h"

 #include "multiply_effect.h"
 #include "test_util.h"
 
 #include "multiply_effect.h"
 #include "test_util.h"
 

diff --git a/gamma_compression_effect.cpp b/gamma_compression_effect.cpp
index 3d4fd12d39af9e869b064c2603b73796026fb5e8..a90d67a4d4a65c7e999df72042d99a74f2d20c22 100644 (file)
--- a/gamma_compression_effect.cpp
+++ b/gamma_compression_effect.cpp
@@ -1,9 +1,7 @@
-#include <math.h>
-#include <string.h>

 #include <assert.h>
 
 #include <assert.h>
 

-#include "gamma_compression_effect.h"

 #include "effect_util.h"
 #include "effect_util.h"

+#include "gamma_compression_effect.h"

 #include "util.h"
 
 using namespace std;
 #include "util.h"
 
 using namespace std;

diff --git a/gamma_compression_effect.h b/gamma_compression_effect.h
index 342e02630b480e7a36358e0411f2f041d28c549d..9577e020954461ff5fb6e1ee2c1145d115a5f1a9 100644 (file)
--- 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.
 
 // 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"
 #include <string>
 
 #include "effect.h"

diff --git a/gamma_compression_effect_test.cpp b/gamma_compression_effect_test.cpp
index 465d23948cd623808b20af119839959893fb7800..41a700ca0b0c188f5997c8364110c74c38f929ba 100644 (file)
--- 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.
 
 // 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 <GL/glew.h>

+#include <math.h>
+

 #include "gtest/gtest.h"
 #include "gtest/gtest.h"

+#include "gtest/gtest-message.h"

 #include "image_format.h"
 #include "test_util.h"
 
 #include "image_format.h"
 #include "test_util.h"
 

diff --git a/gamma_expansion_effect.cpp b/gamma_expansion_effect.cpp
index f51dc21c17dad084e98491227fffe35e3e4f474e..696815ed40273ea9fb8daab2e2a1d29bff30684b 100644 (file)
--- a/gamma_expansion_effect.cpp
+++ b/gamma_expansion_effect.cpp
@@ -1,4 +1,3 @@
-#include <math.h>

 #include <assert.h>
 
 #include "effect_util.h"
 #include <assert.h>
 
 #include "effect_util.h"

diff --git a/gamma_expansion_effect.h b/gamma_expansion_effect.h
index af0d0a908d0d9a1e10d809657db842ae5135453e..92f05171cd4d84ff08ad802cbef89138401c5d48 100644 (file)
--- 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.
 
 // 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"
 #include <string>
 
 #include "effect.h"

diff --git a/gamma_expansion_effect_test.cpp b/gamma_expansion_effect_test.cpp
index 452b46c8ffbd34dd9b1780b6a15d4587bc75fd6e..0e7670d093876d5c845278a841630fc28bf6fd11 100644 (file)
--- a/gamma_expansion_effect_test.cpp
+++ b/gamma_expansion_effect_test.cpp
@@ -1,10 +1,11 @@
 // Unit tests for GammaExpansionEffect.
 
 // Unit tests for GammaExpansionEffect.
 

-#include <math.h>

 #include <GL/glew.h>
 #include <GL/glew.h>

+#include <math.h>

 
 #include "gamma_expansion_effect.h"
 #include "gtest/gtest.h"
 
 #include "gamma_expansion_effect.h"
 #include "gtest/gtest.h"

+#include "gtest/gtest-message.h"

 #include "test_util.h"
 
 TEST(GammaExpansionEffectTest, sRGB_KeyValues) {
 #include "test_util.h"
 
 TEST(GammaExpansionEffectTest, sRGB_KeyValues) {

diff --git a/glow_effect_test.cpp b/glow_effect_test.cpp
index b8eff4be018ef3d660fac2e0bfa35e61bf2cfaae..4570d6f5ada16b9e151ed5ac21bda7c07e49bd12 100644 (file)
--- a/glow_effect_test.cpp
+++ b/glow_effect_test.cpp
@@ -1,5 +1,6 @@
 // Unit tests for GlowEffect.
 
 // Unit tests for GlowEffect.
 

+#include <GL/glew.h>

 #include <math.h>
 
 #include "effect_chain.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 9850ba28064ede83071c2fb8f292bc88ec359c27..a9e866d28c73985572616be4eae3c80725e88cce 100644 (file)
--- a/lift_gamma_gain_effect_test.cpp
+++ b/lift_gamma_gain_effect_test.cpp
@@ -1,5 +1,7 @@
 // Unit tests for LiftGammaGainEffect.
 
 // Unit tests for LiftGammaGainEffect.
 

+#include <GL/glew.h>
+

 #include "effect_chain.h"
 #include "gtest/gtest.h"
 #include "image_format.h"
 #include "effect_chain.h"
 #include "gtest/gtest.h"
 #include "image_format.h"

diff --git a/multiply_effect.cpp b/multiply_effect.cpp
index 3e3581053697e7690973c379976492f51e44d143..e0fc5340ed960c6e1b66a76edcadb0b309b912d3 100644 (file)
--- a/multiply_effect.cpp
+++ b/multiply_effect.cpp
@@ -1,5 +1,3 @@
-#include <GL/glew.h>
-

 #include "multiply_effect.h"
 #include "util.h"
 
 #include "multiply_effect.h"
 #include "util.h"
 

diff --git a/padding_effect_test.cpp b/padding_effect_test.cpp
index c9c8ef1d7af1a0a9074697fb2d73f6d47ffe73e1..36e7790fe1b3aec302fe2872756ffa3edcecd5d7 100644 (file)
--- a/padding_effect_test.cpp
+++ b/padding_effect_test.cpp
@@ -1,5 +1,6 @@
 // Unit tests for AlphaMultiplicationEffect.
 
 // Unit tests for AlphaMultiplicationEffect.
 

+#include <GL/glew.h>

 #include <stddef.h>
 
 #include "effect_chain.h"
 #include <stddef.h>
 
 #include "effect_chain.h"

diff --git a/resample_effect_test.cpp b/resample_effect_test.cpp
index a9c6923e269d202b0a7a939e19012dc9e7dfe33f..952553681a87834beab57618120c85c42cb661b2 100644 (file)
--- a/resample_effect_test.cpp
+++ b/resample_effect_test.cpp
@@ -1,10 +1,11 @@
 // Unit tests for ResampleEffect.
 
 // Unit tests for ResampleEffect.
 

+#include <GL/glew.h>

 #include <math.h>
 #include <math.h>

-#include <iomanip>

 
 #include "effect_chain.h"
 #include "flat_input.h"
 
 #include "effect_chain.h"
 #include "flat_input.h"

+#include "glew.h"

 #include "gtest/gtest.h"
 #include "image_format.h"
 #include "resample_effect.h"
 #include "gtest/gtest.h"
 #include "image_format.h"
 #include "resample_effect.h"

diff --git a/resource_pool.cpp b/resource_pool.cpp
index b074247e8d772bc6f4b00bbb817f1363e15baaf0..81a6bd4afc7f1f09f8083d9eef02e2ec8e5c679d 100644 (file)
--- 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 <pthread.h>

-
+#include <stdio.h>
+#include <stdlib.h>

 #include <algorithm>
 #include <map>
 #include <string>
 #include <utility>
 
 #include <algorithm>
 #include <map>
 #include <string>
 #include <utility>
 

+#include "glew.h"

 #include "init.h"
 #include "init.h"

+#include "resource_pool.h"

 #include "util.h"
 
 using namespace std;
 #include "util.h"
 
 using namespace std;

diff --git a/resource_pool.h b/resource_pool.h
index 50e0da2c1207755c29c8eee56ec373d141c3275a..ae89d9f517e5c09a36bd0ea0eba99777990b0c56 100644 (file)
--- 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.
 
 // 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 <list>
 #include <map>
 #include <string>
 #include <utility>

-#include <GL/glew.h>
-#include <pthread.h>

 
 class ResourcePool {
 public:
 
 class ResourcePool {
 public:

diff --git a/test_util.cpp b/test_util.cpp
index be34583805df68a2da1cedc5e8212eb380bf8cdf..59c0ef420a43e04b846fa55a946b927ddddba180 100644 (file)
--- a/test_util.cpp
+++ b/test_util.cpp
@@ -1,11 +1,12 @@
 #include <assert.h>
 #include <assert.h>

-#include <gtest/gtest-message.h>

 #include <math.h>
 #include <stdio.h>
 #include <algorithm>
 
 #include "flat_input.h"
 #include <math.h>
 #include <stdio.h>
 #include <algorithm>
 
 #include "flat_input.h"

+#include "glew.h"

 #include "gtest/gtest.h"
 #include "gtest/gtest.h"

+#include "gtest/gtest-message.h"

 #include "init.h"
 #include "resource_pool.h"
 #include "test_util.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 8dbefc2c4deb1363092e2afcd5c19e73ffed7391..a44c4073052352b7a90e07e0e15fb784be4c764c 100644 (file)
--- a/unsharp_mask_effect_test.cpp
+++ b/unsharp_mask_effect_test.cpp
@@ -1,5 +1,6 @@
 // Unit tests for UnsharpMaskEffect.
 
 // Unit tests for UnsharpMaskEffect.
 

+#include <GL/glew.h>

 #include <math.h>
 
 #include "effect_chain.h"
 #include <math.h>
 
 #include "effect_chain.h"

diff --git a/util.cpp b/util.cpp
index 6b1de53cc35b52af8094a65a97e442aba43f81f8..9c2ce597499d42a829097ddb5e3700341fde2ca1 100644 (file)
--- a/util.cpp
+++ b/util.cpp
@@ -2,6 +2,7 @@
 #include <assert.h>
 #include <math.h>
 #include <stdio.h>
 #include <assert.h>
 #include <math.h>
 #include <stdio.h>

+#include <stdlib.h>

 #include <string.h>
 #include <Eigen/Core>
 
 #include <string.h>
 #include <Eigen/Core>
 

diff --git a/vignette_effect.cpp b/vignette_effect.cpp
index 6a9a340a111cb7977ba0bc584bf380cf704eb160..38bb8785220adbc6f284ebc22b3a5f9146fd100a 100644 (file)
--- a/vignette_effect.cpp
+++ b/vignette_effect.cpp
@@ -1,9 +1,10 @@
 #include <GL/glew.h>
 #include <GL/glew.h>

+#include <assert.h>

 #include <math.h>
 
 #include "effect_util.h"
 #include <math.h>
 
 #include "effect_util.h"

-#include "vignette_effect.h"

 #include "util.h"
 #include "util.h"

+#include "vignette_effect.h"

 
 using namespace std;
 
 
 using namespace std;
 

diff --git a/vignette_effect_test.cpp b/vignette_effect_test.cpp
index ecd52b52ab79ba3e03feb5108e3091cb1b55b592..5d79d2d22fe6753fef1d761a73d30a0a5a3de08b 100644 (file)
--- a/vignette_effect_test.cpp
+++ b/vignette_effect_test.cpp
@@ -1,12 +1,13 @@
 // Unit tests for VignetteEffect.
 
 // Unit tests for VignetteEffect.
 

+#include <GL/glew.h>

 #include <math.h>
 
 #include "effect_chain.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 "gtest/gtest.h"
 #include "image_format.h"
 #include "test_util.h"

+#include "vignette_effect.h"

 
 TEST(VignetteEffectTest, HugeInnerRadiusDoesNothing) {
        const int size = 4;
 
 TEST(VignetteEffectTest, HugeInnerRadiusDoesNothing) {
        const int size = 4;

diff --git a/white_balance_effect.cpp b/white_balance_effect.cpp
index 53c49e4ffc919b4d8ec6bcb321787a4f53b08613..ef60e7a92174f0627703128131bf087dcba263db 100644 (file)
--- 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 "colorspace_conversion_effect.h"
 #include "d65.h"
 #include "effect_util.h"

+#include "image_format.h"

 #include "util.h"
 #include "white_balance_effect.h"
 
 #include "util.h"
 #include "white_balance_effect.h"
 

diff --git a/white_balance_effect_test.cpp b/white_balance_effect_test.cpp
index 4cd2ae0424af342fc56ecab6bf2a4e547e25b483..99afce5f892fca3447feeb179edf2a2e93f376ed 100644 (file)
--- a/white_balance_effect_test.cpp
+++ b/white_balance_effect_test.cpp
@@ -1,6 +1,6 @@
 // Unit tests for WhiteBalanceEffect.
 
 // Unit tests for WhiteBalanceEffect.
 

-#include <iomanip>
+#include <GL/glew.h>

 
 #include "effect_chain.h"
 #include "gtest/gtest.h"
 
 #include "effect_chain.h"
 #include "gtest/gtest.h"

diff --git a/ycbcr_input_test.cpp b/ycbcr_input_test.cpp
index f9be19392cf421ff0e2f127a45188045ded1df86..4beaaa33cb53d013f4319ed57698d1257be4ee6c 100644 (file)
--- 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.
 
 // 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 <stddef.h>
 
 #include "effect_chain.h"
 #include "gtest/gtest.h"
 #include "test_util.h"

-#include "ycbcr_input.h"

 #include "util.h"
 #include "util.h"

+#include "ycbcr_input.h"

 
 TEST(YCbCrInput, Simple444) {
        const int width = 1;
 
 TEST(YCbCrInput, Simple444) {
        const int width = 1;