Prefix include guards with _MOVIT to avoid clashes with external files.

diff --git a/alpha_division_effect.h b/alpha_division_effect.h
index 2b51c3a7256c6e53ca7633b561cfef1864c13aa6..b95e9fe77c61fb8074e548e1f361ae43f1dfdf3e 100644 (file)
--- a/alpha_division_effect.h
+++ b/alpha_division_effect.h
@@ -1,5 +1,5 @@
-#ifndef _ALPHA_DIVISION_EFFECT_H
-#define _ALPHA_DIVISION_EFFECT_H 1
+#ifndef _MOVIT_ALPHA_DIVISION_EFFECT_H
+#define _MOVIT_ALPHA_DIVISION_EFFECT_H 1

 
 // Convert premultiplied alpha to postmultiplied alpha, simply by multiplying.
 
 
 // Convert premultiplied alpha to postmultiplied alpha, simply by multiplying.
 


@@ -14,4 +14,4 @@ public:
        std::string output_fragment_shader();
 };
 
        std::string output_fragment_shader();
 };
 

-#endif // !defined(_ALPHA_DIVISION_EFFECT_H)
+#endif // !defined(_MOVIT_ALPHA_DIVISION_EFFECT_H)

diff --git a/alpha_multiplication_effect.h b/alpha_multiplication_effect.h
index 2425a427e2764822287f3f54443fb5f896e61f32..b9cf251e6719fb022e8f651b1f4d952461433895 100644 (file)
--- a/alpha_multiplication_effect.h
+++ b/alpha_multiplication_effect.h
@@ -1,5 +1,5 @@
-#ifndef _ALPHA_MULTIPLICATION_EFFECT_H
-#define _ALPHA_MULTIPLICATION_EFFECT_H 1
+#ifndef _MOVIT_ALPHA_MULTIPLICATION_EFFECT_H
+#define _MOVIT_ALPHA_MULTIPLICATION_EFFECT_H 1

 
 // Convert postmultiplied alpha to premultiplied alpha, simply by multiplying.
 
 
 // Convert postmultiplied alpha to premultiplied alpha, simply by multiplying.
 


@@ -14,4 +14,4 @@ public:
        std::string output_fragment_shader();
 };
 
        std::string output_fragment_shader();
 };
 

-#endif // !defined(_ALPHA_MULTIPLICATION_EFFECT_H)
+#endif // !defined(_MOVIT_ALPHA_MULTIPLICATION_EFFECT_H)

diff --git a/blur_effect.h b/blur_effect.h
index 5a04415829231e2d5f2146b729762eb4e3f02ce7..84dd6ba6b1037852dc644c25c8edea4856dffeb7 100644 (file)
--- a/blur_effect.h
+++ b/blur_effect.h
@@ -1,5 +1,5 @@
-#ifndef _BLUR_EFFECT_H
-#define _BLUR_EFFECT_H 1
+#ifndef _MOVIT_BLUR_EFFECT_H
+#define _MOVIT_BLUR_EFFECT_H 1

 
 // A separable 2D blur implemented by a combination of mipmap filtering
 // and convolution (essentially giving a convolution with a piecewise linear
 
 // A separable 2D blur implemented by a combination of mipmap filtering
 // and convolution (essentially giving a convolution with a piecewise linear


@@ -92,4 +92,4 @@ private:
        int width, height, virtual_width, virtual_height;
 };
 
        int width, height, virtual_width, virtual_height;
 };
 

-#endif // !defined(_BLUR_EFFECT_H)
+#endif // !defined(_MOVIT_BLUR_EFFECT_H)

diff --git a/colorspace_conversion_effect.h b/colorspace_conversion_effect.h
index 93b1859376966138ecbf76b6f69439df47c3c48c..8e691c438ad6c8f6a1f52766c278774fb1d57b2b 100644 (file)
--- a/colorspace_conversion_effect.h
+++ b/colorspace_conversion_effect.h
@@ -1,5 +1,5 @@
-#ifndef _COLORSPACE_CONVERSION_EFFECT_H
-#define _COLORSPACE_CONVERSION_EFFECT_H 1
+#ifndef _MOVIT_COLORSPACE_CONVERSION_EFFECT_H
+#define _MOVIT_COLORSPACE_CONVERSION_EFFECT_H 1

 
 // An effect to convert between different color spaces.
 // Can convert freely between sRGB/Rec. 709 and the two different Rec. 601
 
 // An effect to convert between different color spaces.
 // Can convert freely between sRGB/Rec. 709 and the two different Rec. 601


@@ -30,4 +30,4 @@ private:
        Colorspace source_space, destination_space;
 };
 
        Colorspace source_space, destination_space;
 };
 

