diff options
author | Tuomas Virtanen <katajakasa@gmail.com> | 2018-06-20 01:15:00 +0300 |
---|---|---|
committer | Tuomas Virtanen <katajakasa@gmail.com> | 2018-06-20 01:15:00 +0300 |
commit | e1c160951914428e30f044d16ffd9a564283a3c7 (patch) | |
tree | 28cb6618e749ec56743a75e89e9e2b0b9c795a73 /src/internal/subtitle/kitatlas.c | |
parent | bdb8a99e0c640875ca45e3a3cc98766fdedba77e (diff) |
Miscellaneous seeking and locking bugfixes (ref issue #32)
Diffstat (limited to 'src/internal/subtitle/kitatlas.c')
-rw-r--r-- | src/internal/subtitle/kitatlas.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/internal/subtitle/kitatlas.c b/src/internal/subtitle/kitatlas.c index a62690e..f9da36c 100644 --- a/src/internal/subtitle/kitatlas.c +++ b/src/internal/subtitle/kitatlas.c @@ -3,6 +3,8 @@ #include "kitchensink/internal/subtitle/kitatlas.h"
#include "kitchensink/internal/utils/kitlog.h"
+#define BORDER 2
+
static int min(int a, int b) {
if(a < b)
return a;
@@ -50,12 +52,11 @@ void Kit_ResetAtlasContent(Kit_TextureAtlas *atlas) { }
void Kit_ClearAtlasContent(Kit_TextureAtlas *atlas) {
- Kit_TextureAtlasItem *item;
for(int i = 0; i < atlas->cur_items; i++) {
- item = &atlas->items[i];
- SDL_FreeSurface(item->surface);
+ SDL_FreeSurface(atlas->items[i].surface);
}
atlas->cur_items = 0;
+ memset(atlas->items, 0, atlas->max_items * sizeof(Kit_TextureAtlasItem));
memset(atlas->shelf, 0, sizeof(atlas->shelf));
}
@@ -82,7 +83,8 @@ int Kit_FindFreeAtlasSlot(Kit_TextureAtlas *atlas, Kit_TextureAtlasItem *item) { assert(atlas != NULL);
assert(item != NULL);
- int shelf_w, shelf_h;
+ int shelf_w;
+ int shelf_h;
int total_remaining_h = atlas->h;
int total_reserved_h = 0;
|