| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright © 2009,2010 Red Hat, Inc. | 2 * Copyright © 2009,2010 Red Hat, Inc. |
| 3 * Copyright © 2011,2012 Google, Inc. | 3 * Copyright © 2011,2012 Google, Inc. |
| 4 * | 4 * |
| 5 * This is part of HarfBuzz, a text shaping library. | 5 * This is part of HarfBuzz, a text shaping library. |
| 6 * | 6 * |
| 7 * Permission is hereby granted, without written agreement and without | 7 * Permission is hereby granted, without written agreement and without |
| 8 * license or royalty fees, to use, copy, modify, and distribute this | 8 * license or royalty fees, to use, copy, modify, and distribute this |
| 9 * software and its documentation for any purpose, provided that the | 9 * software and its documentation for any purpose, provided that the |
| 10 * above copyright notice and the following two paragraphs appear in | 10 * above copyright notice and the following two paragraphs appear in |
| (...skipping 522 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 533 } | 533 } |
| 534 hb_user_data_item_t item = {key, data, destroy}; | 534 hb_user_data_item_t item = {key, data, destroy}; |
| 535 bool ret = !!items.replace_or_insert (item, lock, (bool) replace); | 535 bool ret = !!items.replace_or_insert (item, lock, (bool) replace); |
| 536 | 536 |
| 537 return ret; | 537 return ret; |
| 538 } | 538 } |
| 539 | 539 |
| 540 void * | 540 void * |
| 541 hb_user_data_array_t::get (hb_user_data_key_t *key) | 541 hb_user_data_array_t::get (hb_user_data_key_t *key) |
| 542 { | 542 { |
| 543 hb_user_data_item_t item = {NULL }; | 543 hb_user_data_item_t item = {NULL, NULL, NULL}; |
| 544 | 544 |
| 545 return items.find (key, &item, lock) ? item.data : NULL; | 545 return items.find (key, &item, lock) ? item.data : NULL; |
| 546 } | 546 } |
| 547 | 547 |
| 548 | 548 |
| 549 /* hb_version */ | 549 /* hb_version */ |
| 550 | 550 |
| 551 /** | 551 /** |
| 552 * hb_version: | 552 * hb_version: |
| 553 * @major: (out): Library major version component. | 553 * @major: (out): Library major version component. |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 595 * | 595 * |
| 596 * Since: 0.9.30 | 596 * Since: 0.9.30 |
| 597 **/ | 597 **/ |
| 598 hb_bool_t | 598 hb_bool_t |
| 599 hb_version_atleast (unsigned int major, | 599 hb_version_atleast (unsigned int major, |
| 600 unsigned int minor, | 600 unsigned int minor, |
| 601 unsigned int micro) | 601 unsigned int micro) |
| 602 { | 602 { |
| 603 return HB_VERSION_ATLEAST (major, minor, micro); | 603 return HB_VERSION_ATLEAST (major, minor, micro); |
| 604 } | 604 } |
| OLD | NEW |