-#endif // !defined(_COLORSPACE_CONVERSION_EFFECT_H)
+#endif // !defined(_MOVIT_COLORSPACE_CONVERSION_EFFECT_H)

diff --git a/d65.h b/d65.h
index 8f1f3e796f36cac2b4bd05abbd901950b0a75e53..807c274ece6ce645a4f14b0699e63ae83cf9d37e 100644 (file)
--- a/d65.h
+++ b/d65.h
@@ -1,5 +1,5 @@
-#ifndef _D65_H
-#define _D65_H 1
+#ifndef _MOVIT_D65_H
+#define _MOVIT_D65_H 1

 
 // The D65 illuminant, which is the standard white point (ie. what you should get
 // for R=G=B=1) for almost all video color spaces in common use. It has a color
 
 // The D65 illuminant, which is the standard white point (ie. what you should get
 // for R=G=B=1) for almost all video color spaces in common use. It has a color


@@ -14,5 +14,5 @@ static const double d65_X = d65_x / d65_y;
 static const double d65_Y = 1.0;
 static const double d65_Z = d65_z / d65_y;
 
 static const double d65_Y = 1.0;
 static const double d65_Z = d65_z / d65_y;
 

-#endif  // !defined(_D65_H)
+#endif  // !defined(_MOVIT_D65_H)

 
 

diff --git a/deconvolution_sharpen_effect.h b/deconvolution_sharpen_effect.h
index 80553adf0aecb5557cbbc85d30698fba40998f8b..9279abf52f9686ca60bac6c652fa9e5b14db9971 100644 (file)
--- a/deconvolution_sharpen_effect.h
+++ b/deconvolution_sharpen_effect.h
@@ -1,5 +1,5 @@
-#ifndef _DECONVOLUTION_SHARPEN_EFFECT_H
-#define _DECONVOLUTION_SHARPEN_EFFECT_H 1
+#ifndef _MOVIT_DECONVOLUTION_SHARPEN_EFFECT_H
+#define _MOVIT_DECONVOLUTION_SHARPEN_EFFECT_H 1

 
 // DeconvolutionSharpenEffect is an effect that sharpens by way of deconvolution
 // (i.e., trying to reverse the blur kernel, as opposed to just boosting high
 
 // DeconvolutionSharpenEffect is an effect that sharpens by way of deconvolution
 // (i.e., trying to reverse the blur kernel, as opposed to just boosting high


@@ -68,4 +68,4 @@ private:
        void update_deconvolution_kernel();
 };
 
        void update_deconvolution_kernel();
 };
 

-#endif // !defined(_DECONVOLUTION_SHARPEN_EFFECT_H)
+#endif // !defined(_MOVIT_DECONVOLUTION_SHARPEN_EFFECT_H)

diff --git a/diffusion_effect.h b/diffusion_effect.h
index 64d743d12eb923bd409b24ddd0d5de508ff5458c..390787d9a3dc4c54c2dd8408538fd43d480ab471 100644 (file)
--- a/diffusion_effect.h
+++ b/diffusion_effect.h
@@ -1,5 +1,5 @@
-#ifndef _DIFFUSION_EFFECT_H
-#define _DIFFUSION_EFFECT_H 1
+#ifndef _MOVIT_DIFFUSION_EFFECT_H
+#define _MOVIT_DIFFUSION_EFFECT_H 1

 
 // There are many different effects that go under the name of "diffusion",
 // seemingly all of the inspired by the effect you get when you put a
 
 // There are many different effects that go under the name of "diffusion",
 // seemingly all of the inspired by the effect you get when you put a


@@ -59,4 +59,4 @@ private:
 };
 
 
 };
 
 

-#endif // !defined(_DIFFUSION_EFFECT_H)
+#endif // !defined(_MOVIT_DIFFUSION_EFFECT_H)

diff --git a/dither_effect.h b/dither_effect.h
index 314390752cebde884f87f8d54db798f33f310cae..f9f371c0c5f5f2025761164bc386ec42665e7fdf 100644 (file)
--- a/dither_effect.h
+++ b/dither_effect.h
@@ -1,5 +1,5 @@
-#ifndef _DITHER_EFFECT_H
-#define _DITHER_EFFECT_H 1
+#ifndef _MOVIT_DITHER_EFFECT_H
+#define _MOVIT_DITHER_EFFECT_H 1

 
 // Implements simple rectangular-PDF dither.
 //
 
 // Implements simple rectangular-PDF dither.
 //


@@ -78,4 +78,4 @@ private:
        bool need_texture_update;
 };
 
        bool need_texture_update;
 };
 

-#endif // !defined(_DITHER_EFFECT_H)
+#endif // !defined(_MOVIT_DITHER_EFFECT_H)

