Mercurial > octave

changeset 33128:7a25ad58d79e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Don't update 'clim' property for TrueColor data (bug #65404) * graphics.in.h (image::is_climinclude(), surface::is_climinclude, patch::is_climinclude): Add test for ndims==3 to existing tests for m_climinclude.
author Rik <rik@octave.org>
date Sat, 02 Mar 2024 19:24:04 -0800
parents 2edd93f097ff
children 92b8822976fe
files libinterp/corefcn/graphics.in.h
diffstat 1 files changed, 9 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/corefcn/graphics.in.h	Sat Mar 02 14:16:06 2024 -0800
+++ b/libinterp/corefcn/graphics.in.h	Sat Mar 02 19:24:04 2024 -0800
@@ -4770,7 +4770,9 @@
     { return m_aliminclude.current_value (); }
 
     bool is_climinclude () const
-    { return (m_climinclude.is_on () && m_cdatamapping.is ("scaled")); }
+    { return (m_climinclude.is_on ()
+              && ! (m_cdatamapping.is ("direct")
+                    || m_cdata.get ().ndims () == 3)); }
     std::string get_climinclude () const
     { return m_climinclude.current_value (); }
 
@@ -5055,7 +5057,9 @@
     { return m_aliminclude.current_value (); }
 
     bool is_climinclude () const
-    { return (m_climinclude.is_on () && m_cdatamapping.is ("scaled")); }
+    { return (m_climinclude.is_on ()
+              && ! (m_cdatamapping.is ("direct")
+                    || m_cdata.get ().ndims () == 3)); }
     std::string get_climinclude () const
     { return m_climinclude.current_value (); }
 
@@ -5558,7 +5562,9 @@
     { return m_aliminclude.current_value (); }
 
     bool is_climinclude () const
-    { return (m_climinclude.is_on () && m_cdatamapping.is ("scaled")); }
+    { return (m_climinclude.is_on ()
+              && ! (m_cdatamapping.is ("direct")
+                    || m_cdata.get ().ndims () == 3)); }
     std::string get_climinclude () const
     { return m_climinclude.current_value (); }