Skip to content

Commit

Permalink
Fixed namespace in header
Browse files Browse the repository at this point in the history
  • Loading branch information
@anaga670
anaga670 committed Aug 7, 2019
1 parent 0643704 commit fe10685
Showing 1 changed file with 72 additions and 72 deletions.
144 changes: 72 additions & 72 deletions src/VTSMisc.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@ using namespace csm;
#define STATTYPE stat64
#endif

extern list<string> commandQueue;
extern vector<string> menulist;
extern vector<MENU_TYPE> menutype;
extern std::list<std::string> commandQueue;
extern std::vector<std::string> menulist;
extern std::vector<MENU_TYPE> menutype;
extern bool debugFlag;
extern bool compareDebugFlag;
extern bool nitfDebugFlag;
Expand All @@ -77,128 +77,128 @@ enum ISDType
FILENAME_TYPE
};

string ISDType2str(ISDType type);
std::string ISDType2str(ISDType type);

typedef list < string > NameList;
typedef std::list < std::string > NameList;

void initMenuList();
void trim(string& str);
void trim(std::string& str);

void printList(string logFile);
void printList(std::string logFile);
// pre: None.
// post: The list of all currently-registered factories has been printed.
void printModelList(string pluginName);
// post: The std::list of all currently-registered factories has been printed.
void printModelList(std::string pluginName);

void makeModelListFromISD(const string isd_name, const Isd * isd, WarningList* warning = NULL);
void makeModelListFromISD(const std::string isd_name, const Isd * isd, WarningList* warning = NULL);

// pre: None.
// post: A subset of aList has been printed; the subset contains all
// factories that can support the given isd.

void listSupportingModels(const string isd_name,
void listSupportingModels(const std::string isd_name,
const Isd* isd,
NameList& names,
WarningList* warnings);

void compareParam(vector<string> param_array,
vector<string> act_val,
vector<bool> &pass_fail);
void compareParam(std::vector<std::string> param_array,
std::vector<std::string> act_val,
std::vector<bool> &pass_fail);

void compareParam(vector<string> param_array,
void compareParam(std::vector<std::string> param_array,
map<int, double> act_val,
map<int, double> &comp_answer,
map<int, bool> &pass_fail);

void compareParam(vector<string> param_array,
void compareParam(std::vector<std::string> param_array,
double *act_val,
double *comp_answer,
bool *pass_fail);

void compareParam(vector<string> param_array,
vector<string> act_val,
void compareParam(std::vector<std::string> param_array,
std::vector<std::string> act_val,
map<int, bool> &pass_fail);

void compareParam(vector<string> param_array,
void compareParam(std::vector<std::string> param_array,
map<int, double> act_val,
map<int, double> &comp_answer,
map<int, bool> &pass_fail);

// recordLog I
void recordLog(string datafile,
string comment,
string command,
vector<string> param_array,
vector<string> out_param_array);
void recordLog(std::string datafile,
std::string comment,
std::string command,
std::vector<std::string> param_array,
std::vector<std::string> out_param_array);

// recordLog II
void recordLog(string datafile,
string serialNum,
string timedata,
string comment,
string command,
vector<string> param_array,
vector<string> out_param_array);
void recordLog(std::string datafile,
std::string serialNum,
std::string timedata,
std::string comment,
std::string command,
std::vector<std::string> param_array,
std::vector<std::string> out_param_array);

// recordLog III
void recordLog(string datafile,
string comment,
string command,
string text);
void recordLog(std::string datafile,
std::string comment,
std::string command,
std::string text);

// recordLog IV
void recordLog(string datafile,
string serialNum,
string timedata,
string comment,
string command,
vector<string> param_array,
string text);
void recordLog(std::string datafile,
std::string serialNum,
std::string timedata,
std::string comment,
std::string command,
std::vector<std::string> param_array,
std::string text);

// recordLog V
void recordLog(string datafile,
string comment,
string text);
void recordLog(std::string datafile,
std::string comment,
std::string text);

// recordLog VI
void recordLog(string datafile,
const string text);
void recordLog(std::string datafile,
const std::string text);

void echo2Term(string comment,
string command,
string text);
void echo2Term(std::string comment,
std::string command,
std::string text);

void getLogfileName(const string dirName, string *name);
void getLogfileName(const std::string dirName, std::string *name);

void reportWarning(WarningList warnings, const char* logFile);
void reportError(Error* err, const char* logFile);

// prototypes for ISD "constructors"
//void initFilenameISD (Isd *isdfilename,
// string isd);
// std::string isd);

void initBytestreamISD(BytestreamIsd *bytestream, string filename)
void initBytestreamISD(BytestreamIsd *bytestream, std::string filename)
throw (Error);

OSSIM_PLUGINS_DLL void initNitf20ISD(Nitf20Isd *isd,
string fname,
std::string fname,
const int imageIndex = -1,
WarningList* warnings = NULL);

OSSIM_PLUGINS_DLL void initNitf21ISD(Nitf21Isd *isd,
string fname,
std::string fname,
const int imageIndex = -1,
WarningList* warnings = NULL);

FILE * fillBuff (string fname,
FILE * fillBuff (std::string fname,
#ifdef _WIN32
struct stat &statbuf,
#else
struct stat64 &statbuf,
#endif
char **buff) throw (Error);

string readStateFile( string fname) throw (Error);
void writeStateFile(string fname, string state) throw (Error);
std::string readStateFile( std::string fname) throw (Error);
void writeStateFile(std::string fname, std::string state) throw (Error);

void parseFile(Nitf20Isd *isd,
FILE *ifile,
Expand All @@ -225,34 +225,34 @@ void parseFile(Nitf21Isd *isd,
void parseImages (Nitf20Isd *isd,
FILE *ifile,
const int hl,
const vector <size_t> imagehdrlengths,
const vector <size_t>imagelengths,
const std::vector <size_t> imagehdrlengths,
const std::vector <size_t>imagelengths,
const int imageIndex,
const int NUMI);

void parseImages (Nitf21Isd *isd,
FILE *ifile,
const int hl,
const vector <size_t> imagehdrlengths,
const vector <size_t>imagelengths,
const std::vector <size_t> imagehdrlengths,
const std::vector <size_t>imagelengths,
const int imageIndex,
const int NUMI);

vector<Tre> parseTre(int tlen, // length of tre data
string treData); // input tre data
std::vector<Tre> parseTre(int tlen, // length of tre data
std::string treData); // input tre data

void parseDes(Nitf20Isd *isd,
FILE *ifile,
size_t des_offset,
const vector <size_t> hdrlengths,
const vector <size_t>datalengths,
const std::vector <size_t> hdrlengths,
const std::vector <size_t>datalengths,
const int NUMD);

void parseDes(Nitf21Isd *isd,
FILE *ifile,
size_t des_offset,
const vector <size_t> hdrlengths,
const vector <size_t>datalengths,
const std::vector <size_t> hdrlengths,
const std::vector <size_t>datalengths,
const int NUMD);

char* getSegment( FILE *ifile,
Expand All @@ -263,11 +263,11 @@ void dumpHdr(Nitf20Isd *isd);

void dumpHdr(Nitf21Isd *isd);

int getCommandIndex(string command);
vector<string> loadHelpFile();
int getCommandIndex(std::string command);
std::vector<std::string> loadHelpFile();
void set_keypress(void);
void reset_keypress(void);
string readDataLine();
vector<string> getCommands(string params);
std::string readDataLine();
std::vector<std::string> getCommands(std::string params);
#endif // VTSMISC_H

0 comments on commit fe10685

Please sign in to comment.