diff --git a/effect.h b/effect.h
index 65fdf522af305491ca8e6abb594355aae9934e15..78845094196ccb92ea59df679f05c8f0179c7a59 100644 (file)
--- a/effect.h
+++ b/effect.h
@@ -1,5 +1,5 @@
-#ifndef _EFFECT_H
-#define _EFFECT_H 1
+#ifndef _MOVIT_EFFECT_H
+#define _MOVIT_EFFECT_H 1

 
 // Effect is the base class for every effect. It basically represents a single
 // GLSL function, with an optional set of user-settable parameters.
 
 // Effect is the base class for every effect. It basically represents a single
 // GLSL function, with an optional set of user-settable parameters.


@@ -284,4 +284,4 @@ private:
        std::map<std::string, Texture1D> params_tex_1d;
 };
 
        std::map<std::string, Texture1D> params_tex_1d;
 };
 

-#endif // !defined(_EFFECT_H)
+#endif // !defined(_MOVIT_EFFECT_H)

diff --git a/effect_chain.h b/effect_chain.h
index ddabad959bb292b7798af46e69c6869ccca1c1c5..f41e7e4a5e72966a9dd0a56255aca32cf6a3449b 100644 (file)
--- a/effect_chain.h
+++ b/effect_chain.h
@@ -1,5 +1,5 @@
-#ifndef _EFFECT_CHAIN_H
-#define _EFFECT_CHAIN_H 1
+#ifndef _MOVIT_EFFECT_CHAIN_H
+#define _MOVIT_EFFECT_CHAIN_H 1

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


@@ -237,4 +237,4 @@ private:
        bool finalized;
 };
 
        bool finalized;
 };
 

-#endif // !defined(_EFFECT_CHAIN_H)
+#endif // !defined(_MOVIT_EFFECT_CHAIN_H)

diff --git a/effect_util.h b/effect_util.h
index 13a775401b88652149421717158e680071fdd088..1c2e92c26d7313eec5e49813be014402a949d92c 100644 (file)
--- a/effect_util.h
+++ b/effect_util.h
@@ -1,5 +1,5 @@
-#ifndef _EFFECT_UTIL_H
-#define _EFFECT_UTIL_H 1
+#ifndef _MOVIT_EFFECT_UTIL_H
+#define _MOVIT_EFFECT_UTIL_H 1

 
 // Utilities that are often useful for implementing Effect instances,
 // but don't need to be included from effect.h.
 
 // Utilities that are often useful for implementing Effect instances,
 // but don't need to be included from effect.h.


@@ -27,4 +27,4 @@ void set_uniform_vec4(GLuint glsl_program_num, const std::string &prefix, const
 void set_uniform_vec4_array(GLuint glsl_program_num, const std::string &prefix, const std::string &key, const float *values, size_t num_values);
 void set_uniform_mat3(GLuint glsl_program_num, const std::string &prefix, const std::string &key, const Eigen::Matrix3d &matrix);
 
 void set_uniform_vec4_array(GLuint glsl_program_num, const std::string &prefix, const std::string &key, const float *values, size_t num_values);
 void set_uniform_mat3(GLuint glsl_program_num, const std::string &prefix, const std::string &key, const Eigen::Matrix3d &matrix);
 

-#endif // !defined(_EFFECT_UTIL_H)
+#endif // !defined(_MOVIT_EFFECT_UTIL_H)

diff --git a/flat_input.h b/flat_input.h
index 80e113f67c7f01b5945764c45ca3c18901a573d2..4728fb0805d26f1a7cb1814daf440a944755d7ad 100644 (file)
--- a/flat_input.h
+++ b/flat_input.h
@@ -1,5 +1,5 @@
-#ifndef _FLAT_INPUT_H
-#define _FLAT_INPUT_H 1
+#ifndef _MOVIT_FLAT_INPUT_H
+#define _MOVIT_FLAT_INPUT_H 1

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


@@ -96,4 +96,4 @@ private:
        const void *pixel_data;
 };
 
        const void *pixel_data;
 };
 

-#endif // !defined(_FLAT_INPUT_H)
+#endif // !defined(_MOVIT_FLAT_INPUT_H)

diff --git a/gamma_compression_effect.h b/gamma_compression_effect.h
index 6727e6e905c313e75f98209e1d6a55da56f958f6..c494cd795b00ce5f5c20142a4ff4ea9ae879b7c1 100644 (file)
--- a/gamma_compression_effect.h
+++ b/gamma_compression_effect.h
@@ -1,5 +1,5 @@
-#ifndef _GAMMA_COMPRESSION_EFFECT_H 
-#define _GAMMA_COMPRESSION_EFFECT_H 1
+#ifndef _MOVIT_GAMMA_COMPRESSION_EFFECT_H 
+#define _MOVIT_GAMMA_COMPRESSION_EFFECT_H 1

 
 // An effect to convert linear light to the given gamma curve,
 // typically inserted by the framework automatically at the end
 
 // An effect to convert linear light to the given gamma curve,
 // typically inserted by the framework automatically at the end


