sergiotarxz
/
libvips
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

im_benchmark.c had some debugging left in 

oops, im_benchmark.c had some work commenetd out, hence the fast run
times
This commit is contained in:
John Cupitt 2011-08-10 10:17:36 +01:00
parent e5effaba94
commit b748961743
4 changed files with 48 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,3 +1,6 @@
10/8/11 started 7.26.2
- oops, im_benchmark.c had some stuff turned off
26/7/11 started 7.26.1 26/7/11 started 7.26.1
- doc fixups - doc fixups
- oops, ==0 missing from a strcmp() in vips7compat - oops, ==0 missing from a strcmp() in vips7compat

4
configure.in
View File

@ -6,7 +6,7 @@ AC_CONFIG_MACRO_DIR(m4)
# user-visible library versioning # user-visible library versioning
m4_define([vips_major_version], [7]) m4_define([vips_major_version], [7])
m4_define([vips_minor_version], [26]) m4_define([vips_minor_version], [26])
m4_define([vips_micro_version], [1]) m4_define([vips_micro_version], [2])
m4_define([vips_version], m4_define([vips_version],
[vips_major_version.vips_minor_version.vips_micro_version]) [vips_major_version.vips_minor_version.vips_micro_version])
@ -29,7 +29,7 @@ PACKAGE=vips
# interface changes not backwards compatible?: reset age to 0 # interface changes not backwards compatible?: reset age to 0
LIBRARY_CURRENT=30 LIBRARY_CURRENT=30
LIBRARY_REVISION=0 LIBRARY_REVISION=1
LIBRARY_AGE=15 LIBRARY_AGE=15
AM_INIT_AUTOMAKE($PACKAGE,$VERSION) AM_INIT_AUTOMAKE($PACKAGE,$VERSION)

10
libvips/other/im_benchmark.c
View File

