| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright © 2012 Google, Inc. | 2 * Copyright © 2012 Google, Inc. |
| 3 * | 3 * |
| 4 * This is part of HarfBuzz, a text shaping library. | 4 * This is part of HarfBuzz, a text shaping library. |
| 5 * | 5 * |
| 6 * Permission is hereby granted, without written agreement and without | 6 * Permission is hereby granted, without written agreement and without |
| 7 * license or royalty fees, to use, copy, modify, and distribute this | 7 * license or royalty fees, to use, copy, modify, and distribute this |
| 8 * software and its documentation for any purpose, provided that the | 8 * software and its documentation for any purpose, provided that the |
| 9 * above copyright notice and the following two paragraphs appear in | 9 * above copyright notice and the following two paragraphs appear in |
| 10 * all copies of this software. | 10 * all copies of this software. |
| (...skipping 27 matching lines...) Expand all Loading... |
| 38 ASSERT_STATIC (key_bits >= cache_bits); | 38 ASSERT_STATIC (key_bits >= cache_bits); |
| 39 ASSERT_STATIC (key_bits + value_bits - cache_bits < 8 * sizeof (unsigned int))
; | 39 ASSERT_STATIC (key_bits + value_bits - cache_bits < 8 * sizeof (unsigned int))
; |
| 40 | 40 |
| 41 inline void clear (void) | 41 inline void clear (void) |
| 42 { | 42 { |
| 43 memset (values, 255, sizeof (values)); | 43 memset (values, 255, sizeof (values)); |
| 44 } | 44 } |
| 45 | 45 |
| 46 inline bool get (unsigned int key, unsigned int *value) | 46 inline bool get (unsigned int key, unsigned int *value) |
| 47 { | 47 { |
| 48 unsigned int k = key & ((1<<cache_bits)-1); | 48 unsigned int k = key & ((1u<<cache_bits)-1); |
| 49 unsigned int v = values[k]; | 49 unsigned int v = values[k]; |
| 50 if ((v >> value_bits) != (key >> cache_bits)) | 50 if ((v >> value_bits) != (key >> cache_bits)) |
| 51 return false; | 51 return false; |
| 52 *value = v & ((1<<value_bits)-1); | 52 *value = v & ((1u<<value_bits)-1); |
| 53 return true; | 53 return true; |
| 54 } | 54 } |
| 55 | 55 |
| 56 inline bool set (unsigned int key, unsigned int value) | 56 inline bool set (unsigned int key, unsigned int value) |
| 57 { | 57 { |
| 58 if (unlikely ((key >> key_bits) || (value >> value_bits))) | 58 if (unlikely ((key >> key_bits) || (value >> value_bits))) |
| 59 return false; /* Overflows */ | 59 return false; /* Overflows */ |
| 60 unsigned int k = key & ((1<<cache_bits)-1); | 60 unsigned int k = key & ((1u<<cache_bits)-1); |
| 61 unsigned int v = ((key>>cache_bits)<<value_bits) | value; | 61 unsigned int v = ((key>>cache_bits)<<value_bits) | value; |
| 62 values[k] = v; | 62 values[k] = v; |
| 63 return true; | 63 return true; |
| 64 } | 64 } |
| 65 | 65 |
| 66 private: | 66 private: |
| 67 unsigned int values[1<<cache_bits]; | 67 unsigned int values[1u<<cache_bits]; |
| 68 }; | 68 }; |
| 69 | 69 |
| 70 typedef hb_cache_t<21, 16, 8> hb_cmap_cache_t; | 70 typedef hb_cache_t<21, 16, 8> hb_cmap_cache_t; |
| 71 typedef hb_cache_t<16, 24, 8> hb_advance_cache_t; | 71 typedef hb_cache_t<16, 24, 8> hb_advance_cache_t; |
| 72 | 72 |
| 73 | 73 |
| 74 #endif /* HB_CACHE_PRIVATE_HH */ | 74 #endif /* HB_CACHE_PRIVATE_HH */ |
| OLD | NEW |