Skip to content

Commit e103014

Browse files
dcwhitedcwhite
committed
Basic header fixes
1 parent c5fae5f commit e103014

File tree

5 files changed

+51
-104
lines changed

5 files changed

+51
-104
lines changed

‎src/Core/Matlab/fieldtomatlab.h‎

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -49,32 +49,16 @@
4949
// CANNOT INSTANTIATE EVERY PIECE, ALTHOUGH NEWER COMPILERS LIKE GCC4, WILL CHECK
5050
// THE CODE EVEN IF IT IS NOT USED.....
5151

52-
#include <math.h>
53-
54-
// STL STUFF
55-
56-
#include <vector>
57-
#include <string>
58-
59-
60-
// Class for reading matlab files
61-
#include <Core/Matlab/matlabfile.h>
62-
#include <Core/Matlab/matlabarray.h>
63-
64-
// Field class files
65-
#include <Core/Datatypes/Mesh.h>
66-
#include <Core/Datatypes/Field.h>
67-
#include <Core/Datatypes/FieldInformation.h>
68-
6952
/*
7053
* FILE: matlabconverter_fieldtomatlab.h
7154
* AUTH: Jeroen G Stinstra
7255
* DATE: 18 MAR 2004
7356
*/
7457

75-
#ifndef JGS_MATLABIO_MATLABCONVERTER_FIELDTOMATLAB_H
76-
#define JGS_MATLABIO_MATLABCONVERTER_FIELDTOMATLAB_H 1
58+
#ifndef CORE_MATLABIO_MATLABCONVERTER_FIELDTOMATLAB_H
59+
#define CORE_MATLABIO_MATLABCONVERTER_FIELDTOMATLAB_H 1
7760

61+
#include <Core/Matlab/matfilebase.h>
7862
#include <Core/Matlab/share.h>
7963

