author | Tero Marttila <terom@fixme.fi> |
Thu, 31 Dec 2009 17:37:31 +0200 | |
changeset 25 | a2d30ea44cbe |
parent 22 | 811c88041c06 |
child 52 | 148a120ea7d5 |
permissions | -rw-r--r-- |
0 | 1 |
#include "image.h" |
19
ebcc49de97d0
implement pt_ctx threadpool and pt_image_tile_async
Tero Marttila <terom@fixme.fi>
parents:
18
diff
changeset
|
2 |
#include "ctx.h" |
1
f3cde3db1fef
basic image/cache code compiles
Tero Marttila <terom@fixme.fi>
parents:
0
diff
changeset
|
3 |
#include "cache.h" |
18 | 4 |
#include "tile.h" |
17
baf3fe7c6354
add library error codes, and fix image fopen error handling
Tero Marttila <terom@fixme.fi>
parents:
11
diff
changeset
|
5 |
#include "error.h" |
4
49362b34116c
open cache as .tmp, and rename to .cache when done
Tero Marttila <terom@fixme.fi>
parents:
3
diff
changeset
|
6 |
#include "shared/util.h" |
19
ebcc49de97d0
implement pt_ctx threadpool and pt_image_tile_async
Tero Marttila <terom@fixme.fi>
parents:
18
diff
changeset
|
7 |
#include "shared/log.h" |
0 | 8 |
|
1
f3cde3db1fef
basic image/cache code compiles
Tero Marttila <terom@fixme.fi>
parents:
0
diff
changeset
|
9 |
#include <stdlib.h> |
6
766df7c9b90d
--force-update and store palette
Tero Marttila <terom@fixme.fi>
parents:
5
diff
changeset
|
10 |
#include <errno.h> |
1
f3cde3db1fef
basic image/cache code compiles
Tero Marttila <terom@fixme.fi>
parents:
0
diff
changeset
|
11 |
|
f3cde3db1fef
basic image/cache code compiles
Tero Marttila <terom@fixme.fi>
parents:
0
diff
changeset
|
12 |
#include <png.h> |
f3cde3db1fef
basic image/cache code compiles
Tero Marttila <terom@fixme.fi>
parents:
0
diff
changeset
|
13 |
|
17
baf3fe7c6354
add library error codes, and fix image fopen error handling
Tero Marttila <terom@fixme.fi>
parents:
11
diff
changeset
|
14 |
static int pt_image_new (struct pt_image **image_ptr, struct pt_ctx *ctx, const char *path) |
0 | 15 |
{ |
17
baf3fe7c6354
add library error codes, and fix image fopen error handling
Tero Marttila <terom@fixme.fi>
parents:
11
diff
changeset
|
16 |
struct pt_image *image; |
baf3fe7c6354
add library error codes, and fix image fopen error handling
Tero Marttila <terom@fixme.fi>
parents:
11
diff
changeset
|
17 |
int err = 0; |
0 | 18 |
|
19 |
// alloc |
|
17
baf3fe7c6354
add library error codes, and fix image fopen error handling
Tero Marttila <terom@fixme.fi>
parents:
11
diff
changeset
|
20 |
if ((image = calloc(1, sizeof(*image))) == NULL) |
baf3fe7c6354
add library error codes, and fix image fopen error handling
Tero Marttila <terom@fixme.fi>
parents:
11
diff
changeset
|
21 |
JUMP_SET_ERROR(err, PT_ERR_MEM); |
0 | 22 |
|
17
baf3fe7c6354
add library error codes, and fix image fopen error handling
Tero Marttila <terom@fixme.fi>
parents:
11
diff
changeset
|
23 |
if ((image->path = strdup(path)) == NULL) |
baf3fe7c6354
add library error codes, and fix image fopen error handling
Tero Marttila <terom@fixme.fi>
parents:
11
diff
changeset
|
24 |
JUMP_SET_ERROR(err, PT_ERR_MEM); |
0 | 25 |
|
26 |
// init |
|
17
baf3fe7c6354
add library error codes, and fix image fopen error handling
Tero Marttila <terom@fixme.fi>
parents:
11
diff
changeset
|
27 |
image->ctx = ctx; |
0 | 28 |
|
29 |
// ok |
|
17
baf3fe7c6354
add library error codes, and fix image fopen error handling
Tero Marttila <terom@fixme.fi>
parents:
11
diff
changeset
|
30 |
*image_ptr = image; |
0 | 31 |
|
32 |
return 0; |
|
33 |
||
34 |
error: |
|
17
baf3fe7c6354
add library error codes, and fix image fopen error handling
Tero Marttila <terom@fixme.fi>
parents:
11
diff
changeset
|
35 |
pt_image_destroy(image); |
baf3fe7c6354
add library error codes, and fix image fopen error handling
Tero Marttila <terom@fixme.fi>
parents:
11
diff
changeset
|
36 |
|
baf3fe7c6354
add library error codes, and fix image fopen error handling
Tero Marttila <terom@fixme.fi>
parents:
11
diff
changeset
|
37 |
return err; |
0 | 38 |
} |
39 |
||
40 |
/** |
|
41 |
* Open the image's FILE |
|
42 |
*/ |
|
17
baf3fe7c6354
add library error codes, and fix image fopen error handling
Tero Marttila <terom@fixme.fi>
parents:
11
diff
changeset
|
43 |
static int pt_image_open_file (struct pt_image *image, FILE **file_ptr) |
0 | 44 |
{ |
45 |
FILE *fp; |
|
46 |
||
47 |
// open |
|
17
baf3fe7c6354
add library error codes, and fix image fopen error handling
Tero Marttila <terom@fixme.fi>
parents:
11
diff
changeset
|
48 |
if ((fp = fopen(image->path, "rb")) == NULL) |
baf3fe7c6354
add library error codes, and fix image fopen error handling
Tero Marttila <terom@fixme.fi>
parents:
11
diff
changeset
|
49 |
RETURN_ERROR(PT_ERR_IMG_FOPEN); |
0 | 50 |
|
51 |
// ok |
|
52 |
*file_ptr = fp; |
|
53 |
||
54 |
return 0; |
|
55 |
} |
|
56 |
||
57 |
/** |
|
58 |
* Open the PNG image, setting up the I/O and returning the png_structp and png_infop |
|
59 |
*/ |
|
17
baf3fe7c6354
add library error codes, and fix image fopen error handling
Tero Marttila <terom@fixme.fi>
parents:
11
diff
changeset
|
60 |
static int pt_image_open_png (struct pt_image *image, png_structp *png_ptr, png_infop *info_ptr) |
0 | 61 |
{ |
62 |
FILE *fp = NULL; |
|
63 |
png_structp png = NULL; |
|
64 |
png_infop info = NULL; |
|
17
baf3fe7c6354
add library error codes, and fix image fopen error handling
Tero Marttila <terom@fixme.fi>
parents:
11
diff
changeset
|
65 |
int err; |
0 | 66 |
|
67 |
// open I/O |
|
17
baf3fe7c6354
add library error codes, and fix image fopen error handling
Tero Marttila <terom@fixme.fi>
parents:
11
diff
changeset
|
68 |
if ((err = pt_image_open_file(image, &fp))) |
baf3fe7c6354
add library error codes, and fix image fopen error handling
Tero Marttila <terom@fixme.fi>
parents:
11
diff
changeset
|
69 |
JUMP_ERROR(err); |
0 | 70 |
|
71 |
// create the struct |
|
72 |
if ((png = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL)) == NULL) |
|
17
baf3fe7c6354
add library error codes, and fix image fopen error handling
Tero Marttila <terom@fixme.fi>
parents:
11
diff
changeset
|
73 |
JUMP_SET_ERROR(err, PT_ERR_PNG_CREATE); |
0 | 74 |
|
75 |
// create the info |
|
76 |
if ((info = png_create_info_struct(png)) == NULL) |
|
17
baf3fe7c6354
add library error codes, and fix image fopen error handling
Tero Marttila <terom@fixme.fi>
parents:
11
diff
changeset
|
77 |
JUMP_SET_ERROR(err, PT_ERR_PNG_CREATE); |
0 | 78 |
|
79 |
// setup error trap for the I/O |
|
80 |
if (setjmp(png_jmpbuf(png))) |
|
17
baf3fe7c6354
add library error codes, and fix image fopen error handling
Tero Marttila <terom@fixme.fi>
parents:
11
diff
changeset
|
81 |
JUMP_SET_ERROR(err, PT_ERR_PNG); |
0 | 82 |
|
83 |
// setup I/O to FILE |
|
84 |
png_init_io(png, fp); |
|
85 |
||
86 |
// ok |
|
17
baf3fe7c6354
add library error codes, and fix image fopen error handling
Tero Marttila <terom@fixme.fi>
parents:
11
diff
changeset
|
87 |
// XXX: what to do with fp? Should fclose() when done? |
0 | 88 |
*png_ptr = png; |
89 |
*info_ptr = info; |
|
90 |
||
91 |
return 0; |
|
92 |
||
93 |
error: |
|
94 |
// cleanup file |
|
95 |
if (fp) fclose(fp); |
|
96 |
||
97 |
// cleanup PNG state |
|
98 |
png_destroy_read_struct(&png, &info, NULL); |
|
17
baf3fe7c6354
add library error codes, and fix image fopen error handling
Tero Marttila <terom@fixme.fi>
parents:
11
diff
changeset
|
99 |
|
baf3fe7c6354
add library error codes, and fix image fopen error handling
Tero Marttila <terom@fixme.fi>
parents:
11
diff
changeset
|
100 |
return err; |
0 | 101 |
} |
102 |
||
103 |
/** |
|
7
997906f5fd2d
mmap header, implement pt_image_info (post-update)
Tero Marttila <terom@fixme.fi>
parents:
6
diff
changeset
|
104 |
* Update the image_info field from the given png object. |
997906f5fd2d
mmap header, implement pt_image_info (post-update)
Tero Marttila <terom@fixme.fi>
parents:
6
diff
changeset
|
105 |
* |
997906f5fd2d
mmap header, implement pt_image_info (post-update)
Tero Marttila <terom@fixme.fi>
parents:
6
diff
changeset
|
106 |
* Must be called under libpng-error-trap! |
18 | 107 |
* |
108 |
* XXX: currently this info is not used, pulled from the cache instead |
|
7
997906f5fd2d
mmap header, implement pt_image_info (post-update)
Tero Marttila <terom@fixme.fi>
parents:
6
diff
changeset
|
109 |
*/ |
997906f5fd2d
mmap header, implement pt_image_info (post-update)
Tero Marttila <terom@fixme.fi>
parents:
6
diff
changeset
|
110 |
static int pt_image_update_info (struct pt_image *image, png_structp png, png_infop info) |
997906f5fd2d
mmap header, implement pt_image_info (post-update)
Tero Marttila <terom@fixme.fi>
parents:
6
diff
changeset
|
111 |
{ |
997906f5fd2d
mmap header, implement pt_image_info (post-update)
Tero Marttila <terom@fixme.fi>
parents:
6
diff
changeset
|
112 |
// query png_get_* |
997906f5fd2d
mmap header, implement pt_image_info (post-update)
Tero Marttila <terom@fixme.fi>
parents:
6
diff
changeset
|
113 |
image->info.width = png_get_image_width(png, info); |
997906f5fd2d
mmap header, implement pt_image_info (post-update)
Tero Marttila <terom@fixme.fi>
parents:
6
diff
changeset
|
114 |
image->info.height = png_get_image_height(png, info); |
997906f5fd2d
mmap header, implement pt_image_info (post-update)
Tero Marttila <terom@fixme.fi>
parents:
6
diff
changeset
|
115 |
|
997906f5fd2d
mmap header, implement pt_image_info (post-update)
Tero Marttila <terom@fixme.fi>
parents:
6
diff
changeset
|
116 |
return 0; |
997906f5fd2d
mmap header, implement pt_image_info (post-update)
Tero Marttila <terom@fixme.fi>
parents:
6
diff
changeset
|
117 |
} |
997906f5fd2d
mmap header, implement pt_image_info (post-update)
Tero Marttila <terom@fixme.fi>
parents:
6
diff
changeset
|
118 |
|
997906f5fd2d
mmap header, implement pt_image_info (post-update)
Tero Marttila <terom@fixme.fi>
parents:
6
diff
changeset
|
119 |
/** |
0 | 120 |
* Open the PNG image, and write out to the cache |
121 |
*/ |
|
6
766df7c9b90d
--force-update and store palette
Tero Marttila <terom@fixme.fi>
parents:
5
diff
changeset
|
122 |
static int pt_image_update_cache (struct pt_image *image) |
0 | 123 |
{ |
124 |
png_structp png; |
|
125 |
png_infop info; |
|
17
baf3fe7c6354
add library error codes, and fix image fopen error handling
Tero Marttila <terom@fixme.fi>
parents:
11
diff
changeset
|
126 |
int err = 0; |
0 | 127 |
|
6
766df7c9b90d
--force-update and store palette
Tero Marttila <terom@fixme.fi>
parents:
5
diff
changeset
|
128 |
// pre-check enabled |
17
baf3fe7c6354
add library error codes, and fix image fopen error handling
Tero Marttila <terom@fixme.fi>
parents:
11
diff
changeset
|
129 |
if (!(image->cache->mode & PT_OPEN_UPDATE)) |
baf3fe7c6354
add library error codes, and fix image fopen error handling
Tero Marttila <terom@fixme.fi>
parents:
11
diff
changeset
|
130 |
RETURN_ERROR_ERRNO(PT_ERR_OPEN_MODE, EACCES); |
6
766df7c9b90d
--force-update and store palette
Tero Marttila <terom@fixme.fi>
parents:
5
diff
changeset
|
131 |
|
0 | 132 |
// open .png |
17
baf3fe7c6354
add library error codes, and fix image fopen error handling
Tero Marttila <terom@fixme.fi>
parents:
11
diff
changeset
|
133 |
if ((err = pt_image_open_png(image, &png, &info))) |
baf3fe7c6354
add library error codes, and fix image fopen error handling
Tero Marttila <terom@fixme.fi>
parents:
11
diff
changeset
|
134 |
return err; |
0 | 135 |
|
136 |
// setup error trap |
|
137 |
if (setjmp(png_jmpbuf(png))) |
|
17
baf3fe7c6354
add library error codes, and fix image fopen error handling
Tero Marttila <terom@fixme.fi>
parents:
11
diff
changeset
|
138 |
JUMP_SET_ERROR(err, PT_ERR_PNG); |
0 | 139 |
|
140 |
// read meta-info |
|
141 |
png_read_info(png, info); |
|
142 |
||
7
997906f5fd2d
mmap header, implement pt_image_info (post-update)
Tero Marttila <terom@fixme.fi>
parents:
6
diff
changeset
|
143 |
// update our meta-info |
17
baf3fe7c6354
add library error codes, and fix image fopen error handling
Tero Marttila <terom@fixme.fi>
parents:
11
diff
changeset
|
144 |
if ((err = pt_image_update_info(image, png, info))) |
baf3fe7c6354
add library error codes, and fix image fopen error handling
Tero Marttila <terom@fixme.fi>
parents:
11
diff
changeset
|
145 |
JUMP_ERROR(err); |
7
997906f5fd2d
mmap header, implement pt_image_info (post-update)
Tero Marttila <terom@fixme.fi>
parents:
6
diff
changeset
|
146 |
|
0 | 147 |
// pass to cache object |
17
baf3fe7c6354
add library error codes, and fix image fopen error handling
Tero Marttila <terom@fixme.fi>
parents:
11
diff
changeset
|
148 |
if ((err = pt_cache_update_png(image->cache, png, info))) |
baf3fe7c6354
add library error codes, and fix image fopen error handling
Tero Marttila <terom@fixme.fi>
parents:
11
diff
changeset
|
149 |
JUMP_ERROR(err); |
0 | 150 |
|
151 |
// finish off, ignore trailing data |
|
152 |
png_read_end(png, NULL); |
|
153 |
||
17
baf3fe7c6354
add library error codes, and fix image fopen error handling
Tero Marttila <terom@fixme.fi>
parents:
11
diff
changeset
|
154 |
error: |
0 | 155 |
// clean up |
17
baf3fe7c6354
add library error codes, and fix image fopen error handling
Tero Marttila <terom@fixme.fi>
parents:
11
diff
changeset
|
156 |
// XXX: we need to close the fopen'd .png |
1
f3cde3db1fef
basic image/cache code compiles
Tero Marttila <terom@fixme.fi>
parents:
0
diff
changeset
|
157 |
png_destroy_read_struct(&png, &info, NULL); |
0 | 158 |
|
17
baf3fe7c6354
add library error codes, and fix image fopen error handling
Tero Marttila <terom@fixme.fi>
parents:
11
diff
changeset
|
159 |
return err; |
0 | 160 |
} |
161 |
||
1
f3cde3db1fef
basic image/cache code compiles
Tero Marttila <terom@fixme.fi>
parents:
0
diff
changeset
|
162 |
/** |
f3cde3db1fef
basic image/cache code compiles
Tero Marttila <terom@fixme.fi>
parents:
0
diff
changeset
|
163 |
* Build a filesystem path representing the appropriate path for this image's cache entry, and store it in the given |
f3cde3db1fef
basic image/cache code compiles
Tero Marttila <terom@fixme.fi>
parents:
0
diff
changeset
|
164 |
* buffer. |
f3cde3db1fef
basic image/cache code compiles
Tero Marttila <terom@fixme.fi>
parents:
0
diff
changeset
|
165 |
*/ |
f3cde3db1fef
basic image/cache code compiles
Tero Marttila <terom@fixme.fi>
parents:
0
diff
changeset
|
166 |
static int pt_image_cache_path (struct pt_image *image, char *buf, size_t len) |
0 | 167 |
{ |
17
baf3fe7c6354
add library error codes, and fix image fopen error handling
Tero Marttila <terom@fixme.fi>
parents:
11
diff
changeset
|
168 |
if (path_with_fext(image->path, buf, len, ".cache")) |
baf3fe7c6354
add library error codes, and fix image fopen error handling
Tero Marttila <terom@fixme.fi>
parents:
11
diff
changeset
|
169 |
RETURN_ERROR(PT_ERR_PATH); |
baf3fe7c6354
add library error codes, and fix image fopen error handling
Tero Marttila <terom@fixme.fi>
parents:
11
diff
changeset
|
170 |
|
baf3fe7c6354
add library error codes, and fix image fopen error handling
Tero Marttila <terom@fixme.fi>
parents:
11
diff
changeset
|
171 |
return 0; |
1
f3cde3db1fef
basic image/cache code compiles
Tero Marttila <terom@fixme.fi>
parents:
0
diff
changeset
|
172 |
} |
0 | 173 |
|
1
f3cde3db1fef
basic image/cache code compiles
Tero Marttila <terom@fixme.fi>
parents:
0
diff
changeset
|
174 |
int pt_image_open (struct pt_image **image_ptr, struct pt_ctx *ctx, const char *path, int cache_mode) |
f3cde3db1fef
basic image/cache code compiles
Tero Marttila <terom@fixme.fi>
parents:
0
diff
changeset
|
175 |
{ |
f3cde3db1fef
basic image/cache code compiles
Tero Marttila <terom@fixme.fi>
parents:
0
diff
changeset
|
176 |
struct pt_image *image; |
6
766df7c9b90d
--force-update and store palette
Tero Marttila <terom@fixme.fi>
parents:
5
diff
changeset
|
177 |
char cache_path[1024]; |
17
baf3fe7c6354
add library error codes, and fix image fopen error handling
Tero Marttila <terom@fixme.fi>
parents:
11
diff
changeset
|
178 |
int err; |
1
f3cde3db1fef
basic image/cache code compiles
Tero Marttila <terom@fixme.fi>
parents:
0
diff
changeset
|
179 |
|
f3cde3db1fef
basic image/cache code compiles
Tero Marttila <terom@fixme.fi>
parents:
0
diff
changeset
|
180 |
// XXX: verify that the path exists and looks like a PNG file |
0 | 181 |
|
182 |
// alloc |
|
17
baf3fe7c6354
add library error codes, and fix image fopen error handling
Tero Marttila <terom@fixme.fi>
parents:
11
diff
changeset
|
183 |
if ((err = pt_image_new(&image, ctx, path))) |
baf3fe7c6354
add library error codes, and fix image fopen error handling
Tero Marttila <terom@fixme.fi>
parents:
11
diff
changeset
|
184 |
return err; |
1
f3cde3db1fef
basic image/cache code compiles
Tero Marttila <terom@fixme.fi>
parents:
0
diff
changeset
|
185 |
|
f3cde3db1fef
basic image/cache code compiles
Tero Marttila <terom@fixme.fi>
parents:
0
diff
changeset
|
186 |
// compute cache file path |
17
baf3fe7c6354
add library error codes, and fix image fopen error handling
Tero Marttila <terom@fixme.fi>
parents:
11
diff
changeset
|
187 |
if ((err = pt_image_cache_path(image, cache_path, sizeof(cache_path)))) |
baf3fe7c6354
add library error codes, and fix image fopen error handling
Tero Marttila <terom@fixme.fi>
parents:
11
diff
changeset
|
188 |
JUMP_ERROR(err); |
0 | 189 |
|
9 | 190 |
// create the cache object for this image (doesn't yet open it) |
17
baf3fe7c6354
add library error codes, and fix image fopen error handling
Tero Marttila <terom@fixme.fi>
parents:
11
diff
changeset
|
191 |
if ((err = pt_cache_new(&image->cache, cache_path, cache_mode))) |
baf3fe7c6354
add library error codes, and fix image fopen error handling
Tero Marttila <terom@fixme.fi>
parents:
11
diff
changeset
|
192 |
JUMP_ERROR(err); |
0 | 193 |
|
194 |
// ok, ready for access |
|
1
f3cde3db1fef
basic image/cache code compiles
Tero Marttila <terom@fixme.fi>
parents:
0
diff
changeset
|
195 |
*image_ptr = image; |
0 | 196 |
|
197 |
return 0; |
|
198 |
||
199 |
error: |
|
1
f3cde3db1fef
basic image/cache code compiles
Tero Marttila <terom@fixme.fi>
parents:
0
diff
changeset
|
200 |
pt_image_destroy(image); |
f3cde3db1fef
basic image/cache code compiles
Tero Marttila <terom@fixme.fi>
parents:
0
diff
changeset
|
201 |
|
17
baf3fe7c6354
add library error codes, and fix image fopen error handling
Tero Marttila <terom@fixme.fi>
parents:
11
diff
changeset
|
202 |
return err; |
0 | 203 |
} |
1
f3cde3db1fef
basic image/cache code compiles
Tero Marttila <terom@fixme.fi>
parents:
0
diff
changeset
|
204 |
|
7
997906f5fd2d
mmap header, implement pt_image_info (post-update)
Tero Marttila <terom@fixme.fi>
parents:
6
diff
changeset
|
205 |
int pt_image_info (struct pt_image *image, const struct pt_image_info **info_ptr) |
997906f5fd2d
mmap header, implement pt_image_info (post-update)
Tero Marttila <terom@fixme.fi>
parents:
6
diff
changeset
|
206 |
{ |
17
baf3fe7c6354
add library error codes, and fix image fopen error handling
Tero Marttila <terom@fixme.fi>
parents:
11
diff
changeset
|
207 |
int err; |
baf3fe7c6354
add library error codes, and fix image fopen error handling
Tero Marttila <terom@fixme.fi>
parents:
11
diff
changeset
|
208 |
|
10
6806a90d934f
make pt_cache_open no-op if already open, pt_image_info -> pt_cache_info
Tero Marttila <terom@fixme.fi>
parents:
9
diff
changeset
|
209 |
// update info |
17
baf3fe7c6354
add library error codes, and fix image fopen error handling
Tero Marttila <terom@fixme.fi>
parents:
11
diff
changeset
|
210 |
if ((err = pt_cache_info(image->cache, &image->info))) |
baf3fe7c6354
add library error codes, and fix image fopen error handling
Tero Marttila <terom@fixme.fi>
parents:
11
diff
changeset
|
211 |
return err; |
10
6806a90d934f
make pt_cache_open no-op if already open, pt_image_info -> pt_cache_info
Tero Marttila <terom@fixme.fi>
parents:
9
diff
changeset
|
212 |
|
6806a90d934f
make pt_cache_open no-op if already open, pt_image_info -> pt_cache_info
Tero Marttila <terom@fixme.fi>
parents:
9
diff
changeset
|
213 |
// return pointer |
7
997906f5fd2d
mmap header, implement pt_image_info (post-update)
Tero Marttila <terom@fixme.fi>
parents:
6
diff
changeset
|
214 |
*info_ptr = &image->info; |
997906f5fd2d
mmap header, implement pt_image_info (post-update)
Tero Marttila <terom@fixme.fi>
parents:
6
diff
changeset
|
215 |
|
997906f5fd2d
mmap header, implement pt_image_info (post-update)
Tero Marttila <terom@fixme.fi>
parents:
6
diff
changeset
|
216 |
return 0; |
997906f5fd2d
mmap header, implement pt_image_info (post-update)
Tero Marttila <terom@fixme.fi>
parents:
6
diff
changeset
|
217 |
} |
997906f5fd2d
mmap header, implement pt_image_info (post-update)
Tero Marttila <terom@fixme.fi>
parents:
6
diff
changeset
|
218 |
|
8 | 219 |
int pt_image_status (struct pt_image *image) |
5
4b440fa03183
move stale-update logic to main
Tero Marttila <terom@fixme.fi>
parents:
4
diff
changeset
|
220 |
{ |
8 | 221 |
return pt_cache_status(image->cache, image->path); |
5
4b440fa03183
move stale-update logic to main
Tero Marttila <terom@fixme.fi>
parents:
4
diff
changeset
|
222 |
} |
4b440fa03183
move stale-update logic to main
Tero Marttila <terom@fixme.fi>
parents:
4
diff
changeset
|
223 |
|
4b440fa03183
move stale-update logic to main
Tero Marttila <terom@fixme.fi>
parents:
4
diff
changeset
|
224 |
int pt_image_update (struct pt_image *image) |
4b440fa03183
move stale-update logic to main
Tero Marttila <terom@fixme.fi>
parents:
4
diff
changeset
|
225 |
{ |
4b440fa03183
move stale-update logic to main
Tero Marttila <terom@fixme.fi>
parents:
4
diff
changeset
|
226 |
return pt_image_update_cache(image); |
4b440fa03183
move stale-update logic to main
Tero Marttila <terom@fixme.fi>
parents:
4
diff
changeset
|
227 |
} |
4b440fa03183
move stale-update logic to main
Tero Marttila <terom@fixme.fi>
parents:
4
diff
changeset
|
228 |
|
25 | 229 |
int pt_image_load (struct pt_image *image) |
230 |
{ |
|
231 |
return pt_cache_open(image->cache); |
|
232 |
} |
|
233 |
||
18 | 234 |
int pt_image_tile_file (struct pt_image *image, const struct pt_tile_info *info, FILE *out) |
9 | 235 |
{ |
18 | 236 |
struct pt_tile tile; |
237 |
int err; |
|
9 | 238 |
|
18 | 239 |
// init |
19
ebcc49de97d0
implement pt_ctx threadpool and pt_image_tile_async
Tero Marttila <terom@fixme.fi>
parents:
18
diff
changeset
|
240 |
if ((err = pt_tile_init_file(&tile, image->cache, info, out))) |
18 | 241 |
return err; |
242 |
||
243 |
// render |
|
19
ebcc49de97d0
implement pt_ctx threadpool and pt_image_tile_async
Tero Marttila <terom@fixme.fi>
parents:
18
diff
changeset
|
244 |
if ((err = pt_tile_render(&tile))) |
17
baf3fe7c6354
add library error codes, and fix image fopen error handling
Tero Marttila <terom@fixme.fi>
parents:
11
diff
changeset
|
245 |
JUMP_ERROR(err); |
9 | 246 |
|
18 | 247 |
// ok |
248 |
return 0; |
|
9 | 249 |
|
250 |
error: |
|
18 | 251 |
pt_tile_abort(&tile); |
252 |
||
253 |
return err; |
|
254 |
} |
|
255 |
||
256 |
int pt_image_tile_mem (struct pt_image *image, const struct pt_tile_info *info, char **buf_ptr, size_t *len_ptr) |
|
257 |
{ |
|
258 |
struct pt_tile tile; |
|
259 |
int err; |
|
260 |
||
261 |
// init |
|
19
ebcc49de97d0
implement pt_ctx threadpool and pt_image_tile_async
Tero Marttila <terom@fixme.fi>
parents:
18
diff
changeset
|
262 |
if ((err = pt_tile_init_mem(&tile, image->cache, info))) |
18 | 263 |
return err; |
264 |
||
265 |
// render |
|
19
ebcc49de97d0
implement pt_ctx threadpool and pt_image_tile_async
Tero Marttila <terom@fixme.fi>
parents:
18
diff
changeset
|
266 |
if ((err = pt_tile_render(&tile))) |
18 | 267 |
JUMP_ERROR(err); |
268 |
||
269 |
// ok |
|
270 |
*buf_ptr = tile.out.mem.base; |
|
271 |
*len_ptr = tile.out.mem.len; |
|
272 |
||
273 |
return 0; |
|
274 |
||
275 |
error: |
|
276 |
pt_tile_abort(&tile); |
|
9 | 277 |
|
17
baf3fe7c6354
add library error codes, and fix image fopen error handling
Tero Marttila <terom@fixme.fi>
parents:
11
diff
changeset
|
278 |
return err; |
9 | 279 |
} |
280 |
||
19
ebcc49de97d0
implement pt_ctx threadpool and pt_image_tile_async
Tero Marttila <terom@fixme.fi>
parents:
18
diff
changeset
|
281 |
static void _pt_image_tile_async (void *arg) |
ebcc49de97d0
implement pt_ctx threadpool and pt_image_tile_async
Tero Marttila <terom@fixme.fi>
parents:
18
diff
changeset
|
282 |
{ |
ebcc49de97d0
implement pt_ctx threadpool and pt_image_tile_async
Tero Marttila <terom@fixme.fi>
parents:
18
diff
changeset
|
283 |
struct pt_tile *tile = arg; |
ebcc49de97d0
implement pt_ctx threadpool and pt_image_tile_async
Tero Marttila <terom@fixme.fi>
parents:
18
diff
changeset
|
284 |
int err; |
ebcc49de97d0
implement pt_ctx threadpool and pt_image_tile_async
Tero Marttila <terom@fixme.fi>
parents:
18
diff
changeset
|
285 |
|
ebcc49de97d0
implement pt_ctx threadpool and pt_image_tile_async
Tero Marttila <terom@fixme.fi>
parents:
18
diff
changeset
|
286 |
// do render op |
ebcc49de97d0
implement pt_ctx threadpool and pt_image_tile_async
Tero Marttila <terom@fixme.fi>
parents:
18
diff
changeset
|
287 |
if ((err = pt_tile_render(tile))) |
ebcc49de97d0
implement pt_ctx threadpool and pt_image_tile_async
Tero Marttila <terom@fixme.fi>
parents:
18
diff
changeset
|
288 |
log_warn_errno("pt_tile_render: %s", pt_strerror(err)); |
ebcc49de97d0
implement pt_ctx threadpool and pt_image_tile_async
Tero Marttila <terom@fixme.fi>
parents:
18
diff
changeset
|
289 |
|
ebcc49de97d0
implement pt_ctx threadpool and pt_image_tile_async
Tero Marttila <terom@fixme.fi>
parents:
18
diff
changeset
|
290 |
// signal done |
ebcc49de97d0
implement pt_ctx threadpool and pt_image_tile_async
Tero Marttila <terom@fixme.fi>
parents:
18
diff
changeset
|
291 |
if (fclose(tile->out.file)) |
ebcc49de97d0
implement pt_ctx threadpool and pt_image_tile_async
Tero Marttila <terom@fixme.fi>
parents:
18
diff
changeset
|
292 |
log_warn_errno("fclose"); |
22
811c88041c06
cleanup pt_tile in _pt_image_tile_async
Tero Marttila <terom@fixme.fi>
parents:
19
diff
changeset
|
293 |
|
811c88041c06
cleanup pt_tile in _pt_image_tile_async
Tero Marttila <terom@fixme.fi>
parents:
19
diff
changeset
|
294 |
// cleanup |
811c88041c06
cleanup pt_tile in _pt_image_tile_async
Tero Marttila <terom@fixme.fi>
parents:
19
diff
changeset
|
295 |
pt_tile_destroy(tile); |
19
ebcc49de97d0
implement pt_ctx threadpool and pt_image_tile_async
Tero Marttila <terom@fixme.fi>
parents:
18
diff
changeset
|
296 |
} |
ebcc49de97d0
implement pt_ctx threadpool and pt_image_tile_async
Tero Marttila <terom@fixme.fi>
parents:
18
diff
changeset
|
297 |
|
ebcc49de97d0
implement pt_ctx threadpool and pt_image_tile_async
Tero Marttila <terom@fixme.fi>
parents:
18
diff
changeset
|
298 |
int pt_image_tile_async (struct pt_image *image, const struct pt_tile_info *info, FILE *out) |
ebcc49de97d0
implement pt_ctx threadpool and pt_image_tile_async
Tero Marttila <terom@fixme.fi>
parents:
18
diff
changeset
|
299 |
{ |
ebcc49de97d0
implement pt_ctx threadpool and pt_image_tile_async
Tero Marttila <terom@fixme.fi>
parents:
18
diff
changeset
|
300 |
struct pt_tile *tile; |
ebcc49de97d0
implement pt_ctx threadpool and pt_image_tile_async
Tero Marttila <terom@fixme.fi>
parents:
18
diff
changeset
|
301 |
int err; |
ebcc49de97d0
implement pt_ctx threadpool and pt_image_tile_async
Tero Marttila <terom@fixme.fi>
parents:
18
diff
changeset
|
302 |
|
ebcc49de97d0
implement pt_ctx threadpool and pt_image_tile_async
Tero Marttila <terom@fixme.fi>
parents:
18
diff
changeset
|
303 |
// alloc |
ebcc49de97d0
implement pt_ctx threadpool and pt_image_tile_async
Tero Marttila <terom@fixme.fi>
parents:
18
diff
changeset
|
304 |
if ((err = pt_tile_new(&tile))) |
ebcc49de97d0
implement pt_ctx threadpool and pt_image_tile_async
Tero Marttila <terom@fixme.fi>
parents:
18
diff
changeset
|
305 |
return err; |
ebcc49de97d0
implement pt_ctx threadpool and pt_image_tile_async
Tero Marttila <terom@fixme.fi>
parents:
18
diff
changeset
|
306 |
|
ebcc49de97d0
implement pt_ctx threadpool and pt_image_tile_async
Tero Marttila <terom@fixme.fi>
parents:
18
diff
changeset
|
307 |
// init |
ebcc49de97d0
implement pt_ctx threadpool and pt_image_tile_async
Tero Marttila <terom@fixme.fi>
parents:
18
diff
changeset
|
308 |
if ((err = pt_tile_init_file(tile, image->cache, info, out))) |
ebcc49de97d0
implement pt_ctx threadpool and pt_image_tile_async
Tero Marttila <terom@fixme.fi>
parents:
18
diff
changeset
|
309 |
JUMP_ERROR(err); |
ebcc49de97d0
implement pt_ctx threadpool and pt_image_tile_async
Tero Marttila <terom@fixme.fi>
parents:
18
diff
changeset
|
310 |
|
ebcc49de97d0
implement pt_ctx threadpool and pt_image_tile_async
Tero Marttila <terom@fixme.fi>
parents:
18
diff
changeset
|
311 |
// enqueue work |
ebcc49de97d0
implement pt_ctx threadpool and pt_image_tile_async
Tero Marttila <terom@fixme.fi>
parents:
18
diff
changeset
|
312 |
if ((err = pt_ctx_work(image->ctx, _pt_image_tile_async, tile))) |
ebcc49de97d0
implement pt_ctx threadpool and pt_image_tile_async
Tero Marttila <terom@fixme.fi>
parents:
18
diff
changeset
|
313 |
JUMP_ERROR(err); |
ebcc49de97d0
implement pt_ctx threadpool and pt_image_tile_async
Tero Marttila <terom@fixme.fi>
parents:
18
diff
changeset
|
314 |
|
ebcc49de97d0
implement pt_ctx threadpool and pt_image_tile_async
Tero Marttila <terom@fixme.fi>
parents:
18
diff
changeset
|
315 |
// ok, running |
ebcc49de97d0
implement pt_ctx threadpool and pt_image_tile_async
Tero Marttila <terom@fixme.fi>
parents:
18
diff
changeset
|
316 |
return 0; |
ebcc49de97d0
implement pt_ctx threadpool and pt_image_tile_async
Tero Marttila <terom@fixme.fi>
parents:
18
diff
changeset
|
317 |
|
ebcc49de97d0
implement pt_ctx threadpool and pt_image_tile_async
Tero Marttila <terom@fixme.fi>
parents:
18
diff
changeset
|
318 |
error: |
ebcc49de97d0
implement pt_ctx threadpool and pt_image_tile_async
Tero Marttila <terom@fixme.fi>
parents:
18
diff
changeset
|
319 |
pt_tile_destroy(tile); |
ebcc49de97d0
implement pt_ctx threadpool and pt_image_tile_async
Tero Marttila <terom@fixme.fi>
parents:
18
diff
changeset
|
320 |
|
ebcc49de97d0
implement pt_ctx threadpool and pt_image_tile_async
Tero Marttila <terom@fixme.fi>
parents:
18
diff
changeset
|
321 |
return err; |
ebcc49de97d0
implement pt_ctx threadpool and pt_image_tile_async
Tero Marttila <terom@fixme.fi>
parents:
18
diff
changeset
|
322 |
} |
ebcc49de97d0
implement pt_ctx threadpool and pt_image_tile_async
Tero Marttila <terom@fixme.fi>
parents:
18
diff
changeset
|
323 |
|
1
f3cde3db1fef
basic image/cache code compiles
Tero Marttila <terom@fixme.fi>
parents:
0
diff
changeset
|
324 |
void pt_image_destroy (struct pt_image *image) |
f3cde3db1fef
basic image/cache code compiles
Tero Marttila <terom@fixme.fi>
parents:
0
diff
changeset
|
325 |
{ |
f3cde3db1fef
basic image/cache code compiles
Tero Marttila <terom@fixme.fi>
parents:
0
diff
changeset
|
326 |
free(image->path); |
f3cde3db1fef
basic image/cache code compiles
Tero Marttila <terom@fixme.fi>
parents:
0
diff
changeset
|
327 |
|
f3cde3db1fef
basic image/cache code compiles
Tero Marttila <terom@fixme.fi>
parents:
0
diff
changeset
|
328 |
if (image->cache) |
f3cde3db1fef
basic image/cache code compiles
Tero Marttila <terom@fixme.fi>
parents:
0
diff
changeset
|
329 |
pt_cache_destroy(image->cache); |
f3cde3db1fef
basic image/cache code compiles
Tero Marttila <terom@fixme.fi>
parents:
0
diff
changeset
|
330 |
|
f3cde3db1fef
basic image/cache code compiles
Tero Marttila <terom@fixme.fi>
parents:
0
diff
changeset
|
331 |
free(image); |
f3cde3db1fef
basic image/cache code compiles
Tero Marttila <terom@fixme.fi>
parents:
0
diff
changeset
|
332 |
} |
19
ebcc49de97d0
implement pt_ctx threadpool and pt_image_tile_async
Tero Marttila <terom@fixme.fi>
parents:
18
diff
changeset
|
333 |