@@ -35,4 +35,4 @@ private:
        float compression_curve[COMPRESSION_CURVE_SIZE];
 };
 
        float compression_curve[COMPRESSION_CURVE_SIZE];
 };
 

-#endif // !defined(_GAMMA_COMPRESSION_EFFECT_H)
+#endif // !defined(_MOVIT_GAMMA_COMPRESSION_EFFECT_H)

diff --git a/gamma_expansion_effect.h b/gamma_expansion_effect.h
index cc65e4fa48924022cf5f3d05e70693cd06809b36..07d94bea60a6f7784b94b5328ac86cb063d59a9f 100644 (file)
--- a/gamma_expansion_effect.h
+++ b/gamma_expansion_effect.h
@@ -1,5 +1,5 @@
-#ifndef _GAMMA_EXPANSION_EFFECT_H 
-#define _GAMMA_EXPANSION_EFFECT_H 1
+#ifndef _MOVIT_GAMMA_EXPANSION_EFFECT_H 
+#define _MOVIT_GAMMA_EXPANSION_EFFECT_H 1

 
 // An effect to convert the given gamma curve into linear light,
 // typically inserted by the framework automatically at the beginning
 
 // An effect to convert the given gamma curve into linear light,
 // typically inserted by the framework automatically at the beginning


@@ -36,4 +36,4 @@ private:
        float expansion_curve[EXPANSION_CURVE_SIZE];
 };
 
        float expansion_curve[EXPANSION_CURVE_SIZE];
 };
 

-#endif // !defined(_GAMMA_EXPANSION_EFFECT_H)
+#endif // !defined(_MOVIT_GAMMA_EXPANSION_EFFECT_H)

diff --git a/glow_effect.h b/glow_effect.h
index 3453c997d82ee2938b987089774b2a5677309bde..91106e03b08927ab3498d784f3611b05e36aafa8 100644 (file)
--- a/glow_effect.h
+++ b/glow_effect.h
@@ -1,5 +1,5 @@
-#ifndef _GLOW_EFFECT_H
-#define _GLOW_EFFECT_H 1
+#ifndef _MOVIT_GLOW_EFFECT_H
+#define _MOVIT_GLOW_EFFECT_H 1

 
 // Glow: Cut out the highlights of the image (everything above a certain threshold),
 // blur them, and overlay them onto the original image.
 
 // Glow: Cut out the highlights of the image (everything above a certain threshold),
 // blur them, and overlay them onto the original image.


@@ -55,4 +55,4 @@ private:
        float cutoff;
 };
 
        float cutoff;
 };
 

-#endif // !defined(_GLOW_EFFECT_H)
+#endif // !defined(_MOVIT_GLOW_EFFECT_H)

diff --git a/image_format.h b/image_format.h
index 90f60347807faa1aa80035e7e34a6c81f20d92bc..3766235db670f3437d427d52e851597e2190c424 100644 (file)
--- a/image_format.h
+++ b/image_format.h
@@ -1,5 +1,5 @@
-#ifndef _IMAGE_FORMAT_H
-#define _IMAGE_FORMAT_H 1
+#ifndef _MOVIT_IMAGE_FORMAT_H
+#define _MOVIT_IMAGE_FORMAT_H 1

 
 enum MovitPixelFormat {
        FORMAT_RGB,
 
 enum MovitPixelFormat {
        FORMAT_RGB,


@@ -38,4 +38,4 @@ struct ImageFormat {
        GammaCurve gamma_curve;
 };
 
        GammaCurve gamma_curve;
 };
 

-#endif  // !defined(_IMAGE_FORMAT_H)
+#endif  // !defined(_MOVIT_IMAGE_FORMAT_H)

diff --git a/init.h b/init.h
index 7cee8587758331566d1b5b7e57db20e6f25aa2ab..53a4018100362f6f38f54e0173bdf502f5debf5a 100644 (file)
--- a/init.h
+++ b/init.h
@@ -1,5 +1,5 @@
-#ifndef _INIT_H
-#define _INIT_H
+#ifndef _MOVIT_INIT_H
+#define _MOVIT_INIT_H

 
 #include <string>
 
 
 #include <string>
 


@@ -47,4 +47,4 @@ extern float movit_texel_subpixel_precision;
 // Whether the GPU in use supports GL_EXT_texture_sRGB.
 extern bool movit_srgb_textures_supported;
 
 // Whether the GPU in use supports GL_EXT_texture_sRGB.
 extern bool movit_srgb_textures_supported;
 

-#endif  // !defined(_INIT_H)
+#endif  // !defined(_MOVIT_INIT_H)

diff --git a/input.h b/input.h
index db1eae9b7b3fbaf681efc68cac3e8c93731edaf2..da5b1fb287d599b204c32540835322677678b122 100644 (file)
--- a/input.h
+++ b/input.h
@@ -1,5 +1,5 @@
-#ifndef _INPUT_H
-#define _INPUT_H 1
+#ifndef _MOVIT_INPUT_H
+#define _MOVIT_INPUT_H 1

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


@@ -35,4 +35,4 @@ public:
        virtual GammaCurve get_gamma_curve() const = 0;
 };
 
        virtual GammaCurve get_gamma_curve() const = 0;
 };
 