8064
namespace MatlabIO {

‎src/Core/Matlab/matfilebase.h‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737
* DATE: 16 MAY 2005
3838
*/
3939

40-
#ifndef JGS_MATLABIO_MATFILEBASE_H
41-
#define JGS_MATLABIO_MATFILEBASE_H 1
40+
#ifndef CORE_MATLABIO_MATFILEBASE_H
41+
#define CORE_MATLABIO_MATFILEBASE_H 1
4242

4343
/*
4444
* matfilebase class includes error handling and definition of
@@ -50,12 +50,11 @@
5050
*
5151
*/
5252

53-
#include <sys/types.h>
5453
#include <string>
55-
#include "matfiledefs.h"
56-
57-
#include "share.h"
54+
#include <Core/Matlab/matfiledefs.h>
55+
#include <Core/Matlab/share.h>
5856

57+
namespace SCIRun {
5958
namespace MatlabIO {
6059

6160
class SCISHARE matfilebase {

‎src/Core/Matlab/matfiledefs.h‎

Lines changed: 34 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -35,36 +35,37 @@
3535
/*
3636
* FILE: matfiledefs.h
3737
* AUTH: Jeroen G Stinstra
38-
* DATE: 16 MAY 2005
39-
*/
40-
41-
#ifndef CORE_MATLABIO_MATFILEDEFS_H
42-
#define CORE_MATLABIO_MATFILEDEFS_H 1
43-
44-
/*
45-
* Definitions for compiling the code
46-
*/
47-
48-
// uncomment definitions to include or exclude options
49-
50-
#define JGS_MATLABIO_USE_64INTS 1
51-
52-
// define 64 bit integers
53-
54-
#ifdef JGS_MATLABIO_USE_64INTS
55-
56-
#ifdef _WIN32
57-
typedef signed __int64 int64;
58-
typedef unsigned __int64 uint64;
59-
typedef unsigned int uint32_t;
60-
typedef unsigned int u_int32_t;
61-
typedef signed int int32_t;
62-
#else
63-
typedef signed long long int64;
64-
typedef unsigned long long uint64;
65-
#endif
66-
67-
#endif
68-
69-
70-
#endif
38+
// * DATE: 16 MAY 2005
39+
// */
40+
//
41+
//#ifndef CORE_MATLABIO_MATFILEDEFS_H
42+
//#define CORE_MATLABIO_MATFILEDEFS_H 1
43+
//
44+
///*
45+
// * Definitions for compiling the code
46+
// */
47+
//
48+
//// uncomment definitions to include or exclude options
49+
//
50+
//#define JGS_MATLABIO_USE_64INTS 1
51+
//
52+
//// define 64 bit integers
53+
//
54+
//#ifdef JGS_MATLABIO_USE_64INTS
55+
//
56+
//#ifdef _WIN32
57+
// typedef signed __int64 int64;
58+
// typedef unsigned __int64 uint64;
59+
// typedef unsigned int uint32_t;
60+
// typedef unsigned int u_int32_t;
61+
// typedef signed int int32_t;
62+
//#else
63+
// typedef signed long long int64;
64+
// typedef unsigned long long uint64;
65+
//#endif
66+
//
67+
//#endif
68+
//
69+
//
70+
//#endif
71+
//

‎src/Core/Matlab/matlabconverter.h‎

Lines changed: 8 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
* DATE: 18 MAR 2004
3434
*/
3535

36-
#ifndef JGS_MATLABIO_MATLABCONVERTER_H
37-
#define JGS_MATLABIO_MATLABCONVERTER_H 1
36+
#ifndef CORE_MATLABIO_MATLABCONVERTER_H
37+
#define CORE_MATLABIO_MATLABCONVERTER_H 1
3838

3939
/*
4040
* This class converts matlab matrices into SCIRun objects and vice versa.
@@ -56,45 +56,7 @@
5656
* a large number of class definitions......
5757
*/
5858

59-
#include <math.h>
60-
61-
#include <vector>
62-
#include <string>
63-
64-
65-
// String class files
66-
#include <Core/Datatypes/String.h>
67-
68-
// Matrix class files
69-
#include <Core/Datatypes/Matrix.h>
70-
#include <Core/Datatypes/SparseRowMatrix.h>
71-
#include <Core/Datatypes/ColumnMatrix.h>
72-
#include <Core/Datatypes/DenseMatrix.h>
73-
74-
// Field class files
75-
#include <Core/Datatypes/Field.h>
76-
77-
// Colormap class file
78-
#include <Core/Datatypes/ColorMap.h>
79-
80-
// Geometry files
81-
#include <Core/Geometry/Vector.h>
82-
#include <Core/Geometry/Tensor.h>
83-
84-
// Bundle class files
85-
#include <Core/Datatypes/Bundle.h>
86-
87-
#include <Core/Util/ProgressReporter.h>
88-
#include <Core/Containers/Handle.h>
89-
90-
// Class for reading matlab files
91-
#include <Core/Matlab/matlabfile.h>
92-
#include <Core/Matlab/matlabarray.h>
93-
94-
// Field conversion algorithms
95-
#include <Core/Matlab/matlabtofield.h>
96-
#include <Core/Matlab/fieldtomatlab.h>
97-
59+
#include <Core/Matlab/matfilebase.h>
9860
#include <Core/Matlab/share.h>
9961

10062
/*
@@ -120,10 +82,11 @@
12082
*
12183
*/
12284

85+
namespace SCIRun {
12386
namespace MatlabIO {
124-
125-
126-
class SCISHARE matlabconverter : public matfilebase {
87+
88+
class SCISHARE matlabconverter : public matfilebase
89+
{
12790

12891
public:
12992

@@ -169,7 +132,6 @@ class SCISHARE matlabconverter : public matfilebase {
169132
// Nrrd key value pairs:
170133
// These key value pairs are not supported yet, like in the rest of SCIRun
171134

172-
// Constructor
173135
matlabconverter();
174136
matlabconverter(SCIRun::ProgressReporter* pr);
175137

@@ -348,6 +310,6 @@ inline void matlabconverter::prefersciobjects()
348310
prefer_bundles = false;
349311
}
350312

351-
} // end namespace
313+
}} // end namespace
352314

353315
#endif

‎src/Modules/Legacy/Matlab/DataIO/ImportDatatypesFromMatlab.cc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ using namespace SCIRun::Modules::Matlab::DataIO;
4040
//using namespace SCIRun::Core::Algorithms;
4141
using namespace SCIRun::Core::Datatypes;
4242
using namespace SCIRun::Dataflow::Networks;
43+
using namespace SCIRun::MatlabIO;
4344

4445
const ModuleLookupInfo ImportDatatypesFromMatlab::staticInfo_("ImportDatatypesFromMatlab", "DataIO", "Matlab");
4546

0 commit comments

Comments
 (0)