Changeset 15310

Timestamp:

06/21/13 20:56:30 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: updating export_fig to latest version

Location:

issm/trunk-jpl/externalpackages/export_fig

Files:

• license.txt (modified) (1 diff)
• print2eps.m (modified) (3 diffs)
• user_string.m (modified) (5 diffs)

issm/trunk-jpl/externalpackages/export_fig/license.txt ¶

@@ -2 +2 @@
 All rights reserved.
 
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions are 
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
 met:
 
-    * Redistributions of source code must retain the above copyright 
+    * Redistributions of source code must retain the above copyright
       notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright 
-      notice, this list of conditions and the following disclaimer in 
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in
       the documentation and/or other materials provided with the distribution
-      
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.

issm/trunk-jpl/externalpackages/export_fig/print2eps.m ¶

@@ -21 +21 @@
 %   options - Additional parameter strings to be passed to print.
 
-% Copyright (C) Oliver Woodford 2008-2012
+% Copyright (C) Oliver Woodford 2008-2013
 
 % The idea of editing the EPS file to change line styles comes from Jiro
@@ -48 +48 @@
 %           sizes we don't want, due to listeners. Thanks to Malcolm Hudson
 %           for reporting the issue.
+% 22/03/13: Extend font swapping to axes labels. Thanks to Rasmus Ischebeck
+%           for reporting the issue.
 
 function print2eps(name, fig, varargin)
@@ -61 +63 @@
 end
 % Find all the used fonts in the figure
-font_handles = findobj(fig, '-property', 'FontName');
+font_handles = findall(fig, '-property', 'FontName');
 fonts = get(font_handles, 'FontName');
 if ~iscell(fonts)

issm/trunk-jpl/externalpackages/export_fig/user_string.m ¶

@@ -19 +19 @@
 %   saved - Boolean indicating whether the save was succesful
 
-% Copyright (C) Oliver Woodford 2011
+% Copyright (C) Oliver Woodford 2011-2013
 
 % This method of saving paths avoids changing .m files which might be in a
@@ -26 +26 @@
 % the version control system. Thank you to Jonas Dorn for suggesting this
 % approach.
+
+% 10/01/2013 - Access files in text, not binary mode, as latter can cause
+% errors. Thanks to Christian for pointing this out.
 
 function string = user_string(string_name, string)
@@ -58 +61 @@
     end
     % Write the file
-    fid = fopen(string_name, 'w');
+    fid = fopen(string_name, 'wt');
     if fid == -1
         string = false;
@@ -64 +67 @@
     end
     try
-        fwrite(fid, string, '*char');
+        fprintf(fid, '%s', string);
     catch
         fclose(fid);
@@ -74 +77 @@
 else
     % Get string
-    fid = fopen(string_name, 'r');
+    fid = fopen(string_name, 'rt');
     if fid == -1
         string = '';
         return
     end
-    string = fread(fid, '*char')';
+    string = fgetl(fid);
     fclose(fid);
 end