-#endif // !defined(_INPUT_H)
+#endif // !defined(_MOVIT_INPUT_H)

diff --git a/lift_gamma_gain_effect.h b/lift_gamma_gain_effect.h
index bd1ec16a6d8743e6dfa83cd9848e78b959636a7c..60978f45047c3272e78662ae31f7c1e4f289eea2 100644 (file)
--- a/lift_gamma_gain_effect.h
+++ b/lift_gamma_gain_effect.h
@@ -1,5 +1,5 @@
-#ifndef _LIFT_GAMMA_GAIN_EFFECT_H
-#define _LIFT_GAMMA_GAIN_EFFECT_H 1
+#ifndef _MOVIT_LIFT_GAMMA_GAIN_EFFECT_H
+#define _MOVIT_LIFT_GAMMA_GAIN_EFFECT_H 1

 
 // A simple lift/gamma/gain effect, used for color grading.
 //
 
 // A simple lift/gamma/gain effect, used for color grading.
 //


@@ -38,4 +38,4 @@ private:
        RGBTriplet lift, gamma, gain;
 };
 
        RGBTriplet lift, gamma, gain;
 };
 

-#endif // !defined(_LIFT_GAMMA_GAIN_EFFECT_H)
+#endif // !defined(_MOVIT_LIFT_GAMMA_GAIN_EFFECT_H)

diff --git a/mirror_effect.h b/mirror_effect.h
index a33921be6b8172365828790531dff9d6e4e15d81..bd319ccb79c17b9eec1828cd828f920e4d87cdb4 100644 (file)
--- a/mirror_effect.h
+++ b/mirror_effect.h
@@ -1,5 +1,5 @@
-#ifndef _MIRROR_EFFECT_H
-#define _MIRROR_EFFECT_H 1
+#ifndef _MOVIT_MIRROR_EFFECT_H
+#define _MOVIT_MIRROR_EFFECT_H 1

 
 // A simple horizontal mirroring.
 
 
 // A simple horizontal mirroring.
 


@@ -18,4 +18,4 @@ public:
        virtual AlphaHandling alpha_handling() const { return DONT_CARE_ALPHA_TYPE; }
 };
 
        virtual AlphaHandling alpha_handling() const { return DONT_CARE_ALPHA_TYPE; }
 };
 

-#endif // !defined(_MIRROR_EFFECT_H)
+#endif // !defined(_MOVIT_MIRROR_EFFECT_H)

diff --git a/mix_effect.h b/mix_effect.h
index 4ef62fe9a2454c4754635fd62566e93bbb63a96b..fda06a6f9426426e9794637348c19f907a5894d5 100644 (file)
--- a/mix_effect.h
+++ b/mix_effect.h
@@ -1,5 +1,5 @@
-#ifndef _MIX_EFFECT_H
-#define _MIX_EFFECT_H 1
+#ifndef _MOVIT_MIX_EFFECT_H
+#define _MOVIT_MIX_EFFECT_H 1

 
 // Combine two images: a*x + b*y. If you set a within [0,1] and b=1-a,
 // you will get a fade; if not, you may get surprising results (consider alpha).
 
 // Combine two images: a*x + b*y. If you set a within [0,1] and b=1-a,
 // you will get a fade; if not, you may get surprising results (consider alpha).


@@ -25,4 +25,4 @@ private:
        float strength_first, strength_second;
 };
 
        float strength_first, strength_second;
 };
 

-#endif // !defined(_MIX_EFFECT_H)
+#endif // !defined(_MOVIT_MIX_EFFECT_H)

diff --git a/overlay_effect.h b/overlay_effect.h
index 66ff31b94be55d19ffacb7714051baa2c785493c..444fe3f67298c33acc0ec12c4287210802458c65 100644 (file)
--- a/overlay_effect.h
+++ b/overlay_effect.h
@@ -1,5 +1,5 @@
-#ifndef _OVERLAY_EFFECT_H
-#define _OVERLAY_EFFECT_H 1
+#ifndef _MOVIT_OVERLAY_EFFECT_H
+#define _MOVIT_OVERLAY_EFFECT_H 1

 
 // Put one image on top of another, using alpha where appropriate.
 // (If both images are the same aspect and the top image has alpha=1.0
 
 // Put one image on top of another, using alpha where appropriate.
 // (If both images are the same aspect and the top image has alpha=1.0


