Merge fixes.

harfbuzz · Oct 15, 2023 · ad4449d · ad4449d
1 parent 75cf9d0
commit ad4449d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/tables/colr.rs b/src/tables/colr.rs
@@ -342,7 +342,7 @@ impl FromData for CompositeMode {
     }
 }
 
-/// A trait for color glyph painting
+/// A trait for color glyph painting.
 ///
 /// See [COLR](https://learn.microsoft.com/en-us/typography/opentype/spec/colr) for details.
 pub trait Painter<'a> {
@@ -393,7 +393,7 @@ impl<'a> Table<'a> {
         let mut s = Stream::new(data);
 
         let version = s.read::<u16>()?;
-        if version != 0 {
+        if version > 1 {
             return None;
         }
 

diff --git a/src/tables/cpal.rs b/src/tables/cpal.rs
@@ -20,7 +20,7 @@ impl<'a> Table<'a> {
         let mut s = Stream::new(data);
 
         let version = s.read::<u16>()?;
-        if version != 0 {
+        if version > 1 {
             return None;
         }