[Octave-cvsupdate] SF.net SVN: octave:[9206] trunk/octave-forge/extra/dicom/src/dicomdict.cpp

[<kr...@us...>]

Revision: 9206
          http://octave.svn.sourceforge.net/octave/?rev=9206&view=rev
Author:   krthie
Date:     2011-11-28 10:06:04 +0000 (Mon, 28 Nov 2011)
Log Message:
-----------
minor fix to dicomdict.cpp to get it to compile and run sensible outside of octave (for debuggin$

Modified Paths:
--------------
    trunk/octave-forge/extra/dicom/src/dicomdict.cpp

Modified: trunk/octave-forge/extra/dicom/src/dicomdict.cpp
===================================================================
--- trunk/octave-forge/extra/dicom/src/dicomdict.cpp	2011-11-28 09:53:05 UTC (rev 9205)
+++ trunk/octave-forge/extra/dicom/src/dicomdict.cpp	2011-11-28 10:06:04 UTC (rev 9206)
@@ -25,7 +25,7 @@
  */
 
 #include "octave/oct.h"
-#include "load-path.h"
+#include "octave/load-path.h"
 
 #include "gdcm-2.0/gdcmDict.h"
 #include "gdcm-2.0/gdcmVR.h"
@@ -256,7 +256,13 @@
 	}
 
 	// find dic if it is anywhere in the search path (same path as for m-files etc)
-	std::string resolved_filename=load_path::find_file(std::string(filename)) ;
+#ifndef NOT_OCT
+	const std::string resolved_filename=load_path::find_file(std::string(filename)) ;
+#else
+        // for debugging: if not running in octave, find_file always returns ""
+	// so we just use the original filename
+	const std::string resolved_filename(filename);
+#endif
 
 	std::ifstream fin(resolved_filename.c_str());
 	if (!fin) {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.