f59b0f88f0
update for new g_value_get_schar() function
2012-10-23 14:36:42 +01:00
c6478c811b
update use of GPrivate
2012-10-23 13:57:38 +01:00
7e3494f6eb
new new g_thread*() API
2012-10-23 13:36:39 +01:00
013dd225f6
update g_cond_*() usage
2012-10-23 12:55:38 +01:00
8a4d4a6778
Merge remote-tracking branch 'origin/7.30'
2012-10-23 11:45:24 +01:00
2f1149716f
increase dzsave max tile size
2012-10-23 10:57:34 +01:00
fad78f8555
rework gthread usage
...
glib-2.32 deprecated g_mutex_new() ... use a compat function to hide
this change
also remove the --without-threads configure flag, gthread is now
compulsory, so there was no longer any point
2012-10-22 22:08:53 +01:00
ff6c4f63d3
Merge pull request #34 from bgilbert/phoney
...
Fix .PHONY Make targets
2012-10-21 13:44:37 -07:00
fda377f5c7
Fix .PHONY Make targets
...
GNU Make only respects the en-us spelling.
2012-10-21 14:24:59 -04:00
abf7274754
Merge branch 'master' of github.com:jcupitt/libvips
2012-10-19 09:38:21 +01:00
51d2f8149f
oops left over bit
2012-10-19 08:41:36 +01:00
f76ad26a38
Merge remote-tracking branch 'origin/7.30'
2012-10-18 11:19:00 +01:00
56f5955a24
vipsCC required the wrong version of vips
...
vipsCC.pc.in was asking for vips-7.30.pc, but of course we now call it
vips.pc
thanks Alessandro
2012-10-18 11:16:42 +01:00
d629e0cba7
merge parallel-read work
2012-10-17 00:19:24 +01:00
039ea63bba
oops
2012-10-16 23:47:45 +01:00
78fb2dd75b
Merge remote-tracking branch 'origin/master' into parallel-read
...
Conflicts:
libvips/foreign/openslide2vips.c
2012-10-16 23:46:01 +01:00
bf945dcdc5
fix assert in openslide read
...
one of the asserts was broken
2012-10-15 13:36:08 +01:00
a3ad07ac90
test files
2012-10-15 09:49:53 +01:00
2f6aceb32a
revert to sharing an openslide handle
...
openslide master now has locking around tiff access
2012-10-12 14:20:02 +01:00
92366883cd
Merge remote-tracking branch 'origin/master' into parallel-read
...
Conflicts:
ChangeLog
2012-10-11 12:48:08 +01:00
ab1d4ac6b8
look for tile-width and tile-height properties
...
get tile geo from openslide
2012-10-11 12:47:17 +01:00
2f65b07abb
add a @background option to embed and dzsave
...
you can now set the background colour for edge tiles in dzsave and embed, eg.:
vips dzsave k2.jpg x --background "1 2 3"
2012-10-10 13:22:30 +01:00
d0b1740fd1
various small bugfixes
...
now works
2012-10-09 14:37:46 +01:00
3e1b30dbf9
TODO update
2012-10-09 11:11:05 +01:00
199c182103
ove the thread thing to tilecache
2012-10-08 22:33:38 +01:00
8a8ce4fd44
add a threaded tile cache
...
seems to work!
2012-10-08 15:27:52 +01:00
4e0a433c24
openslide2vips uses multiple parallel osr reads
...
open a separate openside_t for every read thread to try to get some
parallelism in decode
works, but no faster overall, since we don't ensure that each osr tile
is only fetched once --- threads need to synchronise and not overlap
we need:
- some way to get tile geometry from osr
- a threaded tilecache aligned to the osr tile boundaries
the tilecache needs to have locks and semaphores on every tile,
something like:
class tilecache:
def generate(region):
# lock all tiles we need, make a list of the ones that need
# calculating
work = []
for tile in region:
tile.lock()
if tile.nodata():
work.append(tile)
tile.set(:in-progress)
# calculate all empty tiles we need
for tile in work:
tile.calculate()
tile.set(:data)
# some tiles may be being made by another thread,
# wait for them to be done
for tile in region:
if tile.in-progress:
tile.wait()
# should all have data now, paste to output and unlock
for tile in region:
tile.paste(output)
tile.unlock()
return output
2012-10-05 09:12:54 +01:00
0348f8a4da
fix compiler warning
2012-10-04 11:26:02 +01:00
6e6a2a455a
Merge remote-tracking branch 'origin/7.30'
...
Conflicts:
ChangeLog
libvips/foreign/dzsave.c
2012-10-03 14:45:53 +01:00
dee1aac7b1
dzsave can write zoomify and google maps
...
use "layout" to pick the directory layout, deepzoom / zoomify / google
all allowed
2012-10-03 14:26:59 +01:00
aec36aa5a7
Merge remote-tracking branch 'origin/7.30'
2012-10-03 09:40:03 +01:00
4050c47281
fix .dzi format string
...
dzsave left the save options attached to the Format string in the .dzi
file
also, version bump
2012-10-02 13:11:43 +01:00
0e5e34e1ea
sdzsave fix
...
if dzsave was running a scanline at a time and height was odd, the final
set of tiles were not being written -- thanks Martin
2012-10-01 14:08:59 +01:00
c1dcc3e509
fix a compile fail if no libtiff
...
compilation failed if libtiff-dev was not found, thanks Martin
2012-09-28 13:30:28 +01:00
f569abb00a
Merge pull request #29 from bgilbert/readme-add-leica
...
README: add Leica to OpenSlide-supported formats
2012-09-22 02:21:39 -07:00
54834e9433
README: add Leica to OpenSlide-supported formats
2012-09-21 17:05:01 -04:00
684df1d36a
Merge pull request #28 from bgilbert/openslide-3.3
...
Fixes and improvements for OpenSlide 3.3
2012-09-20 02:55:05 -07:00
c98d65434b
bump minimum OpenSlide version to 3.3.0
...
- Avoid deprecated API
- Drop unneeded g_log handler
2012-09-20 03:11:49 -04:00
6e74234ba7
add Leica filename suffix
...
newly-supported in OpenSlide 3.3.0.
2012-09-20 02:59:00 -04:00
5e08757301
fix openslide_open error reporting for OpenSlide 3.3.0
2012-09-20 02:57:24 -04:00
bb53c952c4
Merge remote-tracking branch 'origin/7.30'
2012-09-17 14:22:46 +01:00
26f2105e5b
make everything LGPL2.1+
...
some files were incorrectly tagged as GPL, thanks Dmitry
2012-09-17 11:52:32 +01:00
81b962c447
todo updates
2012-09-13 13:27:55 +01:00
ca011455f9
Merge remote-tracking branch 'origin/7.30'
2012-09-13 13:26:40 +01:00
b3a8ff3378
linecache was oversized
...
the linecache resizer forgot to take the strip height into account when
growing, causing mem use to be higher than necessary
2012-09-13 13:25:23 +01:00
8deb09eea9
Merge remote-tracking branch 'origin/7.30'
2012-09-05 21:20:58 +01:00
7a0441d455
delay rather than stall ahead threads
...
avoid deadlocks by only slowing down threads which run ahead of the read
point
2012-09-05 14:56:13 +01:00
0c87863222
argh still deadlocks on example.rb
2012-09-04 14:56:22 +01:00
e4044a2c96
Merge remote-tracking branch 'origin/7.30'
2012-08-31 15:41:23 +01:00
4ef825014d
extract is sequential again
...
a hack in seq.c will skip ahead if the very first read is not at line 0
2012-08-24 17:03:09 +01:00
John Cupitt
Benjamin Gilbert
John Cupitt
Benjamin Gilbert