@@ -31,4 +31,4 @@ public:
        virtual AlphaHandling alpha_handling() const { return INPUT_PREMULTIPLIED_ALPHA_KEEP_BLANK; }
 };
 
        virtual AlphaHandling alpha_handling() const { return INPUT_PREMULTIPLIED_ALPHA_KEEP_BLANK; }
 };
 

-#endif // !defined(_OVERLAY_EFFECT_H)
+#endif // !defined(_MOVIT_OVERLAY_EFFECT_H)

diff --git a/padding_effect.h b/padding_effect.h
index a836ba208cc4c096fad3d0b9c7de6cc2da20ae7c..797db7e990eedf867ba17f3377e1a518c6c1de4d 100644 (file)
--- a/padding_effect.h
+++ b/padding_effect.h
@@ -1,5 +1,5 @@
-#ifndef _PADDING_EFFECT_H
-#define _PADDING_EFFECT_H 1
+#ifndef _MOVIT_PADDING_EFFECT_H
+#define _MOVIT_PADDING_EFFECT_H 1

 
 // Takes an image and pads it to fit a larger image, or crops it to fit a smaller one
 // (although the latter is implemented slightly less efficiently, and you cannot both
 
 // Takes an image and pads it to fit a larger image, or crops it to fit a smaller one
 // (although the latter is implemented slightly less efficiently, and you cannot both


@@ -39,4 +39,4 @@ private:
        float top, left;
 };
 
        float top, left;
 };
 

-#endif // !defined(_PADDING_EFFECT_H)
+#endif // !defined(_MOVIT_PADDING_EFFECT_H)

diff --git a/resample_effect.h b/resample_effect.h
index b66ca6fe4ba30bd2ec817a634b6255bd2e316eee..c81362f19ee57079b62df66ce3872f83673192df 100644 (file)
--- a/resample_effect.h
+++ b/resample_effect.h
@@ -1,5 +1,5 @@
-#ifndef _RESAMPLE_EFFECT_H
-#define _RESAMPLE_EFFECT_H 1
+#ifndef _MOVIT_RESAMPLE_EFFECT_H
+#define _MOVIT_RESAMPLE_EFFECT_H 1

 
 // High-quality image resizing, either up or down.
 //
 
 // High-quality image resizing, either up or down.
 //


@@ -99,4 +99,4 @@ private:
        float slice_height;
 };
 
        float slice_height;
 };
 

-#endif // !defined(_RESAMPLE_EFFECT_H)
+#endif // !defined(_MOVIT_RESAMPLE_EFFECT_H)

diff --git a/resize_effect.h b/resize_effect.h
index 8fbaba70b08ccfbe5724af7b24068da6b420a75b..774f510de592aedc4e0ae1991916629d62c64842 100644 (file)
--- a/resize_effect.h
+++ b/resize_effect.h
@@ -1,5 +1,5 @@
-#ifndef _RESIZE_EFFECT_H
-#define _RESIZE_EFFECT_H 1
+#ifndef _MOVIT_RESIZE_EFFECT_H
+#define _MOVIT_RESIZE_EFFECT_H 1

 
 // An effect that simply resizes the picture to a given output size
 // (set by the two integer parameters "width" and "height").
 
 // An effect that simply resizes the picture to a given output size
 // (set by the two integer parameters "width" and "height").


@@ -28,4 +28,4 @@ private:
        int width, height;
 };
 
        int width, height;
 };
 

-#endif // !defined(_RESIZE_EFFECT_H)
+#endif // !defined(_MOVIT_RESIZE_EFFECT_H)

diff --git a/sandbox_effect.h b/sandbox_effect.h
index 072bc2b1096a95e592de293c396bdb2ce647afd7..80ef8a23adfa6bca98b20b0b98bca56620026fdc 100644 (file)
--- a/sandbox_effect.h
+++ b/sandbox_effect.h
@@ -1,5 +1,5 @@
-#ifndef _SANDBOX_EFFECT_H
-#define _SANDBOX_EFFECT_H 1
+#ifndef _MOVIT_SANDBOX_EFFECT_H
+#define _MOVIT_SANDBOX_EFFECT_H 1

 
 // This effect, by default, does nothing.
 //
 
 // This effect, by default, does nothing.
 //


@@ -25,4 +25,4 @@ private:
        float parm;
 };
 
        float parm;
 };
 

