mirror/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2026-04-24 07:29:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

dos2unix

Browse Source
This commit is contained in:
David Rose
2006-09-01 18:52:52 +00:00
parent 037864e7a0
commit a3cc24dd6f
45 changed files with 22131 additions and 22131 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dtool/src/cppparser/cppPreprocessor.cxx
+7 -7
View File
@@ -1232,13 +1232,13 @@ handle_define_directive(const string &args, int first_line,
}
}
// ok one memory leak here..
Manifests::iterator mi = _manifests.find(manifest->_name);
if(mi != _manifests.end())
{
// i do not see a goodway to compare the old and new hmmmm
//cerr << "Warning Overwriting Constant " << manifest->_name << "\n";
delete mi->second;
// ok one memory leak here..
Manifests::iterator mi = _manifests.find(manifest->_name);
if(mi != _manifests.end())
{
// i do not see a goodway to compare the old and new hmmmm
//cerr << "Warning Overwriting Constant " << manifest->_name << "\n";
delete mi->second;
}
_manifests[manifest->_name] = manifest;
dtool/src/parser-inc/cv.h
+7 -7
View File
@@ -1,8 +1,8 @@
#ifndef _CV_H_
#define _CV_H_
typedef struct CvCapture CvCapture;
typedef struct CvMemStorage CvMemStorage;
typedef struct CvHaarClassifierCascade CvHaarClassifierCascade;
#ifndef _CV_H_
#define _CV_H_
typedef struct CvCapture CvCapture;
typedef struct CvMemStorage CvMemStorage;
typedef struct CvHaarClassifierCascade CvHaarClassifierCascade;
#endif
dtool/src/parser-inc/cvtypes.h
+13 -13
View File
@@ -1,13 +1,13 @@
#ifndef _CVTYPES_H_
#define _CVTYPES_H_
struct CvHaarClassifierCascade
#endif /*_CVTYPES_H_*/
/* End of file. */
#ifndef _CVTYPES_H_
#define _CVTYPES_H_
struct CvHaarClassifierCascade
#endif /*_CVTYPES_H_*/
/* End of file. */
dtool/src/parser-inc/cxcore.h
+6 -6
View File
@@ -1,6 +1,6 @@
#ifndef _CXCORE_H_
#define _CXCORE_H_
//Python stub
#endif
#ifndef _CXCORE_H_
#define _CXCORE_H_
//Python stub
#endif
dtool/src/parser-inc/cxerror.h
+6 -6
View File
@@ -1,7 +1,7 @@
#ifndef _CXCORE_ERROR_H_
#define _CXCORE_ERROR_H_
//python stub
#ifndef _CXCORE_ERROR_H_
#define _CXCORE_ERROR_H_
//python stub
#endif
dtool/src/parser-inc/cxtypes.h
+78 -78
View File
@@ -1,78 +1,78 @@
#ifndef _CXCORE_TYPES_H_
#define _CXCORE_TYPES_H_
#include <assert.h>
#include <stdlib.h>
#include <string.h>
typedef struct IplImage
{
int nSize; /* sizeof(IplImage) */
int ID; /* version (=0)*/
int nChannels; /* Most of OpenCV functions support 1,2,3 or 4 channels */
int alphaChannel; /* ignored by OpenCV */
int depth; /* pixel depth in bits: IPL_DEPTH_8U, IPL_DEPTH_8S, IPL_DEPTH_16S,
IPL_DEPTH_32S, IPL_DEPTH_32F and IPL_DEPTH_64F are supported */
char colorModel[4]; /* ignored by OpenCV */
char channelSeq[4]; /* ditto */
int dataOrder; /* 0 - interleaved color channels, 1 - separate color channels.
cvCreateImage can only create interleaved images */
int origin; /* 0 - top-left origin,
1 - bottom-left origin (Windows bitmaps style) */
int align; /* Alignment of image rows (4 or 8).
OpenCV ignores it and uses widthStep instead */
int width; /* image width in pixels */
int height; /* image height in pixels */
struct _IplROI *roi;/* image ROI. if NULL, the whole image is selected */
struct _IplImage *maskROI; /* must be NULL */
void *imageId; /* ditto */
struct _IplTileInfo *tileInfo; /* ditto */
int imageSize; /* image data size in bytes
(==image->height*image->widthStep
in case of interleaved data)*/
char *imageData; /* pointer to aligned image data */
int widthStep; /* size of aligned image row in bytes */
int BorderMode[4]; /* ignored by OpenCV */
int BorderConst[4]; /* ditto */
char *imageDataOrigin; /* pointer to very origin of image data
(not necessarily aligned) -
needed for correct deallocation */
} IplImage;
struct IplROI
{
int coi; /* 0 - no COI (all channels are selected), 1 - 0th channel is selected ...*/
int xOffset;
int yOffset;
int width;
int height;
};
typedef struct CvRect
{
int x;
int y;
int width;
int height;
}
CvRect;
struct CvMemBlock;
struct CvMemStorage;
struct CvSeq;
struct CvSize;
struct CvArr;
//Python stub
#endif
#ifndef _CXCORE_TYPES_H_
#define _CXCORE_TYPES_H_
#include <assert.h>
#include <stdlib.h>
#include <string.h>
typedef struct IplImage
{
int nSize; /* sizeof(IplImage) */
int ID; /* version (=0)*/
int nChannels; /* Most of OpenCV functions support 1,2,3 or 4 channels */
int alphaChannel; /* ignored by OpenCV */
int depth; /* pixel depth in bits: IPL_DEPTH_8U, IPL_DEPTH_8S, IPL_DEPTH_16S,
IPL_DEPTH_32S, IPL_DEPTH_32F and IPL_DEPTH_64F are supported */
char colorModel[4]; /* ignored by OpenCV */
char channelSeq[4]; /* ditto */
int dataOrder; /* 0 - interleaved color channels, 1 - separate color channels.
cvCreateImage can only create interleaved images */
int origin; /* 0 - top-left origin,
1 - bottom-left origin (Windows bitmaps style) */
int align; /* Alignment of image rows (4 or 8).
OpenCV ignores it and uses widthStep instead */
int width; /* image width in pixels */
int height; /* image height in pixels */
struct _IplROI *roi;/* image ROI. if NULL, the whole image is selected */
struct _IplImage *maskROI; /* must be NULL */
void *imageId; /* ditto */
struct _IplTileInfo *tileInfo; /* ditto */
int imageSize; /* image data size in bytes
(==image->height*image->widthStep
in case of interleaved data)*/
char *imageData; /* pointer to aligned image data */
int widthStep; /* size of aligned image row in bytes */
int BorderMode[4]; /* ignored by OpenCV */
int BorderConst[4]; /* ditto */
char *imageDataOrigin; /* pointer to very origin of image data
(not necessarily aligned) -
needed for correct deallocation */
} IplImage;
struct IplROI
{
int coi; /* 0 - no COI (all channels are selected), 1 - 0th channel is selected ...*/
int xOffset;
int yOffset;
int width;
int height;
};
typedef struct CvRect
{
int x;
int y;
int width;
int height;
}
CvRect;
struct CvMemBlock;
struct CvMemStorage;
struct CvSeq;
struct CvSize;
struct CvArr;
//Python stub
#endif
dtool/src/parser-inc/highgui.h
+4 -4
View File
@@ -1,5 +1,5 @@
#ifndef _HIGH_GUI_
#define _HIGH_GUI_
#ifndef _HIGH_GUI_
#define _HIGH_GUI_
#endif