From ac4fc36aa70ffefb6b9632dc0abea5cbbce5387b Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Sun, 3 Feb 2013 15:14:11 +0100 Subject: [PATCH] Prefix include guards with _MOVIT to avoid clashes with external files. --- alpha_division_effect.h | 6 +++--- alpha_multiplication_effect.h | 6 +++--- blur_effect.h | 6 +++--- colorspace_conversion_effect.h | 6 +++--- d65.h | 6 +++--- deconvolution_sharpen_effect.h | 6 +++--- diffusion_effect.h | 6 +++--- dither_effect.h | 6 +++--- effect.h | 6 +++--- effect_chain.h | 6 +++--- effect_util.h | 6 +++--- flat_input.h | 6 +++--- gamma_compression_effect.h | 6 +++--- gamma_expansion_effect.h | 6 +++--- glow_effect.h | 6 +++--- image_format.h | 6 +++--- init.h | 6 +++--- input.h | 6 +++--- lift_gamma_gain_effect.h | 6 +++--- mirror_effect.h | 6 +++--- mix_effect.h | 6 +++--- overlay_effect.h | 6 +++--- padding_effect.h | 6 +++--- resample_effect.h | 6 +++--- resize_effect.h | 6 +++--- sandbox_effect.h | 6 +++--- saturation_effect.h | 6 +++--- test_util.h | 6 +++--- unsharp_mask_effect.h | 6 +++--- util.h | 6 +++--- vignette_effect.h | 6 +++--- white_balance_effect.h | 6 +++--- widgets.h | 6 +++--- ycbcr_input.h | 6 +++--- 34 files changed, 102 insertions(+), 102 deletions(-) diff --git a/alpha_division_effect.h b/alpha_division_effect.h index 2b51c3a..b95e9fe 100644 --- 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. @@ -14,4 +14,4 @@ public: 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 2425a42..b9cf251 100644 --- 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. @@ -14,4 +14,4 @@ public: 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 5a04415..84dd6ba 100644 --- 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 @@ -92,4 +92,4 @@ private: 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 93b1859..8e691c4 100644 --- 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 @@ -30,4 +30,4 @@ private: 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 8f1f3e7..807c274 100644 --- 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 @@ -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; -#endif // !defined(_D65_H) +#endif // !defined(_MOVIT_D65_H) diff --git a/deconvolution_sharpen_effect.h b/deconvolution_sharpen_effect.h index 80553ad..9279abf 100644 --- 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 @@ -68,4 +68,4 @@ private: 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 64d743d..390787d 100644 --- 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 @@ -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 3143907..f9f371c 100644 --- 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. // @@ -78,4 +78,4 @@ private: bool need_texture_update; }; -#endif // !defined(_DITHER_EFFECT_H) +#endif // !defined(_MOVIT_DITHER_EFFECT_H) diff --git a/effect.h b/effect.h index 65fdf52..7884509 100644 --- 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. @@ -284,4 +284,4 @@ private: std::map params_tex_1d; }; -#endif // !defined(_EFFECT_H) +#endif // !defined(_MOVIT_EFFECT_H) diff --git a/effect_chain.h b/effect_chain.h index ddabad9..f41e7e4 100644 --- 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 #include @@ -237,4 +237,4 @@ private: bool finalized; }; -#endif // !defined(_EFFECT_CHAIN_H) +#endif // !defined(_MOVIT_EFFECT_CHAIN_H) diff --git a/effect_util.h b/effect_util.h index 13a7754..1c2e92c 100644 --- 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. @@ -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); -#endif // !defined(_EFFECT_UTIL_H) +#endif // !defined(_MOVIT_EFFECT_UTIL_H) diff --git a/flat_input.h b/flat_input.h index 80e113f..4728fb0 100644 --- 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 #include @@ -96,4 +96,4 @@ private: 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 6727e6e..c494cd7 100644 --- 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 @@ -35,4 +35,4 @@ private: 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 cc65e4f..07d94be 100644 --- 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 @@ -36,4 +36,4 @@ private: 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 3453c99..91106e0 100644 --- 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. @@ -55,4 +55,4 @@ private: float cutoff; }; -#endif // !defined(_GLOW_EFFECT_H) +#endif // !defined(_MOVIT_GLOW_EFFECT_H) diff --git a/image_format.h b/image_format.h index 90f6034..3766235 100644 --- 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, @@ -38,4 +38,4 @@ struct ImageFormat { GammaCurve gamma_curve; }; -#endif // !defined(_IMAGE_FORMAT_H) +#endif // !defined(_MOVIT_IMAGE_FORMAT_H) diff --git a/init.h b/init.h index 7cee858..53a4018 100644 --- 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 @@ -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; -#endif // !defined(_INIT_H) +#endif // !defined(_MOVIT_INIT_H) diff --git a/input.h b/input.h index db1eae9..da5b1fb 100644 --- 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 @@ -35,4 +35,4 @@ public: 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 bd1ec16..60978f4 100644 --- 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. // @@ -38,4 +38,4 @@ private: 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 a33921b..bd319cc 100644 --- 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. @@ -18,4 +18,4 @@ public: 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 4ef62fe..fda06a6 100644 --- 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). @@ -25,4 +25,4 @@ private: 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 66ff31b..444fe3f 100644 --- 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 @@ -31,4 +31,4 @@ public: 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 a836ba2..797db7e 100644 --- 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 @@ -39,4 +39,4 @@ private: 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 b66ca6f..c81362f 100644 --- 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. // @@ -99,4 +99,4 @@ private: 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 8fbaba7..774f510 100644 --- 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"). @@ -28,4 +28,4 @@ private: 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 072bc2b..80ef8a2 100644 --- 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. // @@ -25,4 +25,4 @@ private: float parm; }; -#endif // !defined(_SANDBOX_EFFECT_H) +#endif // !defined(_MOVIT_SANDBOX_EFFECT_H) diff --git a/saturation_effect.h b/saturation_effect.h index 710dcfd..f4d69e6 100644 --- 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 @@ -22,4 +22,4 @@ private: float saturation; }; -#endif // !defined(_SATURATION_EFFECT_H) +#endif // !defined(_MOVIT_SATURATION_EFFECT_H) diff --git a/test_util.h b/test_util.h index 1f48ae1..10ecf9f 100644 --- 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 #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); -#endif // !defined(_TEST_UTIL_H) +#endif // !defined(_MOVIT_TEST_UTIL_H) diff --git a/unsharp_mask_effect.h b/unsharp_mask_effect.h index b0c9377..ba54a96 100644 --- 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 @@ -43,4 +43,4 @@ private: MixEffect *mix; }; -#endif // !defined(_UNSHARP_MASK_EFFECT_H) +#endif // !defined(_MOVIT_UNSHARP_MASK_EFFECT_H) diff --git a/util.h b/util.h index 5839e5b..e12c2c4 100644 --- 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. @@ -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 -#endif // !defined(_UTIL_H) +#endif // !defined(_MOVIT_UTIL_H) diff --git a/vignette_effect.h b/vignette_effect.h index d13bf85..febdc44 100644 --- 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). @@ -25,4 +25,4 @@ private: 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 c4e46a4..5a8ecd5 100644 --- 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. @@ -26,4 +26,4 @@ private: 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 d7c3c5e..18a8334 100644 --- 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. @@ -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); -#endif // !defined(_WIDGETS_H) +#endif // !defined(_MOVIT_WIDGETS_H) diff --git a/ycbcr_input.h b/ycbcr_input.h index 2220f5d..1225d6e 100644 --- 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. @@ -96,4 +96,4 @@ private: unsigned pitch[3]; }; -#endif // !defined(_YCBCR_INPUT_H) +#endif // !defined(_MOVIT_YCBCR_INPUT_H) -- 2.39.2