-#endif // !defined(_SANDBOX_EFFECT_H)
+#endif // !defined(_MOVIT_SANDBOX_EFFECT_H)

diff --git a/saturation_effect.h b/saturation_effect.h
index 710dcfd917fca1d55a04fadbe5fb2a07660bd0f0..f4d69e680ddda7b03a730a0724452d72f6e8394f 100644 (file)
--- a/saturation_effect.h
+++ b/saturation_effect.h
@@ -1,5 +1,5 @@
-#ifndef _SATURATION_EFFECT_H
-#define _SATURATION_EFFECT_H 1
+#ifndef _MOVIT_SATURATION_EFFECT_H
+#define _MOVIT_SATURATION_EFFECT_H 1

 
 // A simple desaturation/saturation effect. We use the Rec. 709
 // definition of luminance (in linear light, of course) and linearly
 
 // A simple desaturation/saturation effect. We use the Rec. 709
 // definition of luminance (in linear light, of course) and linearly


@@ -22,4 +22,4 @@ private:
        float saturation;
 };
 
        float saturation;
 };
 

-#endif // !defined(_SATURATION_EFFECT_H)
+#endif // !defined(_MOVIT_SATURATION_EFFECT_H)

diff --git a/test_util.h b/test_util.h
index 1f48ae1eaffa1061973a2db7ad1287f0bd16c79c..10ecf9ff122a9461dd6e4e520db4f5c971d7f673 100644 (file)
--- a/test_util.h
+++ b/test_util.h
@@ -1,5 +1,5 @@
-#ifndef _TEST_UTIL_H
-#define _TEST_UTIL_H 1
+#ifndef _MOVIT_TEST_UTIL_H
+#define _MOVIT_TEST_UTIL_H 1

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


@@ -34,4 +34,4 @@ private:
 void expect_equal(const float *ref, const float *result, unsigned width, unsigned height, float largest_difference_limit = 1.5 / 255.0, float rms_limit = 0.2 / 255.0);
 void expect_equal(const unsigned char *ref, const unsigned char *result, unsigned width, unsigned height, unsigned largest_difference_limit = 1, float rms_limit = 0.2);
 
 void expect_equal(const float *ref, const float *result, unsigned width, unsigned height, float largest_difference_limit = 1.5 / 255.0, float rms_limit = 0.2 / 255.0);
 void expect_equal(const unsigned char *ref, const unsigned char *result, unsigned width, unsigned height, unsigned largest_difference_limit = 1, float rms_limit = 0.2);
 

-#endif  // !defined(_TEST_UTIL_H)
+#endif  // !defined(_MOVIT_TEST_UTIL_H)

diff --git a/unsharp_mask_effect.h b/unsharp_mask_effect.h
index b0c937776e32bc0d7d74b3bade5e7c0792dac6e8..ba54a96f048ca12df0bd9015cd45a7f9e8b02ba6 100644 (file)
--- a/unsharp_mask_effect.h
+++ b/unsharp_mask_effect.h
@@ -1,5 +1,5 @@
-#ifndef _UNSHARP_MASK_EFFECT_H
-#define _UNSHARP_MASK_EFFECT_H 1
+#ifndef _MOVIT_UNSHARP_MASK_EFFECT_H
+#define _MOVIT_UNSHARP_MASK_EFFECT_H 1

 
 // Unsharp mask is probably the most popular way of doing sharpening today,
 // although it does not always deliver the best results (it is very prone
 
 // Unsharp mask is probably the most popular way of doing sharpening today,
 // although it does not always deliver the best results (it is very prone


@@ -43,4 +43,4 @@ private:
        MixEffect *mix;
 };
 
        MixEffect *mix;
 };
 

-#endif // !defined(_UNSHARP_MASK_EFFECT_H)
+#endif // !defined(_MOVIT_UNSHARP_MASK_EFFECT_H)

diff --git a/util.h b/util.h
index 5839e5b6c4ce1ccd52ac65f2364a9d6c1e095663..e12c2c422e114f72c5e2739af2a94a8fec575688 100644 (file)
--- a/util.h
+++ b/util.h
@@ -1,5 +1,5 @@
-#ifndef _UTIL_H
-#define _UTIL_H 1
+#ifndef _MOVIT_UTIL_H
+#define _MOVIT_UTIL_H 1

 
 // Various utilities.
 
 
 // Various utilities.
 


