Skip to content

Commit 9d03015

Browse files
committed
Fix build.
1 parent d84512b commit 9d03015

2 files changed

Lines changed: 15 additions & 10 deletions

File tree

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
1+
build/
2+
build2/
13
demo/build
2-
demo2
4+
demo2

ve_fontcache.h

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,15 @@
1515
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT
1616
NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
1717
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES
18-
OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
19-
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
18+
OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
19+
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
2020
*/
2121

22+
#include <cmath>
23+
#include <cstdint>
24+
2225
/*
23-
---------------------------------- How to plug into rendering API ----------------------------------------
26+
---------------------------------- How to plug into rendering API ----------------------------------------
2427
2528
1. Create these simple shaders ( GLSL example provided ):
2629
@@ -384,17 +387,17 @@ typedef uint64_t ve_fontcache_poollist_value;
384387

385388
struct ve_fontcache_poollist_item
386389
{
387-
ve_fontcache_poollist_itr prev = -1;
388-
ve_fontcache_poollist_itr next = -1;
390+
ve_fontcache_poollist_itr prev = 0xFFFFFFFFU;
391+
ve_fontcache_poollist_itr next = 0xFFFFFFFFU;
389392
ve_fontcache_poollist_value value = 0;
390393
};
391394

392395
struct ve_fontcache_poollist
393396
{
394397
std::vector< ve_fontcache_poollist_item > pool;
395398
std::vector< ve_fontcache_poollist_itr > freelist;
396-
ve_fontcache_poollist_itr front = -1;
397-
ve_fontcache_poollist_itr back = -1;
399+
ve_fontcache_poollist_itr front = 0xFFFFFFFFU;
400+
ve_fontcache_poollist_itr back = 0xFFFFFFFFU;
398401
size_t size = 0;
399402
size_t capacity = 0;
400403
};
@@ -1456,7 +1459,7 @@ void ve_fontcache_shape_text_uncached( ve_fontcache* cache, ve_font_id font, ve_
14561459
}
14571460
if ( std::abs( entry.size ) <= VE_FONTCACHE_ADVANCE_SNAP_SMALLFONT_SIZE ) {
14581461
// Expand advance to closest pixel for hb_font small sizes.
1459-
pos = std::ceilf( pos );
1462+
pos = std::ceil( pos );
14601463
}
14611464

14621465
output.glyphs.push_back( glyph_id );
@@ -1529,7 +1532,7 @@ void ve_fontcache_shape_text_uncached( ve_fontcache* cache, ve_font_id font, ve_
15291532
}
15301533
if ( std::abs( entry.size ) <= VE_FONTCACHE_ADVANCE_SNAP_SMALLFONT_SIZE ) {
15311534
// Expand advance to closest pixel for hb_font small sizes.
1532-
pos = std::ceilf( pos );
1535+
pos = std::ceil( pos );
15331536
}
15341537

15351538
output.glyphs.push_back( stbtt_FindGlyphIndex( &entry.info, codepoint ) );

0 commit comments

Comments
 (0)