Change TypeDef.h filename and location

This commit is contained in:
jfmcarreira committed 2014-05-22 00:45:21 +01:00
1 parent 2c2071e56d
commit 225fb767b3
23 files changed
+27 -45

No files matched your search

+2 -2
View File
@@ -26,7 +26,7 @@
#define __CONFIGUREFORMATDIALOG_H__
#include "config.h"
#include "PlaYUVerDefs.h"
#if( QT_VERSION_PLAYUVER == 5 )
#include <QtWidgets>
#elif( QT_VERSION_PLAYUVER == 4 )
@@ -34,7 +34,7 @@
#endif
#include <QtCore>
#include "TypeDef.h"
class QPixmap;
class QColor;
-2
View File
@@ -24,8 +24,6 @@
#include "DialogSubWindowSelector.h"
#include "SubWindowHandle.h"
//#include "PlaYUVerFrame.h"
//#include "InputStream.h"
namespace plaYUVer
{
+1 -3
View File
@@ -26,7 +26,7 @@
#define __DIALOGSUBWINDOWSELECTOR_H__
#include "config.h"
#include "PlaYUVerDefs.h"
#if( QT_VERSION_PLAYUVER == 5 )
#include <QtWidgets>
#elif( QT_VERSION_PLAYUVER == 4 )
@@ -34,8 +34,6 @@
#endif
#include <QtCore>
#include "TypeDef.h"
class QPixmap;
class QColor;
+2
View File
@@ -26,6 +26,8 @@
#ifndef __GRIDMANAGER_H__
#define __GRIDMANAGER_H__
#include "config.h"
#include "PlaYUVerDefs.h"
#include <QRect>
#include <QColor>
#include <QPen>
+3 -1
View File
@@ -25,11 +25,13 @@
//TODO:
// - Optimizar paintEvent. Parece haver codigo redundante !!
#include "config.h"
#include "PlaYUVerDefs.h"
#include <cmath>
#include <QtGui>
#include <QtDebug>
#include "HistogramWidget.h"
#include "TypeDef.h"
#include "PlaYUVerFrameStatistics.h"
#include "PlaYUVerFrame.h"
+1 -2
View File
@@ -27,10 +27,9 @@
#define __HISTOGRAMWIDGET_H__
#include "config.h"
#include "PlaYUVerDefs.h"
#include <QWidget>
#include <QColor>
#include "TypeDef.h"
#include "PlaYUVerFrame.h"
#include "PlaYUVerFrameStatistics.h"
+1 -6
View File
@@ -26,13 +26,11 @@
#define __INPUTSTREAM_H__
#include "config.h"
#include "PlaYUVerDefs.h"
#include <iostream>
#include <cstdio>
#include <QtCore>
#include <QtGui>
#ifdef USE_OPENCV
#include <opencv2/opencv.hpp>
#endif
@@ -40,9 +38,6 @@
#ifdef USE_FFMPEG
#include "LibAvContextHandle.h"
#endif
#include "TypeDef.h"
#include "PlaYUVerFrame.h"
namespace plaYUVer
+1 -1
View File
@@ -25,6 +25,7 @@
#define __MODULESHANDLE_H__
#include "config.h"
#include "PlaYUVerDefs.h"
#include <iostream>
#include <cstdio>
@@ -36,7 +37,6 @@
#include <QtGui>
#endif
#include "TypeDef.h"
#include "PlaYUVerModuleIf.h"
namespace plaYUVer
+1 -3
View File
@@ -26,11 +26,9 @@
#define __PLAYUVERMODULESIF_H__
#include "config.h"
#include "PlaYUVerDefs.h"
#include <iostream>
#include <cstdio>
#include "TypeDef.h"
#include "PlaYUVerFrame.h"
class QImage;
+1 -2
View File
@@ -26,9 +26,8 @@
#define __PLAYUVERSETTINGS_H__
#include "config.h"
#include "PlaYUVerDefs.h"
#include <QtCore>
#include "TypeDef.h"
#include "GridManager.h"
namespace plaYUVer
+1 -1
View File
@@ -23,10 +23,10 @@
*/
#include "config.h"
#include "PlaYUVerDefs.h"
#include <cmath>
#include <QtGui>
#include <QtDebug>
#include "TypeDef.h"
#include "PropertiesSidebar.h"
namespace plaYUVer
+2
View File
@@ -25,6 +25,8 @@
#ifndef __PROPERTIESSIDEBAR_H__
#define __PROPERTIESSIDEBAR_H__
#include "config.h"
#include "PlaYUVerDefs.h"
#if( QT_VERSION_PLAYUVER == 5 )
#include <QtWidgets>
#elif( QT_VERSION_PLAYUVER == 4 )
+1 -3
View File
@@ -26,14 +26,12 @@
#define __SUBWINDOWHANDLE_H__
#include "config.h"
#include "PlaYUVerDefs.h"
#if( QT_VERSION_PLAYUVER == 5 )
#include <QtWidgets>
#elif( QT_VERSION_PLAYUVER == 4 )
#include <QtGui>
#endif
#include "TypeDef.h"
#include "InputStream.h"
#include "ViewArea.h"
#include "ModulesHandle.h"
-156
View File
@@ -1,156 +0,0 @@
/* This file is a part of plaYUVer project
* Copyright (C) 2014 by Luis Lucas (luisfrlucas@gmail.com)
* Joao Carreira (jfmcarreira@gmail.com)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
/**
* \file TypeDef.h
* \brief Define basic types, new types and enumerations
*/
#ifndef __TYPEDEF_H__
#define __TYPEDEF_H__
#ifndef __MAKE_LIB__
#include "config.h"
#endif
#include <string>
namespace plaYUVer
{
// ====================================================================================================================
// Basic type redefinition
// ====================================================================================================================
typedef void Void;
typedef bool Bool;
typedef char Char;
typedef unsigned char UChar;
typedef short Short;
typedef unsigned short UShort;
typedef int Int;
typedef unsigned int UInt;
typedef double Double;
typedef float Float;
// ====================================================================================================================
// 64-bit integer type
// ====================================================================================================================
#ifdef _MSC_VER
typedef __int64 Int64;
#if _MSC_VER <= 1200 // MS VC6
typedef __int64 UInt64; // MS VC6 does not support unsigned __int64 to double conversion
#else
typedef unsigned __int64 UInt64;
#endif
#else
typedef long long Int64;
typedef unsigned long long UInt64;
#endif
// ====================================================================================================================
// Type definition
// ====================================================================================================================
typedef UChar Pel; ///< 8-bit pixel type
//typedef Short Pel; ///< 16-bit pixel type
// ====================================================================================================================
// Limits definition
// ====================================================================================================================
#define MAX_UINT 0xFFFFFFFFU ///< max. value of unsigned 32-bit integer
#define MAX_INT 2147483647 ///< max. value of signed 32-bit integer
#define MAX_INT64 0x7FFFFFFFFFFFFFFFLL ///< max. value of signed 64-bit integer
#define MAX_DOUBLE 1.7e+308 ///< max. value of double-type value
// ====================================================================================================================
// Macro functions
// ====================================================================================================================
#define DATA_ALIGN 1 ///< use 32-bit aligned malloc/free
#if DATA_ALIGN && _WIN32 && ( _MSC_VER > 1300 )
#define xMalloc( type, len ) _aligned_malloc( sizeof(type)*(len), 32 )
#define xFree( ptr ) _aligned_free ( ptr )
#define xMemSet( type, len, ptr )
#else
#define xMemSet( type, len, ptr ) memset ( ptr, 0, (len)*sizeof(type) )
#define xMalloc( type, len ) malloc ( sizeof(type)*(len) )
#define xFree( ptr ) free ( ptr )
#endif
// ====================================================================================================================
// Qt functions
// ====================================================================================================================
#if( QT_VERSION_PLAYUVER == 4 )
#define QStringLiteral QString::fromUtf8
#endif
// ====================================================================================================================
// PlaYUVer definitions
// ====================================================================================================================
enum YUVcomponent
{
LUMA = 0,
CHROMA_U,
CHROMA_V,
};
enum RGBcomponent
{
COLOR_R = 0,
COLOR_G,
COLOR_B,
};
typedef struct __pixel_definition
{
Int color_space;
union
{
Pel Luma;
Pel ColorR;
};
union
{
Pel ChromaU;
Pel ColorG;
};
union
{
Pel ChromaV;
Pel ColorB;
};
}Pixel;
enum eTool
{
NavigationTool, NormalSelectionTool, BlockSelectionTool, MaskTool, EraserTool
};
} // NAMESPACE
#endif // __TYPEDEF_H__
+2 -2
View File
@@ -26,12 +26,12 @@
#ifndef __VIEWAREA_H__
#define __VIEWAREA_H__
#include "config.h"
#include "PlaYUVerDefs.h"
#include <QWidget>
#include <QPixmap>
#include <QBitmap>
#include <QColor>
#include "TypeDef.h"
#include "GridManager.h"
#include "PlaYUVerFrame.h"
+1 -3
View File
@@ -26,15 +26,13 @@
#define __PLAYUVERAPP_H__
#include "config.h"
#include "PlaYUVerDefs.h"
#if( QT_VERSION_PLAYUVER == 5 )
#include <QtWidgets>
#elif( QT_VERSION_PLAYUVER == 4 )
#include <QtGui>
#endif
#include <QMainWindow>
#include "TypeDef.h"
#include "ModulesHandle.h"
#include "PropertiesSidebar.h"