[DEV] replace 'include guard' with 'pragma once'

This commit is contained in:
Edouard DUPIN 2016-02-02 21:18:54 +01:00
parent 0c23fe23a3
commit 054966f3c5
9 changed files with 20 additions and 55 deletions

View File

@ -5,9 +5,7 @@
* *
* @license APACHE v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */
#pragma once
#ifndef __EGAMI_IMAGE_H__
#define __EGAMI_IMAGE_H__
#include <etk/types.h> #include <etk/types.h>
#include <vector> #include <vector>
@ -88,7 +86,6 @@ namespace egami {
void set(const std::vector<etk::Color<float,4>>& _data, const ivec2& _size); void set(const std::vector<etk::Color<float,4>>& _data, const ivec2& _size);
void set(const std::vector<etk::Color<uint8_t,4>>& _data, const ivec2& _size); void set(const std::vector<etk::Color<uint8_t,4>>& _data, const ivec2& _size);
}; };
}; }
#endif

View File

@ -6,8 +6,7 @@
* @license APACHE v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */
#ifndef __EGAMI_IMAGE_MONO_H__ #pragma once
#define __EGAMI_IMAGE_MONO_H__
#include <etk/types.h> #include <etk/types.h>
#include <vector> #include <vector>
@ -49,8 +48,5 @@ namespace egami {
const uint8_t& get(const ivec2& _pos) const; const uint8_t& get(const ivec2& _pos) const;
void set(const ivec2& _pos, const uint8_t& _newColor); void set(const ivec2& _pos, const uint8_t& _newColor);
}; };
}
};
#endif

View File

@ -5,9 +5,7 @@
* *
* @license APACHE v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */
#pragma once
#ifndef __EGAMI_IMAGE_PRIVATE_H__
#define __EGAMI_IMAGE_PRIVATE_H__
#include <etk/types.h> #include <etk/types.h>
#include <vector> #include <vector>
@ -279,4 +277,3 @@ namespace egami {
} }
}; };
#endif

View File

@ -5,9 +5,7 @@
* *
* @license APACHE v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */
#pragma once
#ifndef __EGAMI_DEBUG_H__
#define __EGAMI_DEBUG_H__
#include <etk/log.h> #include <etk/log.h>
@ -39,5 +37,3 @@ namespace egami {
} \ } \
} while (0) } while (0)
#endif

View File

@ -5,9 +5,7 @@
* *
* @license APACHE v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */
#pragma once
#ifndef __EGAMI_H__
#define __EGAMI_H__
#include <etk/types.h> #include <etk/types.h>
#include <vector> #include <vector>
@ -16,8 +14,7 @@
#include <egami/Image.h> #include <egami/Image.h>
#include <egami/ImageMono.h> #include <egami/ImageMono.h>
namespace egami namespace egami {
{
/** /**
* @brief Load a specific ilage file in the requested image data. * @brief Load a specific ilage file in the requested image data.
* @param[out] _output Data of the image. * @param[out] _output Data of the image.
@ -47,7 +44,6 @@ namespace egami
* @return false An error occured. * @return false An error occured.
*/ */
bool generateDistanceFieldFile(const std::string& _input, const std::string& _output); bool generateDistanceFieldFile(const std::string& _input, const std::string& _output);
}; }
#endif

View File

@ -5,14 +5,11 @@
* *
* @license APACHE v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */
#pragma once
#ifndef __EGAMI_WRAPPER_BMP_H__
#define __EGAMI_WRAPPER_BMP_H__
#include <egami/egami.h> #include <egami/egami.h>
namespace egami namespace egami {
{
/** /**
* @breif Load a bmp file in the image. * @breif Load a bmp file in the image.
* @param[in] _fileName Name of the file. * @param[in] _fileName Name of the file.
@ -27,7 +24,6 @@ namespace egami
* @return true if all is done correctly, false otherwise. * @return true if all is done correctly, false otherwise.
*/ */
bool storeBMP(const std::string& _fileName, const egami::Image& _inputImage); bool storeBMP(const std::string& _fileName, const egami::Image& _inputImage);
}; }
#endif

View File

@ -5,9 +5,7 @@
* *
* @license APACHE v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */
#pragma once
#ifndef __EGAMI_WRAPPER_EDF_H__
#define __EGAMI_WRAPPER_EDF_H__
#include <egami/egami.h> #include <egami/egami.h>
@ -35,7 +33,5 @@ namespace egami {
* @return true if all is done correctly, false otherwise. * @return true if all is done correctly, false otherwise.
*/ */
bool storeEDF(const std::string& _fileName, const egami::Image& _inputImage); bool storeEDF(const std::string& _fileName, const egami::Image& _inputImage);
}; }
#endif

View File

@ -5,14 +5,11 @@
* *
* @license APACHE v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */
#pragma once
#ifndef __EGAMI_WRAPPER_PNG_H__
#define __EGAMI_WRAPPER_PNG_H__
#include <egami/egami.h> #include <egami/egami.h>
namespace egami namespace egami {
{
/** /**
* @breif Load a png file in the image. * @breif Load a png file in the image.
* @param[in] _fileName Name of the file. * @param[in] _fileName Name of the file.
@ -20,7 +17,5 @@ namespace egami
* @return true if all is done correctly, false otherwise. * @return true if all is done correctly, false otherwise.
*/ */
bool loadPNG(const std::string& _fileName, egami::Image& _ouputImage); bool loadPNG(const std::string& _fileName, egami::Image& _ouputImage);
}; }
#endif

View File

@ -5,14 +5,11 @@
* *
* @license APACHE v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */
#pragma once
#ifndef __EGAMI_WRAPPER_SVG_H__
#define __EGAMI_WRAPPER_SVG_H__
#include <egami/egami.h> #include <egami/egami.h>
namespace egami namespace egami {
{
/** /**
* @breif Load a svg file in the image. * @breif Load a svg file in the image.
* @param[in] _fileName Name of the file. * @param[in] _fileName Name of the file.
@ -21,6 +18,5 @@ namespace egami
* @return true if all is done correctly, false otherwise. * @return true if all is done correctly, false otherwise.
*/ */
bool loadSVG(const std::string& _fileName, egami::Image& _ouputImage, const ivec2& _size=ivec2(-1,-1)); bool loadSVG(const std::string& _fileName, egami::Image& _ouputImage, const ivec2& _size=ivec2(-1,-1));
}; }
#endif