@ -200,12 +200,11 @@ benchmark( IMAGE *in, IMAGE *out )
100, 100, t[0]->Xsize - 200, t[0]->Ysize - 200 ) || 100, 100, t[0]->Xsize - 200, t[0]->Ysize - 200 ) ||
/* Shrink by 10%, bilinear interp. /* Shrink by 10%, bilinear interp.
*/
im_affinei_all( t[1], t[2], im_affinei_all( t[1], t[2],
vips_interpolate_bilinear_static(), vips_interpolate_bilinear_static(),
0.9, 0, 0, 0.9, 0.9, 0, 0, 0.9,
0, 0 ) || 0, 0 ) ||
*/
im_copy( t[1], t[2] ) ||
/* Find L ~= 100 areas (white surround). /* Find L ~= 100 areas (white surround).
*/ */
@ -263,18 +262,17 @@ im_benchmarkn( IMAGE *in, IMAGE *out, int n )
if( n == 0 ) if( n == 0 )
/* To sRGB. /* To sRGB.
return( im_LabQ2disp( in, out, im_col_displays( 7 ) ) );
*/ */
return( im_copy( in, out ) ); return( im_LabQ2disp( in, out, im_col_displays( 7 ) ) );
else else
return( im_open_local_array( out, t, 2, "benchmarkn", "p" ) || return( im_open_local_array( out, t, 2, "benchmarkn", "p" ) ||
benchmark( in, t[0] ) || benchmark( in, t[0] ) ||
/* Expand back to the original size again ... /* Expand back to the original size again ...
* benchmark does a 200 pixel crop plus a 10% shrink, * benchmark does a 200 pixel crop plus a 10% shrink,
* so if we chain many of them together the image gets * so if we chain many of them together the image gets
* too small. * too small.
*/
im_affinei_all( t[0], t[1], im_affinei_all( t[0], t[1],
vips_interpolate_bilinear_static(), vips_interpolate_bilinear_static(),
(double) in->Xsize / t[0]->Xsize, 0, 0, (double) in->Xsize / t[0]->Xsize, 0, 0,
@ -282,8 +280,6 @@ im_benchmarkn( IMAGE *in, IMAGE *out, int n )
0, 0 ) || 0, 0 ) ||
im_benchmarkn( t[1], out, n - 1 ) ); im_benchmarkn( t[1], out, n - 1 ) );
*/
im_benchmarkn( t[0], out, n - 1 ) );
} }
/** /**

92
po/vips7.pot
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-07-26 18:34+0100\n" "POT-Creation-Date: 2011-08-09 18:09+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -495,7 +495,7 @@ msgstr ""
#: libvips/conversion/im_grid.c:168 libvips/conversion/im_replicate.c:151 #: libvips/conversion/im_grid.c:168 libvips/conversion/im_replicate.c:151
#: libvips/convolution/im_contrast_surface.c:144 #: libvips/convolution/im_contrast_surface.c:144
#: libvips/format/im_tile_cache.c:408 libvips/iofuncs/image.c:989 #: libvips/format/im_tile_cache.c:408 libvips/iofuncs/image.c:889
#: libvips/iofuncs/sinkscreen.c:1086 libvips/morphology/im_rank.c:346 #: libvips/iofuncs/sinkscreen.c:1086 libvips/morphology/im_rank.c:346
msgid "bad parameters" msgid "bad parameters"
msgstr "" msgstr ""
@ -505,7 +505,7 @@ msgid "bad grid geometry"
msgstr "" msgstr ""
#: libvips/conversion/im_embed.c:332 libvips/conversion/im_embed.c:460 #: libvips/conversion/im_embed.c:332 libvips/conversion/im_embed.c:460
#: libvips/iofuncs/image.c:1916 #: libvips/iofuncs/image.c:1816
msgid "bad dimensions" msgid "bad dimensions"
msgstr "" msgstr ""
@ -733,7 +733,7 @@ msgstr ""
msgid "bad resolution values" msgid "bad resolution values"
msgstr "" msgstr ""
#: libvips/format/im_vips2tiff.c:1375 libvips/format/im_vips2jpeg.c:737 #: libvips/format/im_vips2tiff.c:1375 libvips/format/im_vips2jpeg.c:738
#, c-format #, c-format
msgid "unknown extra options \"%s\"" msgid "unknown extra options \"%s\""
msgstr "" msgstr ""
@ -1105,19 +1105,19 @@ msgstr ""
msgid "Radiance" msgid "Radiance"
msgstr "" msgstr ""
#: libvips/format/im_vips2jpeg.c:350 #: libvips/format/im_vips2jpeg.c:351
msgid "error setting JPEG resolution" msgid "error setting JPEG resolution"
msgstr "" msgstr ""
#: libvips/format/im_vips2jpeg.c:393 #: libvips/format/im_vips2jpeg.c:394
msgid "error saving EXIF" msgid "error saving EXIF"
msgstr "" msgstr ""
#: libvips/format/im_vips2jpeg.c:584 #: libvips/format/im_vips2jpeg.c:585
msgid "qfac should be in 0-100" msgid "qfac should be in 0-100"
msgstr "" msgstr ""
#: libvips/format/im_vips2jpeg.c:1104 #: libvips/format/im_vips2jpeg.c:1105
msgid "error writing output" msgid "error writing output"
msgstr "" msgstr ""
@ -1382,7 +1382,7 @@ msgstr ""
msgid "generate() called twice" msgid "generate() called twice"
msgstr "" msgstr ""
#: libvips/iofuncs/generate.c:691 libvips/iofuncs/image.c:2005 #: libvips/iofuncs/generate.c:691 libvips/iofuncs/image.c:1905
#, c-format #, c-format
msgid "unable to output to a %s image" msgid "unable to output to a %s image"
msgstr "" msgstr ""
@ -1462,122 +1462,122 @@ msgstr ""
msgid "Show VIPS options" msgid "Show VIPS options"
msgstr "" msgstr ""
#: libvips/iofuncs/image.c:349 #: libvips/iofuncs/image.c:249
msgid "unable to close fd" msgid "unable to close fd"
msgstr "" msgstr ""
#: libvips/iofuncs/image.c:468 #: libvips/iofuncs/image.c:368
#, c-format #, c-format
msgid "%dx%d %s, %d band, %s" msgid "%dx%d %s, %d band, %s"
msgid_plural "%dx%d %s, %d bands, %s" msgid_plural "%dx%d %s, %d bands, %s"
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""
#: libvips/iofuncs/image.c:841 #: libvips/iofuncs/image.c:741
#, c-format #, c-format
msgid "%s %s: %d threads, %d x %d tiles, groups of %d scanlines" msgid "%s %s: %d threads, %d x %d tiles, groups of %d scanlines"
msgstr "" msgstr ""
#: libvips/iofuncs/image.c:854 #: libvips/iofuncs/image.c:754
#, c-format #, c-format
msgid "%s %s: %d%% complete" msgid "%s %s: %d%% complete"
msgstr "" msgstr ""
#. Spaces at end help to erase the %complete message we overwrite. #. Spaces at end help to erase the %complete message we overwrite.
#. #.
#: libvips/iofuncs/image.c:871 #: libvips/iofuncs/image.c:771
#, c-format #, c-format
msgid "%s %s: done in %ds \n" msgid "%s %s: done in %ds \n"
msgstr "" msgstr ""
#: libvips/iofuncs/image.c:1017 #: libvips/iofuncs/image.c:917
#, c-format #, c-format
msgid "unable to open \"%s\", file too short" msgid "unable to open \"%s\", file too short"
msgstr "" msgstr ""
#: libvips/iofuncs/image.c:1027 #: libvips/iofuncs/image.c:927
#, c-format #, c-format
msgid "%s is longer than expected" msgid "%s is longer than expected"
msgstr "" msgstr ""
#: libvips/iofuncs/image.c:1044 #: libvips/iofuncs/image.c:944
#, c-format #, c-format
msgid "bad mode \"%s\"" msgid "bad mode \"%s\""
msgstr "" msgstr ""
#: libvips/iofuncs/image.c:1100 #: libvips/iofuncs/image.c:1000
msgid "VIPS image class" msgid "VIPS image class"
msgstr "" msgstr ""
#: libvips/iofuncs/image.c:1115 #: libvips/iofuncs/image.c:1015
msgid "Image width in pixels" msgid "Image width in pixels"
msgstr "" msgstr ""
#: libvips/iofuncs/image.c:1123 #: libvips/iofuncs/image.c:1023
msgid "Image height in pixels" msgid "Image height in pixels"
msgstr "" msgstr ""
#: libvips/iofuncs/image.c:1131 #: libvips/iofuncs/image.c:1031
msgid "Number of bands in image" msgid "Number of bands in image"
msgstr "" msgstr ""
#: libvips/iofuncs/image.c:1140 #: libvips/iofuncs/image.c:1040
msgid "Pixel format in image" msgid "Pixel format in image"
msgstr "" msgstr ""
#: libvips/iofuncs/image.c:1149 #: libvips/iofuncs/image.c:1049
msgid "Image filename" msgid "Image filename"
msgstr "" msgstr ""
#: libvips/iofuncs/image.c:1158 #: libvips/iofuncs/image.c:1058
msgid "Open mode" msgid "Open mode"
msgstr "" msgstr ""
#: libvips/iofuncs/image.c:1167 #: libvips/iofuncs/image.c:1067
msgid "Block evaluation on this image" msgid "Block evaluation on this image"
msgstr "" msgstr ""
#: libvips/iofuncs/image.c:1176 #: libvips/iofuncs/image.c:1076
msgid "Preferred demand style for this image" msgid "Preferred demand style for this image"
msgstr "" msgstr ""
#: libvips/iofuncs/image.c:1185 #: libvips/iofuncs/image.c:1085
msgid "Offset in bytes from start of file" msgid "Offset in bytes from start of file"
msgstr "" msgstr ""
#: libvips/iofuncs/image.c:1455 #: libvips/iofuncs/image.c:1355
#, c-format #, c-format
msgid "killed for image \"%s\"" msgid "killed for image \"%s\""
msgstr "" msgstr ""
#: libvips/iofuncs/image.c:1954 #: libvips/iofuncs/image.c:1854
msgid "bad image descriptor" msgid "bad image descriptor"
msgstr "" msgstr ""
#: libvips/iofuncs/image.c:2049 #: libvips/iofuncs/image.c:1949
#, c-format #, c-format
msgid "auto-rewind for %s failed" msgid "auto-rewind for %s failed"
msgstr "" msgstr ""
#: libvips/iofuncs/image.c:2092 libvips/iofuncs/image.c:2303 #: libvips/iofuncs/image.c:1992 libvips/iofuncs/image.c:2203
#: libvips/iofuncs/image.c:2320 #: libvips/iofuncs/image.c:2220
msgid "no image data" msgid "no image data"
msgstr "" msgstr ""
#: libvips/iofuncs/image.c:2161 libvips/iofuncs/image.c:2343 #: libvips/iofuncs/image.c:2061 libvips/iofuncs/image.c:2243
msgid "image not readable" msgid "image not readable"
msgstr "" msgstr ""
#: libvips/iofuncs/image.c:2193 libvips/iofuncs/image.c:2207 #: libvips/iofuncs/image.c:2093 libvips/iofuncs/image.c:2107
#: libvips/iofuncs/image.c:2373 libvips/iofuncs/image.c:2382 #: libvips/iofuncs/image.c:2273 libvips/iofuncs/image.c:2282
msgid "image already written" msgid "image already written"
msgstr "" msgstr ""
#: libvips/iofuncs/image.c:2221 libvips/iofuncs/image.c:2394 #: libvips/iofuncs/image.c:2121 libvips/iofuncs/image.c:2294
msgid "image not writeable" msgid "image not writeable"
msgstr "" msgstr ""
#: libvips/iofuncs/image.c:2267 #: libvips/iofuncs/image.c:2167
msgid "bad file type" msgid "bad file type"
msgstr "" msgstr ""
@ -1753,28 +1753,16 @@ msgstr ""
msgid "unable to truncate" msgid "unable to truncate"
msgstr "" msgstr ""
#: libvips/iofuncs/util.c:1287 #: libvips/iofuncs/util.c:1289
msgid "unexpected end of string" msgid "unexpected end of string"
msgstr "" msgstr ""
#: libvips/iofuncs/util.c:1300 #: libvips/iofuncs/util.c:1307
msgid "opening brace"
msgstr ""
#: libvips/iofuncs/util.c:1301
msgid "closing brace"
msgstr ""
#: libvips/iofuncs/util.c:1302
msgid "string"
msgstr ""
#: libvips/iofuncs/util.c:1322
#, c-format #, c-format
msgid "expected %s, saw %s" msgid "expected %s, saw %s"
msgstr "" msgstr ""
#: libvips/iofuncs/util.c:1424 #: libvips/iofuncs/util.c:1409
#, c-format #, c-format
msgid "unable to make temporary file %s" msgid "unable to make temporary file %s"
msgstr "" msgstr ""