@@ -60,4 +60,4 @@ void combine_two_samples(float w1, float w2, float *offset, float *total_weight,
 #define CHECK(x) do { bool ok = x; if (!ok) { fprintf(stderr, "%s:%d: %s: Assertion `%s' failed.\n", __FILE__, __LINE__, __PRETTY_FUNCTION__, #x); abort(); } } while (false)
 #endif
 
 #define CHECK(x) do { bool ok = x; if (!ok) { fprintf(stderr, "%s:%d: %s: Assertion `%s' failed.\n", __FILE__, __LINE__, __PRETTY_FUNCTION__, #x); abort(); } } while (false)
 #endif
 

-#endif // !defined(_UTIL_H)
+#endif // !defined(_MOVIT_UTIL_H)

diff --git a/vignette_effect.h b/vignette_effect.h
index d13bf85d01c36b47a47cdd53641efd8f6f5fe6ad..febdc447510f28ba6b1befb715882eacbb69fc1a 100644 (file)
--- a/vignette_effect.h
+++ b/vignette_effect.h
@@ -1,5 +1,5 @@
-#ifndef _VIGNETTE_EFFECT_H
-#define _VIGNETTE_EFFECT_H 1
+#ifndef _MOVIT_VIGNETTE_EFFECT_H
+#define _MOVIT_VIGNETTE_EFFECT_H 1

 
 // A circular vignette, falling off as cos² of the distance from the center
 // (the classic formula for approximating a real lens).
 
 // A circular vignette, falling off as cos² of the distance from the center
 // (the classic formula for approximating a real lens).


@@ -25,4 +25,4 @@ private:
        float radius, inner_radius;
 };
 
        float radius, inner_radius;
 };
 

-#endif // !defined(_VIGNETTE_EFFECT_H)
+#endif // !defined(_MOVIT_VIGNETTE_EFFECT_H)

diff --git a/white_balance_effect.h b/white_balance_effect.h
index c4e46a47548354c6df953fd2caf20d7c9112a80f..5a8ecd548d6cf8efd4143feb3d457d97d76cf930 100644 (file)
--- a/white_balance_effect.h
+++ b/white_balance_effect.h
@@ -1,5 +1,5 @@
-#ifndef _WHITE_BALANCE_EFFECT_H
-#define _WHITE_BALANCE_EFFECT_H 1
+#ifndef _MOVIT_WHITE_BALANCE_EFFECT_H
+#define _MOVIT_WHITE_BALANCE_EFFECT_H 1

 
 // Color correction in LMS color space.
 
 
 // Color correction in LMS color space.
 


@@ -26,4 +26,4 @@ private:
        float output_color_temperature;
 };
 
        float output_color_temperature;
 };
 

-#endif // !defined(_WHITE_BALANCE_EFFECT_H)
+#endif // !defined(_MOVIT_WHITE_BALANCE_EFFECT_H)

diff --git a/widgets.h b/widgets.h
index d7c3c5e8f27d500ab392dbf02b07b402d0b9e799..18a833493ba19cd4fa43f937d539bc6a63110077 100644 (file)
--- a/widgets.h
+++ b/widgets.h
@@ -1,5 +1,5 @@
-#ifndef _WIDGETS_H
-#define _WIDGETS_H 1
+#ifndef _MOVIT_WIDGETS_H
+#define _MOVIT_WIDGETS_H 1

 
 // Some simple UI widgets for test use.
 
 
 // Some simple UI widgets for test use.
 


@@ -8,4 +8,4 @@ void draw_saturation_bar(float y, float saturation);
 void make_hsv_wheel_texture();
 void read_colorwheel(float xf, float yf, float *rad, float *theta, float *value);
 
 void make_hsv_wheel_texture();
 void read_colorwheel(float xf, float yf, float *rad, float *theta, float *value);
 

-#endif // !defined(_WIDGETS_H)
+#endif // !defined(_MOVIT_WIDGETS_H)

diff --git a/ycbcr_input.h b/ycbcr_input.h
index 2220f5d1ebd9392730f98439cbe3d98a7e6d8c30..1225d6e912d16b9bbf68bd4f135ac170beac7c2d 100644 (file)
--- a/ycbcr_input.h
+++ b/ycbcr_input.h
@@ -1,5 +1,5 @@
-#ifndef _YCBCR_INPUT_H
-#define _YCBCR_INPUT_H 1
+#ifndef _MOVIT_YCBCR_INPUT_H
+#define _MOVIT_YCBCR_INPUT_H 1

 
 // YCbCrInput is for handling planar 8-bit Y'CbCr (also sometimes, usually rather
 // imprecisely, called “YUV”), which is typically what you get from a video decoder.
 
 // YCbCrInput is for handling planar 8-bit Y'CbCr (also sometimes, usually rather
 // imprecisely, called “YUV”), which is typically what you get from a video decoder.


@@ -96,4 +96,4 @@ private:
        unsigned pitch[3];
 };
 
        unsigned pitch[3];
 };
 

-#endif // !defined(_YCBCR_INPUT_H)
+#endif // !defined(_MOVIT_YCBCR_INPUT_H)