diff libinterp/corefcn/ls-mat-ascii.h @ 17191:ca5103ab0b21

check_gzip_magic before get_file_format (wrong type detection, bug #39652) * load-save.cc (get_file_format): call check_gzip_magic before get_file_format to avoid random LS_MAT_ASCII detections in gzipped files. * ls-mat-ascii.cc (looks_like_mat_ascii_file): New arg, IS which could also be a gzipped file, is now opened in the calling function. * ls-mat-ascii.h (looks_like_mat_ascii_file): New arg, IS.
author Andreas Weber <andy.weber.aw@gmail.com>
date Fri, 02 Aug 2013 19:48:34 +0200
parents 68fc671a9339
children
line wrap: on
line diff
--- a/libinterp/corefcn/ls-mat-ascii.h
+++ b/libinterp/corefcn/ls-mat-ascii.h
@@ -31,6 +31,6 @@
 save_mat_ascii_data (std::ostream& os, const octave_value& val_arg,
                      int precision, bool tabs = false);
 
-extern bool looks_like_mat_ascii_file (const std::string& filename);
+extern bool looks_like_mat_ascii_file (std::istream& is, const std::string& filename);
 
 #endif