atria-soft/egami
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEV/API] change .h in .hpp

Browse Source
This commit is contained in:
Edouard DUPIN 2016-09-30 22:28:36 +02:00
parent 10221e57cc
commit ce80d954b7
24 changed files with 76 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
egami/Image.cpp
View File

@ -4,10 +4,10 @@
* @license APACHE v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */
#include <egami/Image.h> #include <egami/Image.hpp>
#include <egami/debug.h> #include <egami/debug.hpp>
#include <egami/ImagePrivate.h> #include <egami/ImagePrivate.hpp>
#include <ememory/memory.h> #include <ememory/memory.hpp>
std::ostream& egami::operator <<(std::ostream& _os, const enum egami::colorType _type) { std::ostream& egami::operator <<(std::ostream& _os, const enum egami::colorType _type) {
switch (_type) { switch (_type) {

10
egami/Image.h → egami/Image.hpp
View File

@ -5,12 +5,12 @@
*/ */
#pragma once #pragma once
#include <etk/types.h> #include <etk/types.hpp>
#include <vector> #include <vector>
#include <etk/math/Vector2D.h> #include <etk/math/Vector2D.hpp>
#include <etk/Color.h> #include <etk/Color.hpp>
#include <etk/stdTools.h> #include <etk/stdTools.hpp>
#include <ememory/memory.h> #include <ememory/memory.hpp>
namespace egami { namespace egami {
enum class colorType { enum class colorType {

4
egami/ImageMono.cpp
View File

@ -4,8 +4,8 @@
* @license APACHE v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */
#include <egami/ImageMono.h> #include <egami/ImageMono.hpp>
#include <egami/debug.h> #include <egami/debug.hpp>
egami::ImageMono::ImageMono(const ivec2& _size) : egami::ImageMono::ImageMono(const ivec2& _size) :
m_size(_size) { m_size(_size) {

8
egami/ImageMono.h → egami/ImageMono.hpp
View File

@ -3,13 +3,13 @@
* @copyright 2011, Edouard DUPIN, all right reserved * @copyright 2011, Edouard DUPIN, all right reserved
* @license APACHE v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */
#pragma once #pragma once
#include <etk/types.h> #include <etk/types.hpp>
#include <etk/math/Vector2D.hpp>
#include <etk/Color.hpp>
#include <vector> #include <vector>
#include <etk/math/Vector2D.h>
#include <etk/Color.h>
namespace egami { namespace egami {
class ImageMono { class ImageMono {

9
egami/ImagePrivate.h → egami/ImagePrivate.hpp
View File

@ -5,11 +5,12 @@
*/ */
#pragma once #pragma once
#include <etk/types.h> #include <etk/types.hpp>
#include <etk/math/Vector2D.hpp>
#include <etk/Color.hpp>
#include <egami/debug.hpp>
#include <vector> #include <vector>
#include <etk/math/Vector2D.h>
#include <etk/Color.h>
#include <egami/debug.h>
namespace egami { namespace egami {

2
egami/debug.cpp
View File

@ -4,7 +4,7 @@
* @license APACHE v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */
#include <egami/debug.h> #include <egami/debug.hpp>
int32_t egami::getLogId() { int32_t egami::getLogId() {
static int32_t g_val = elog::registerInstance("egami"); static int32_t g_val = elog::registerInstance("egami");

2
egami/debug.h → egami/debug.hpp
View File

@ -5,7 +5,7 @@
*/ */
#pragma once #pragma once
#include <elog/log.h> #include <elog/log.hpp>
namespace egami { namespace egami {
int32_t getLogId(); int32_t getLogId();

14
egami/egami.cpp
View File

@ -4,14 +4,14 @@
* @license APACHE v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */
#include <egami/egami.h> #include <egami/egami.hpp>
#include <egami/debug.h> #include <egami/debug.hpp>
#include <egami/wrapperSVG.h> #include <egami/wrapperSVG.hpp>
#include <egami/wrapperPNG.h> #include <egami/wrapperPNG.hpp>
#include <egami/wrapperBMP.h> #include <egami/wrapperBMP.hpp>
#include <egami/wrapperEDF.h> #include <egami/wrapperEDF.hpp>
#include <edtaa3/edtaa3func.h> #include <edtaa3/edtaa3func.hpp>
bool egami::scalable(const std::string& _fileName) { bool egami::scalable(const std::string& _fileName) {
if (true == etk::end_with(_fileName, ".svg") ) { if (true == etk::end_with(_fileName, ".svg") ) {

10
egami/egami.h → egami/egami.hegami.hpp
View File

@ -5,12 +5,12 @@
*/ */
#pragma once #pragma once
#include <etk/types.h> #include <etk/types.hpp>
#include <vector> #include <vector>
#include <etk/math/Vector2D.h> #include <etk/math/Vector2D.hpp>
#include <etk/Color.h> #include <etk/Color.hpp>
#include <egami/Image.h> #include <egami/Image.hpp>
#include <egami/ImageMono.h> #include <egami/ImageMono.hpp>
namespace egami { namespace egami {
/** /**

10
egami/wrapperBMP.cpp
View File

@ -4,11 +4,11 @@
* @license APACHE v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */
#include <etk/types.h> #include <etk/types.hpp>
#include <egami/debug.h> #include <egami/debug.hpp>
#include <egami/Image.h> #include <egami/Image.hpp>
#include <egami/wrapperBMP.h> #include <egami/wrapperBMP.hpp>
#include <etk/os/FSNode.h> #include <etk/os/FSNode.hpp>
extern "C" { extern "C" {
#pragma pack(push,1) #pragma pack(push,1)
struct bitmapFileHeader { struct bitmapFileHeader {

2
egami/wrapperBMP.h → egami/wrapperBMP.hpp
View File

@ -5,7 +5,7 @@
*/ */
#pragma once #pragma once
#include <egami/egami.h> #include <egami/egami.hpp>
namespace egami { namespace egami {
/** /**

10
egami/wrapperEDF.cpp
View File

@ -4,11 +4,11 @@
* @license APACHE v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */
#include <etk/types.h> #include <etk/types.hpp>
#include <egami/debug.h> #include <egami/debug.hpp>
#include <egami/Image.h> #include <egami/Image.hpp>
#include <egami/wrapperEDF.h> #include <egami/wrapperEDF.hpp>
#include <etk/os/FSNode.h> #include <etk/os/FSNode.hpp>
//EDF format is a simple format for image in text for distance field image (special case) //EDF format is a simple format for image in text for distance field image (special case)
// it is composed of the fist line : description of type (starting with #EDF and some other information, the data start just after the first \n // it is composed of the fist line : description of type (starting with #EDF and some other information, the data start just after the first \n

2
egami/wrapperEDF.h → egami/wrapperEDF.hpp
View File

@ -5,7 +5,7 @@
*/ */
#pragma once #pragma once
#include <egami/egami.h> #include <egami/egami.hpp>
namespace egami { namespace egami {
/** /**

12
egami/wrapperPNG.cpp
View File

@ -4,12 +4,12 @@
* @license APACHE v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */
#include <etk/types.h> #include <etk/types.hpp>
#include <egami/debug.h> #include <egami/debug.hpp>
#include <egami/Image.h> #include <egami/Image.hpp>
#include <egami/wrapperPNG.h> #include <egami/wrapperPNG.hpp>
#include <etk/os/FSNode.h> #include <etk/os/FSNode.hpp>
#include <png/png.h> #include <png/png.hpp>
// we must change the access of the IO of the png lib : // we must change the access of the IO of the png lib :
static void local_ReadData(png_structp png_ptr, png_bytep data, png_size_t length) { static void local_ReadData(png_structp png_ptr, png_bytep data, png_size_t length) {

2
egami/wrapperPNG.h → egami/wrapperPNG.hpp
View File

@ -5,7 +5,7 @@
*/ */
#pragma once #pragma once
#include <egami/egami.h> #include <egami/egami.hpp>
namespace egami { namespace egami {
/** /**

12
egami/wrapperSVG.cpp
View File

@ -4,12 +4,12 @@
* @license APACHE v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */
#include <etk/types.h> #include <etk/types.hpp>
#include <egami/debug.h> #include <egami/debug.hpp>
#include <egami/Image.h> #include <egami/Image.hpp>
#include <egami/wrapperSVG.h> #include <egami/wrapperSVG.hpp>
#include <etk/os/FSNode.h> #include <etk/os/FSNode.hpp>
#include <esvg/esvg.h> #include <esvg/esvg.hpp>
egami::Image egami::loadSVG(const std::string& _fileName, const ivec2& _size) { egami::Image egami::loadSVG(const std::string& _fileName, const ivec2& _size) {

2
egami/wrapperSVG.h → egami/wrapperSVG.hpp
View File

@ -5,7 +5,7 @@
*/ */
#pragma once #pragma once
#include <egami/egami.h> #include <egami/egami.hpp>
namespace egami { namespace egami {
/** /**

6
lutin_egami.py
View File

@ -38,9 +38,9 @@ def create(target, module_name):
'egami/wrapperEDF.cpp' 'egami/wrapperEDF.cpp'
]) ])
my_module.add_header_file([ my_module.add_header_file([
'egami/Image.h', 'egami/Image.hpp',
'egami/ImageMono.h', 'egami/ImageMono.hpp',
'egami/egami.h', 'egami/egami.hpp',
]) ])
my_module.add_depend(['etk', 'png', 'esvg', 'edtaa3']) my_module.add_depend(['etk', 'png', 'esvg', 'edtaa3'])
my_module.add_flag('c++', [ my_module.add_flag('c++', [

8
sample/main.cpp
View File

@ -4,10 +4,10 @@
* @license APACHE v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */
#include <test-debug/debug.h> #include <test-debug/debug.hpp>
#include <etk/etk.h> #include <etk/etk.hpp>
#include "read.h" #include "read.hpp"
#include "write.h" #include "write.hpp"
int main(int argc, const char *argv[]) { int main(int argc, const char *argv[]) {
// the only one init for etk: // the only one init for etk:

8
sample/read.cpp
View File

@ -5,12 +5,12 @@
*/ */
//! [egami_sample_read_all] //! [egami_sample_read_all]
#include <test-debug/debug.h> #include <test-debug/debug.hpp>
#include <etk/math/Vector2D.h> #include <etk/math/Vector2D.hpp>
//! [egami_sample_include] //! [egami_sample_include]
#include <egami/egami.h> #include <egami/egami.hpp>
//! [egami_sample_include] //! [egami_sample_include]
#include "read.h" #include "read.hpp"
static void readBMP() { static void readBMP() {

0
sample/read.h → sample/read.hpp
View File

6
sample/write.cpp
View File

@ -5,9 +5,9 @@
*/ */
//! [egami_sample_write_all] //! [egami_sample_write_all]
#include <test-debug/debug.h> #include <test-debug/debug.hpp>
#include <egami/egami.h> #include <egami/egami.hpp>
#include "write.h" #include "write.hpp"
static void writeBMP() { static void writeBMP() {

0
sample/write.h → sample/write.hpp
View File

4
test/main.cpp
View File

@ -4,8 +4,8 @@
* @license APACHE v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */
#include <test-debug/debug.h> #include <test-debug/debug.hpp>
#include <etk/etk.h> #include <etk/etk.hpp>
#include <gtest/gtest.h> #include <gtest/gtest.h>