# HG changeset patch
# User jwe
# Date 1195078896 0
# Node ID 57d2546ad8d57a1e88db664253838441c4c91166
# Parent  6525eb2fba0ffcb5ff0d41198cdc5c40fe9c7475
[project @ 2007-11-14 22:21:35 by jwe]

diff -r 6525eb2fba0f -r 57d2546ad8d5 ChangeLog
--- a/ChangeLog	Wed Nov 14 20:42:07 2007 +0000
+++ b/ChangeLog	Wed Nov 14 22:21:36 2007 +0000
@@ -1,3 +1,7 @@
+2007-11-14  John W. Eaton  <jwe@octave.org>
+
+	* configure.in: Don't create Makefrag.bsd.
+
 2007-11-14  Joseph P. Skudlarek  <Jskud@Jskud.com>
 
 	* configure.in: Rework pcre.h tests to work with autoconf 2.59,
diff -r 6525eb2fba0f -r 57d2546ad8d5 configure.in
--- a/configure.in	Wed Nov 14 20:42:07 2007 +0000
+++ b/configure.in	Wed Nov 14 22:21:36 2007 +0000
@@ -29,7 +29,7 @@
 EXTERN_CXXFLAGS="$CXXFLAGS"
 
 AC_INIT
-AC_REVISION($Revision: 1.595 $)
+AC_REVISION($Revision: 1.596 $)
 AC_PREREQ(2.57)
 AC_CONFIG_SRCDIR([src/octave.cc])
 AC_CONFIG_HEADER(config.h)
@@ -1588,32 +1588,6 @@
   ;;
 esac
 
-bsd_gcc_kluge_targets_frag=/dev/null
-case "$canonical_host_type" in
-  *-*-386bsd* | *-*-openbsd* | *-*-netbsd* | *-*-freebsd*)
-    bsd_gcc_kluge_targets_frag=Makefrag.bsd
-    cat << \EOF > $bsd_gcc_kluge_targets_frag
-
-lex.o: lex.cc 
-	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS_NO_PT_FLAGS) $<
-
-pt-plot.o: pt-plot.cc
-	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS_NO_PT_FLAGS) $<
-
-symtab.o: symtab.cc
-	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS_NO_PT_FLAGS) $<
-
-toplev.o: toplev.cc
-	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS_NO_PT_FLAGS) $<
-
-unwind-prot.o: unwind-prot.cc 
-	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS_NO_PT_FLAGS) $<
-
-EOF
-  ;;
-esac
-AC_SUBST_FILE(bsd_gcc_kluge_targets_frag)
-
 ### Checks for other programs used for building, testing, installing,
 ### and running Octave.
 
diff -r 6525eb2fba0f -r 57d2546ad8d5 liboctave/oct-inttypes.h
--- a/liboctave/oct-inttypes.h	Wed Nov 14 20:42:07 2007 +0000
+++ b/liboctave/oct-inttypes.h	Wed Nov 14 22:21:36 2007 +0000
@@ -250,6 +250,8 @@
       OCTAVE_INT_FIT_TO_RANGE (- static_cast<double> (ival), T) : 0;
   }
 
+  operator T (void) const { return value (); }
+
   operator bool (void) const { return static_cast<bool> (value ()); }
 
   operator char (void) const { return static_cast<char> (value ()); }
diff -r 6525eb2fba0f -r 57d2546ad8d5 scripts/ChangeLog
--- a/scripts/ChangeLog	Wed Nov 14 20:42:07 2007 +0000
+++ b/scripts/ChangeLog	Wed Nov 14 22:21:36 2007 +0000
@@ -1,3 +1,8 @@
+2007-11-14  Michael Goffioul  <michael.goffioul@gmail.com>
+
+	* plot/patch.m: Handle arg may also be hggroup object.
+	Use ancestor to find parent axes object.
+
 2007-11-14  David Bateman  <dbateman@free.fr>
 
 	* plot/__contour__.m: Treat unclosed contours by adding NaN to
diff -r 6525eb2fba0f -r 57d2546ad8d5 scripts/plot/patch.m
--- a/scripts/plot/patch.m	Wed Nov 14 20:42:07 2007 +0000
+++ b/scripts/plot/patch.m	Wed Nov 14 22:21:36 2007 +0000
@@ -38,12 +38,12 @@
 
   if (isscalar (varargin{1}) && ishandle (varargin{1}))
     h = varargin {1};
-    if (! strcmp (get (h, "type"), "axes"))
-      error ("patch: expecting first argument to be an axes object");
+    if (! strcmp (get (h, "type"), "axes") && ! strcmp (get (h, "type"), "hggroup"))
+      error ("patch: expecting first argument to be an axes or hggroup object");
     endif
     oldh = gca ();
     unwind_protect
-      axes (h);
+      axes (ancestor (h, "axes"));
       [tmp, fail] = __patch__ (h, varargin{2:end});
     unwind_protect_cleanup
       axes (oldh);
diff -r 6525eb2fba0f -r 57d2546ad8d5 src/ChangeLog
--- a/src/ChangeLog	Wed Nov 14 20:42:07 2007 +0000
+++ b/src/ChangeLog	Wed Nov 14 22:21:36 2007 +0000
@@ -1,5 +1,13 @@
+2007-11-14  David Bateman  <dbateman@free.fr>
+
+	* mex.cc (mxArray_sparse::mxArray_sparse (const mxArray_sparse&)):
+	Also ensure that pr and pi are correctly copied.
+
 2007-11-14  John W. Eaton  <jwe@octave.org>
 
+	* Makefile.in (@bsd_gcc_kluge_targets_frag@): Delete line for
+	Makefrag.bsd substitution.
+
 	* graphics.h.in (base_properties::tag): New property.
 	(base_properties::get_tag, base_properties::set_tag): New functions.
 	(root_figure::set, root_figure::get, figure::set, figure::get,
diff -r 6525eb2fba0f -r 57d2546ad8d5 src/Makefile.in
--- a/src/Makefile.in	Wed Nov 14 20:42:07 2007 +0000
+++ b/src/Makefile.in	Wed Nov 14 22:21:36 2007 +0000
@@ -408,8 +408,6 @@
 
 $(MAKEDEPS): stamp-prereq stamp-liboctave-prereq defaults.h oct-gperf.h oct-conf.h
 
-@bsd_gcc_kluge_targets_frag@
-
 check: all
 .PHONY: check
 
diff -r 6525eb2fba0f -r 57d2546ad8d5 src/mex.cc
--- a/src/mex.cc	Wed Nov 14 20:42:07 2007 +0000
+++ b/src/mex.cc	Wed Nov 14 22:21:36 2007 +0000
@@ -1594,6 +1594,8 @@
 
   mxArray_sparse (const mxArray_sparse& val)
     : mxArray_matlab (val), nzmax (val.nzmax),
+      pr (malloc (nzmax * get_element_size ())),
+      pi (val.pi ? malloc (nzmax * get_element_size ()) : 0),
       ir (static_cast<mwIndex *> (malloc (nzmax * sizeof (mwIndex)))),
       jc (static_cast<mwIndex *> (malloc (nzmax * sizeof (mwIndex))))
   {