mxe-octave: src/of-dicom-1-fixes.patch annotate

annotate src/of-dicom-1-fixes.patch @ 3908:5863c4ed08b1

of-dicom: patch to compile in octave 4.0.0 (Bug #44624) * src/of-dicom-1-fixes.patch: new file * dist-files.mk: add of-dicom-1-fixes.patch * src/of-dicom.mk: allow cross compile

author	John Donoghue <john.donoghue@ieee.org>
date	Wed, 15 Apr 2015 21:52:37 -0400
parents
children

rev	line source
3908 5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	1 diff -ur dicom.orig/src/dicominfo.cpp dicom/src/dicominfo.cpp
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	2 --- dicom.orig/src/dicominfo.cpp 2015-04-15 21:36:10.000000000 -0400
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	3 +++ dicom/src/dicominfo.cpp 2015-04-15 21:41:21.000000000 -0400
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	4 @@ -76,10 +76,10 @@
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	5 char* byteval2string(char * d, int d_len_p, const gdcm::ByteValue *bv);
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	6 char* name2Keyword(char d, int d_len_p, const char* s);
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	7 Matrix str2DoubleVec(const char*);
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	8 -Octave_map dump(const char filename[], int chatty);
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	9 -void dumpDataSet(Octave_map om, const gdcm::DataSet ds, int chatty, int sequenceDepth);
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	10 +octave_map dump(const char filename[], int chatty);
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	11 +void dumpDataSet(octave_map om, const gdcm::DataSet ds, int chatty, int sequenceDepth);
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	12 void getFileModTime(char timeStr, const char filename);
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	13 -void dumpElement(Octave_map om, const gdcm::DataElement elem, int chatty, int sequenceDepth);
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	14 +void dumpElement(octave_map om, const gdcm::DataElement elem, int chatty, int sequenceDepth);
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	15 void dumpSequence(octave_value ov, gdcm::SequenceOfItems seq, int chatty, int sequenceDepth);
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	16 int element2value(std::string & varname, octave_value ov, const gdcm::DataElement elem, int chatty, int sequenceDepth) ;
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	17
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	18 @@ -163,7 +163,7 @@
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	19 }
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	20 }
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	21
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	22 - Octave_map om=dump(filename.c_str(),chatty);
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	23 + octave_map om=dump(filename.c_str(),chatty);
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	24 retval(0)=om;
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	25
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	26 load_dicom_dict(current_dict.c_str()); // reset dictionary to initial value
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	27 @@ -172,9 +172,9 @@
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	28 #endif
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	29
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	30
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	31 -Octave_map dump(const char filename[], int chatty) {
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	32 +octave_map dump(const char filename[], int chatty) {
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	33 // output struct
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	34 - Octave_map om;
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	35 + octave_map om;
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	36 // Instantiate the reader:
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	37 gdcm::Reader reader;
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	38 reader.SetFileName( filename );
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	39 @@ -202,7 +202,7 @@
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	40 return om;
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	41 }
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	42
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	43 -void dumpDataSet(Octave_map om, const gdcm::DataSet ds, int chatty, int sequenceDepth) {
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	44 +void dumpDataSet(octave_map om, const gdcm::DataSet ds, int chatty, int sequenceDepth) {
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	45
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	46 const gdcm::DataSet::DataElementSet DES=ds->GetDES(); // gdcm::DataSet::DataElementSet is a std::set
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	47 gdcm::DataSet::Iterator it;
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	48 @@ -212,7 +212,7 @@
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	49 }
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	50 }
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	51
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	52 -void dumpElement(Octave_map om, const gdcm::DataElement elem,
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	53 +void dumpElement(octave_map om, const gdcm::DataElement elem,
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	54 int chatty, int sequenceDepth) {
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	55 std::string varname;
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	56 octave_value ov;
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	57 @@ -453,10 +453,10 @@
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	58 const octave_idx_type nDataSet=seq->GetNumberOfItems(); // objects in sequence
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	59 if (chatty) octave_stdout << nDataSet << " object" << ((nDataSet==1)?"":"s") << std::endl;
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	60 char item_name_buf[16];
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	61 - Octave_map om;
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	62 + octave_map om;
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	63 for (octave_idx_type j=1; j<=nDataSet; j++ ) {
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	64 const gdcm::DataSet::DataElementSet des=seq->GetItem(j).GetNestedDataSet().GetDES() ;
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	65 - Octave_map subom;
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	66 + octave_map subom;
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	67 for (gdcm::DataSet::Iterator it=des.begin(); it != des.end(); it++) {
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	68 std::string key("");
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	69 octave_value subov;
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	70 diff -ur dicom.orig/src/dicomwrite.cpp dicom/src/dicomwrite.cpp
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	71 --- dicom.orig/src/dicomwrite.cpp 2015-04-15 21:36:10.000000000 -0400
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	72 +++ dicom/src/dicomwrite.cpp 2015-04-15 21:41:49.000000000 -0400
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	73 @@ -43,7 +43,7 @@
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	74 // TODO all fns here should throw exceptions, not use this "std::string & err" arg
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	75
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	76 void struct2metadata(gdcm::ImageWriter w, gdcm::File file, const octave_value & ov, bool trial, int sequenceDepth) ;
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	77 -void structarray2sequence(gdcm::SequenceOfItems & sq, Octave_map * om, bool trial, int sequenceDepth);
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	78 +void structarray2sequence(gdcm::SequenceOfItems & sq, octave_map * om, bool trial, int sequenceDepth);
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	79 void value2element (gdcm::DataElement * de, const octave_value * ov, gdcm::Tag * tag, const std::string & keyword, bool trial, bool * handled, int sequenceDepth);
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	80 void octaveVal2dicomImage(gdcm::ImageWriter w, octave_value pixval) ;
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	81 void genMinimalMetaData(gdcm::ImageWriter w, gdcm::File file);
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	82 @@ -132,9 +132,9 @@
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	83 }
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	84 gdcm::DataSet ds;
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	85 gdcm::FileMetaInformation hds;
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	86 - Octave_map om=ov.map_value();
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	87 + octave_map om=ov.map_value();
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	88 uint32_t skipped = 0;
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	89 - for (Octave_map::iterator it = om.begin(); it != om.end(); it++) {
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	90 + for (octave_map::iterator it = om.begin(); it != om.end(); it++) {
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	91 std::string keyword(om.key(it));
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	92 Cell cell = om.contents(it);
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	93 if (!dicom_is_present(keyword)) {
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	94 @@ -179,17 +179,17 @@
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	95 return ;
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	96 }
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	97
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	98 -void structarray2sequence(gdcm::SequenceOfItems & sq, Octave_map * om, bool trial, int sequenceDepth) {
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	99 - for (Octave_map::iterator it = om->begin(); it != om->end(); it++) {
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	100 +void structarray2sequence(gdcm::SequenceOfItems & sq, octave_map * om, bool trial, int sequenceDepth) {
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	101 + for (octave_map::iterator it = om->begin(); it != om->end(); it++) {
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	102 gdcm::Item item;
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	103 // item.SetVLToUndefined(); //TODO: does VL need to be set for items that contain datasets?
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	104 gdcm::DataSet &nds = item.GetNestedDataSet();
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	105 std::string itemname(om->key(it));
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	106 // TODO: test itemname is something like Item_n.
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	107 Cell cell = om->contents(it);
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	108 - Octave_map subom = cell(0).map_value();
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	109 + octave_map subom = cell(0).map_value();
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	110 // octave_stdout << itemname <<std::endl;
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	111 - for (Octave_map::iterator subit = subom.begin(); subit != subom.end(); subit++) {
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	112 + for (octave_map::iterator subit = subom.begin(); subit != subom.end(); subit++) {
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	113 std::string subkeyword(subom.key(subit));
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	114 gdcm::DataElement de;
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	115 gdcm::Tag tag;
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	116 @@ -289,7 +289,7 @@
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	117 }
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	118 octave_stdout << std::endl;
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	119 //int nObj = ov->numel() ;
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	120 - Octave_map subom = ov->map_value();
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	121 + octave_map subom = ov->map_value();
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	122 gdcm::SmartPointer<gdcm::SequenceOfItems> sq = new gdcm::SequenceOfItems();
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	123 try {
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	124 structarray2sequence(*sq, &subom, trial, ++sequenceDepth) ;
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	125 diff -ur dicom.orig/src/Makefile dicom/src/Makefile
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	126 --- dicom.orig/src/Makefile 2015-04-15 21:36:10.000000000 -0400
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	127 +++ dicom/src/Makefile 2015-04-15 21:40:04.000000000 -0400
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	128 @@ -15,10 +15,11 @@
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	129 # Please see the file, "COPYING" for further details of GNU General
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	130 # Public License version 3.
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	131
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	132 -
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	133 +MKOCTFILE ?= mkoctfile
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	134 +OCTAVE ?= octave
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	135
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	136 INCDIRFLAGS =
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	137 -LIBDIRFLAGS = -L/usr/local/lib
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	138 +LIBDIRFLAGS =
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	139 GDCMLIBFLAGS = -lgdcmcharls -lgdcmjpeg8 -lgdcmjpeg12 \
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	140 -lgdcmjpeg16 -lgdcmCommon \
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	141 -lgdcmDICT -lgdcmDSED -lgdcmIOD -lgdcmMSFF
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	142 @@ -29,35 +30,35 @@
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	143
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	144
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	145 dicomlookup.oct: dicomdict.o dicomlookup.o
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	146 - mkoctfile $(INCDIRFLAGS) $(LIBDIRFLAGS) $(GDCMLIBFLAGS) $(DEBUGFLAG) dicomlookup.o dicomdict.o -o dicomlookup.oct
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	147 + $(MKOCTFILE) $(INCDIRFLAGS) $(LIBDIRFLAGS) $(GDCMLIBFLAGS) $(DEBUGFLAG) dicomlookup.o dicomdict.o -o dicomlookup.oct
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	148
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	149 dicomdict.oct: dicomdict.o
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	150 - mkoctfile $(INCDIRFLAGS) $(DEBUGFLAG) dicomdict.o
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	151 + $(MKOCTFILE) $(INCDIRFLAGS) $(DEBUGFLAG) dicomdict.o
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	152
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	153 dicominfo.oct: dicominfo.o dicomdict.o
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	154 - mkoctfile $(INCDIRFLAGS) $(LIBDIRFLAGS) $(GDCMLIBFLAGS) $(DEBUGFLAG) dicominfo.o dicomdict.o -o dicominfo.oct
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	155 + $(MKOCTFILE) $(INCDIRFLAGS) $(LIBDIRFLAGS) $(GDCMLIBFLAGS) $(DEBUGFLAG) dicominfo.o dicomdict.o -o dicominfo.oct
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	156
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	157 dicomwrite.oct: dicomwrite.o dicomdict.o
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	158 - mkoctfile $(INCDIRFLAGS) $(LIBDIRFLAGS) $(GDCMLIBFLAGS) $(DEBUGFLAG) dicomwrite.o dicomdict.o -o dicomwrite.oct
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	159 + $(MKOCTFILE) $(INCDIRFLAGS) $(LIBDIRFLAGS) $(GDCMLIBFLAGS) $(DEBUGFLAG) dicomwrite.o dicomdict.o -o dicomwrite.oct
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	160
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	161 dicomread.oct: dicomread.cpp
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	162 - mkoctfile $(INCDIRFLAGS) $(LIBDIRFLAGS) $(GDCMLIBFLAGS) $(DEBUGFLAG) dicomread.cpp
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	163 + $(MKOCTFILE) $(INCDIRFLAGS) $(LIBDIRFLAGS) $(GDCMLIBFLAGS) $(DEBUGFLAG) dicomread.cpp
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	164
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	165 _gendicomdict.oct: _gendicomdict.cpp
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	166 - mkoctfile $(INCDIRFLAGS) $(LIBDIRFLAGS) $(GDCMLIBFLAGS) $(DEBUGFLAG) _gendicomdict.cpp
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	167 + $(MKOCTFILE) $(INCDIRFLAGS) $(LIBDIRFLAGS) $(GDCMLIBFLAGS) $(DEBUGFLAG) _gendicomdict.cpp
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	168
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	169
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	170 dicominfo.o: dicomdict.h dicominfo.cpp
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	171 - mkoctfile -c $(INCDIRFLAGS) $(DEBUGFLAG) dicominfo.cpp
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	172 + $(MKOCTFILE) -c $(INCDIRFLAGS) $(DEBUGFLAG) dicominfo.cpp
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	173
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	174 dicomwrite.o: dicomdict.h dicomwrite.cpp
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	175 - mkoctfile -c $(INCDIRFLAGS) $(DEBUGFLAG) dicomwrite.cpp
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	176 + $(MKOCTFILE) -c $(INCDIRFLAGS) $(DEBUGFLAG) dicomwrite.cpp
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	177
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	178 dicomdict.o: dicomdict.h dicomdict.cpp
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	179 - mkoctfile -c $(INCDIRFLAGS) $(DEBUGFLAG) dicomdict.cpp
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	180 + $(MKOCTFILE) -c $(INCDIRFLAGS) $(DEBUGFLAG) dicomdict.cpp
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	181
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	182 dicomlookup.o: dicomdict.h dicomlookup.cpp
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	183 - mkoctfile -c $(INCDIRFLAGS) $(DEBUGFLAG) dicomlookup.cpp
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	184 + $(MKOCTFILE) -c $(INCDIRFLAGS) $(DEBUGFLAG) dicomlookup.cpp
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	185
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	186 clean:
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	187 rm -f .o .oct *~
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	188 @@ -65,13 +66,14 @@
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	189 test: test_dicominfo test_dicomdict test_dicomread test_dicomlookup
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	190
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	191 test_dicominfo: dicominfo.oct
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	192 - octave -q --eval "test dicominfo.cpp"
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	193 + $(OCTAVE) -q --eval "test dicominfo.cpp"
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	194
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	195 test_dicomdict: dicomdict.oct
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	196 - octave -q --eval "test dicomdict.cpp"
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	197 + $(OCTAVE) -q --eval "test dicomdict.cpp"
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	198
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	199 test_dicomread: dicomread.oct
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	200 - octave -q --eval "test dicomread.cpp"
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	201 + $(OCTAVE) -q --eval "test dicomread.cpp"
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	202
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	203 test_dicomlookup: dicomlookup.oct
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	204 - octave -q --eval "test dicomlookup.cpp"
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	205 \ No newline at end of file
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	206 + $(OCTAVE) -q --eval "test dicomlookup.cpp"
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	207 +
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	208 diff -ur dicom.orig/src/dicominfo.cpp dicom/src/dicominfo.cpp
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	209 --- dicom.orig/src/dicominfo.cpp 2015-04-15 21:44:32.000000000 -0400
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	210 +++ dicom/src/dicominfo.cpp 2015-04-15 21:47:48.000000000 -0400
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	211 @@ -187,10 +187,10 @@
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	212 gdcm::DataSet &ds = file.GetDataSet();
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	213 gdcm::FileMetaInformation &hds=file.GetHeader();
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	214
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	215 - om.assign("Filename",filename);
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	216 + om.assign("Filename",octave_value(filename));
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	217 char dateStr[TIME_STR_LEN+1];
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	218 getFileModTime(dateStr, filename);
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	219 - om.assign("FileModDate", dateStr);
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	220 + om.assign("FileModDate", octave_value(dateStr));
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	221 if(chatty) octave_stdout << "# file info\nFilename:"
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	222 << filename << "\nFileModDate:" << dateStr << '\n';
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	223
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	224 @@ -220,7 +220,7 @@
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	225 om->assign(varname.c_str(), ov);
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	226 } else {
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	227 if (0==varname.length()) return ;
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	228 - om->assign(varname.c_str(), "not assigned");
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	229 + om->assign(varname.c_str(), octave_value("not assigned"));
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	230 }
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	231 }
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	232
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	233 @@ -464,7 +464,7 @@
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	234 subom.assign(key.c_str(), subov);
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	235 } else {
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	236 if (0==key.length()) continue ;
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	237 - subom.assign(key.c_str(), "not assigned");
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	238 + subom.assign(key.c_str(), octave_value("not assigned"));
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	239 }
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	240 }
5863c4ed08b1 of-dicom: patch to compile in octave 4.0.0 (Bug #44624) John Donoghue <john.donoghue@ieee.org> parents: diff changeset	241 snprintf(item_name_buf,15,"Item_%i",j);

Mercurial > mxe-octave

annotate src/of-dicom-1-fixes.patch @ 3908:5863c4ed08b1