| 1 |
Description: Autogenerated patch header for a single-debian-patch file. |
| 2 |
The delta against upstream is either kept as a single patch, or maintained |
| 3 |
in some VCS, and exported as a single patch instead of more manageable |
| 4 |
atomic patches. |
| 5 |
Forwarded: not-needed |
| 6 |
|
| 7 |
--- |
| 8 |
--- minidjvu-0.8.svn.2010.05.06+dfsg.orig/INSTALL |
| 9 |
+++ minidjvu-0.8.svn.2010.05.06+dfsg/INSTALL |
| 10 |
@@ -1,8 +1,14 @@ |
| 11 |
-USUAL INSTALLATION |
| 12 |
+USUAL AUTOTOOLS-BASED INSTALLATION |
| 13 |
__________________ |
| 14 |
|
| 15 |
Check that development package of libtiff is installed. |
| 16 |
-Run "make". Then, "make install" will copy bin/minidjvu into /usr/local/bin. |
| 17 |
+Run: |
| 18 |
+ autoreconf --install |
| 19 |
+ ./configure |
| 20 |
+ make |
| 21 |
+ make install |
| 22 |
+Will install minidjvu executable into /usr/local/bin/, as well as |
| 23 |
+various support files, documentation, development files, etc. |
| 24 |
|
| 25 |
|
| 26 |
|
| 27 |
@@ -27,7 +33,7 @@ The release directory should be treated |
| 28 |
The library is built from sources in `minidjvu' subdirectory. |
| 29 |
The program is built from sources in `src' subdirectory. |
| 30 |
|
| 31 |
-To enable TIFF support, define HAVE_TIFF to 1, add libtiff include directory |
| 32 |
+To enable TIFF support, define HAVE_LIBTIFF to 1, add libtiff include directory |
| 33 |
to the include path, then link against libtiff. |
| 34 |
|
| 35 |
|
| 36 |
@@ -37,11 +43,11 @@ _________ |
| 37 |
|
| 38 |
Under Linux, you can always try something like |
| 39 |
|
| 40 |
- g++ -I. `find -name "*.c*"` -O2 -o bin/minidjvu |
| 41 |
+ g++ -Iinclude `find -name "*.c*"` -O2 -o minidjvu |
| 42 |
|
| 43 |
or, if you want TIFF support, |
| 44 |
|
| 45 |
- g++ -DHAVE_TIFF=1 -I. `find -name "*.c*"` -O2 -ltiff -o bin/minidjvu |
| 46 |
+ g++ -DHAVE_LIBTIFF=1 -Iinclude `find -name "*.c*"` -O2 -ltiff -o minidjvu |
| 47 |
|
| 48 |
Under MSVC, watch for those __declspec directives in |
| 49 |
`minidjvu/base/0porting/0porting.h' - if you wish a DLL, turn them on. |
| 50 |
--- /dev/null |
| 51 |
+++ minidjvu-0.8.svn.2010.05.06+dfsg/Makefile.am |
| 52 |
@@ -0,0 +1,63 @@ |
| 53 |
+ACLOCAL_AMFLAGS = -I m4 |
| 54 |
+ |
| 55 |
+SUBDIRS = include doc po |
| 56 |
+ |
| 57 |
+AM_CPPFLAGS = -Iinclude |
| 58 |
+AM_CPPFLAGS += -D__STRICT_ANSI__ |
| 59 |
+AM_CPPFLAGS += -DNDEBUG |
| 60 |
+ |
| 61 |
+WARNFLAGS = -Wall |
| 62 |
+WARNFLAGS += -Wshadow |
| 63 |
+WARNFLAGS += -pedantic-errors -Wpointer-arith -Waggregate-return |
| 64 |
+WARNFLAGS += -Wlong-long -Wredundant-decls -Wcast-qual -Wcast-align |
| 65 |
+WARNFLAGS += -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations |
| 66 |
+ |
| 67 |
+AM_CFLAGS = $(WARNFLAGS) |
| 68 |
+AM_CXXFLAGS = $(WARNFLAGS) |
| 69 |
+ |
| 70 |
+localedir = $(datadir)/locale |
| 71 |
+DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@ |
| 72 |
+ |
| 73 |
+lib_LTLIBRARIES = libminidjvu.la |
| 74 |
+ |
| 75 |
+libminidjvu_la_SOURCES = src/matcher/no_mdjvu.h src/matcher/bitmaps.h \ |
| 76 |
+ src/matcher/common.h src/djvu/bs.h src/jb2/jb2coder.h \ |
| 77 |
+ src/jb2/bmpcoder.h src/jb2/zp.h src/jb2/jb2const.h \ |
| 78 |
+ src/base/mdjvucfg.h src/matcher/cuts.c src/matcher/patterns.c \ |
| 79 |
+ src/matcher/frames.c src/matcher/bitmaps.c src/alg/nosubst.c \ |
| 80 |
+ src/alg/erosion.c src/alg/smooth.c src/alg/delegate.c \ |
| 81 |
+ src/alg/classify.c src/alg/render.c src/alg/clean.c \ |
| 82 |
+ src/alg/adjust_y.c src/alg/blitsort.c src/alg/split.c \ |
| 83 |
+ src/alg/average.c src/alg/compress.c src/djvu/djvuload.c \ |
| 84 |
+ src/djvu/djvusave.c src/djvu/djvuinfo.c src/djvu/iff.c \ |
| 85 |
+ src/image-io/tiffload.c src/image-io/tiff.c src/image-io/pbm.c \ |
| 86 |
+ src/image-io/tiffsave.c src/image-io/bmp.c src/jb2/proto.c \ |
| 87 |
+ src/base/3graymap.c src/base/2io.c src/base/5image.c \ |
| 88 |
+ src/base/4bitmap.c src/base/version.c src/base/6string.c \ |
| 89 |
+ src/base/1error.c src/base/0porting.c src/djvu/djvudir.cpp \ |
| 90 |
+ src/djvu/bs.cpp src/jb2/jb2coder.cpp src/jb2/bmpcoder.cpp \ |
| 91 |
+ src/jb2/jb2load.cpp src/jb2/zp.cpp src/jb2/jb2save.cpp |
| 92 |
+ |
| 93 |
+bin_PROGRAMS = minidjvu |
| 94 |
+ |
| 95 |
+minidjvu_SOURCES = tools/minidjvu.c |
| 96 |
+ |
| 97 |
+minidjvu_LDADD = libminidjvu.la |
| 98 |
+ |
| 99 |
+minidjvu.pc: |
| 100 |
+ echo 'prefix=$(prefix)' > $@ |
| 101 |
+ echo 'exec_prefix=$(exec_prefix)' >> $@ |
| 102 |
+ echo 'includedir=$(includedir)' >> $@ |
| 103 |
+ echo 'libdir=$(libdir)' >> $@ |
| 104 |
+ echo >> $@ |
| 105 |
+ echo 'Name: $(PACKAGE_TARNAME)' >> $@ |
| 106 |
+ echo 'Description: $(PACKAGE_NAME)' >> $@ |
| 107 |
+ echo 'URL: $(PACKAGE_URL)' >> $@ |
| 108 |
+ echo 'Version: $(PACKAGE_VERSION)' >> $@ |
| 109 |
+ echo 'Cflags: -I$(includedir)' >> $@ |
| 110 |
+ echo 'Libs: -L$(libdir) -lminidjvu' >> $@ |
| 111 |
+ echo 'Libs.private: $(LDFLAGS) $(LIBS)' >> $@ |
| 112 |
+ |
| 113 |
+pkgconfig_DATA = minidjvu.pc |
| 114 |
+ |
| 115 |
+MOSTLYCLEANFILES = $(pkgconfig_DATA) |
| 116 |
--- minidjvu-0.8.svn.2010.05.06+dfsg.orig/configure.ac |
| 117 |
+++ minidjvu-0.8.svn.2010.05.06+dfsg/configure.ac |
| 118 |
@@ -1,215 +1,62 @@ |
| 119 |
-AC_PREREQ(2.64) |
| 120 |
-AC_INIT([minidjvu],[0.8],[[email protected]]) |
| 121 |
+AC_PREREQ([2.69]) |
| 122 |
+AC_INIT([minidjvu],[0.8],[[email protected]],[],[http://minidjvu.sourceforge.net/]) |
| 123 |
AC_CONFIG_AUX_DIR(config) |
| 124 |
-AC_CONFIG_HEADER(config.h:config/config.h.in) |
| 125 |
+AC_CONFIG_HEADERS([config.h:config/config.h.in]) |
| 126 |
AC_CONFIG_MACRO_DIR([m4]) |
| 127 |
AC_PREFIX_DEFAULT(/usr/local) |
| 128 |
|
| 129 |
-LIBRARY_VERSION=`echo $PACKAGE_VERSION | sed -e 's/\./:/'` |
| 130 |
+AM_INIT_AUTOMAKE([subdir-objects foreign -Wall]) |
| 131 |
|
| 132 |
-AC_CANONICAL_HOST |
| 133 |
+AC_LANG([C++]) |
| 134 |
|
| 135 |
-target="$PACKAGE_NAME" |
| 136 |
-mdjvulib="lib$PACKAGE_NAME" |
| 137 |
- |
| 138 |
-prefer_static='no' |
| 139 |
-prefer_gettext='yes' |
| 140 |
-AC_MSG_CHECKING([if we are building for Windows]) |
| 141 |
-case "$host" in |
| 142 |
- *-mingw32) |
| 143 |
- prefer_static='yes' |
| 144 |
- prefer_gettext='no' |
| 145 |
- target="$target.exe" |
| 146 |
- AC_MSG_RESULT(yes) |
| 147 |
- ;; |
| 148 |
- *) |
| 149 |
- AC_MSG_RESULT(no) |
| 150 |
- ;; |
| 151 |
-esac |
| 152 |
- |
| 153 |
-AC_ARG_ENABLE( |
| 154 |
- [static], |
| 155 |
- [ --enable-static Enable static building], |
| 156 |
- [static=$enableval], |
| 157 |
- [static=$prefer_static]) |
| 158 |
- |
| 159 |
-AC_ARG_ENABLE( |
| 160 |
- [gettext], |
| 161 |
- [ --enable-gettext Enable localization via gettext], |
| 162 |
- [gettext=$enableva], |
| 163 |
- [gettext=$prefer_gettext]) |
| 164 |
- |
| 165 |
-AC_ARG_WITH( |
| 166 |
- [tiff], |
| 167 |
- [ --with-tiff Enable static tiff support], |
| 168 |
- [tiff=$enableval], |
| 169 |
- [tiff=yes]) |
| 170 |
- |
| 171 |
-if test "$static" = "yes"; then |
| 172 |
- if test "x$LDFLAGS" = "x"; then |
| 173 |
- LDFLAGS="-static" |
| 174 |
- fi |
| 175 |
- mdjvulib="$mdjvulib.a" |
| 176 |
- oext='o' |
| 177 |
- SHARED_YES='#' |
| 178 |
-else |
| 179 |
- mdjvulib="$mdjvulib.la" |
| 180 |
- oext='lo' |
| 181 |
- STATIC_YES='#' |
| 182 |
-fi |
| 183 |
- |
| 184 |
-case "$host" in |
| 185 |
- *-mingw32) |
| 186 |
- if test "$static" != "yes"; then |
| 187 |
- DLLFLAGS="$DLLFLAGS -Wl,--export-all-symbols" |
| 188 |
- fi |
| 189 |
- ;; |
| 190 |
- *-darwin* | *-macos10*) |
| 191 |
- if test -d /opt/local ; then |
| 192 |
- INCS="-I/opt/local/include" |
| 193 |
- LIBS="-L/opt/local/lib $LIBS" |
| 194 |
- elif test -d /sw ; then |
| 195 |
- INCS="-I/sw/include $CPPFLAGS" |
| 196 |
- LIBS="-L/sw/lib $LIBS" |
| 197 |
- fi |
| 198 |
- ;; |
| 199 |
-esac |
| 200 |
+AM_GNU_GETTEXT([external]) |
| 201 |
+AM_GNU_GETTEXT_VERSION([0.18.1]) |
| 202 |
|
| 203 |
# Checks for programs. |
| 204 |
- |
| 205 |
-if test "x$CFLAGS" = "x"; then |
| 206 |
- CFLAGS="-g -pipe -O3" |
| 207 |
-fi |
| 208 |
-AC_PROG_MAKE_SET |
| 209 |
AC_PROG_CXX |
| 210 |
+AC_PROG_AWK |
| 211 |
AC_PROG_CC |
| 212 |
-LT_INIT |
| 213 |
+AC_PROG_CPP |
| 214 |
AC_PROG_INSTALL |
| 215 |
+AC_PROG_LN_S |
| 216 |
+AC_PROG_MAKE_SET |
| 217 |
AC_PATH_PROG(GZIP, gzip) |
| 218 |
AC_PATH_PROG(RM, rm) |
| 219 |
-RM="$RM -f" |
| 220 |
+AM_PROG_AR |
| 221 |
+ |
| 222 |
+LT_INIT |
| 223 |
+ |
| 224 |
+PKG_INSTALLDIR |
| 225 |
|
| 226 |
# Checks for libraries. |
| 227 |
|
| 228 |
-zlib_ok='no' |
| 229 |
-dnl Test for libz |
| 230 |
-AC_CHECK_LIB(z, inflate, |
| 231 |
- [z_libs="-lz"; zlib_ok='yes']) |
| 232 |
- |
| 233 |
-jpeg_ok='no' |
| 234 |
-AC_CHECK_LIB(jpeg, jpeg_destroy_decompress, |
| 235 |
- [jpeg_libs="-ljpeg"; jpeg_ok='yes']) |
| 236 |
+AC_CHECK_LIB(z, inflate) |
| 237 |
+AC_CHECK_LIB(jpeg, jpeg_destroy_decompress) |
| 238 |
+AC_CHECK_LIB(tiff, TIFFOpen) |
| 239 |
|
| 240 |
# Checks for header files. |
| 241 |
- |
| 242 |
-if test "$tiff" != 'no'; then |
| 243 |
- have_tiff_header='no' |
| 244 |
- have_libtiff='no' |
| 245 |
- |
| 246 |
- if test "$static" != 'yes' || test "$zlib_ok" = 'yes' -a "$jpeg_ok" = 'yes'; then |
| 247 |
- AC_CHECK_HEADER(tiff.h, have_tiff_header='yes') |
| 248 |
- AC_CHECK_HEADER(tiffio.h,have_tiff_header='yes',have_tiff_header='no') |
| 249 |
- if test "$have_tiff_header" = 'yes'; then |
| 250 |
- saveLIBS="$LIBS" |
| 251 |
- if test "$static" = 'yes'; then |
| 252 |
- LIBS="$z_libs $jpeg_libs $LIBS" |
| 253 |
- fi |
| 254 |
- |
| 255 |
- have_libtiff='no' |
| 256 |
- AC_CHECK_LIB(tiff,TIFFOpen,have_libtiff='yes',have_libtiff='no') |
| 257 |
- if test "$have_libtiff" != 'no'; then |
| 258 |
- LIBS="-ltiff $LIBS" |
| 259 |
- AC_DEFINE(HAVE_TIFF,1,Define if you have TIFF library) |
| 260 |
- else |
| 261 |
- LIBS=$saveLIBS |
| 262 |
- fi |
| 263 |
- fi |
| 264 |
- fi |
| 265 |
- |
| 266 |
- if test "$have_libtiff" != 'yes'; then |
| 267 |
- AC_MSG_WARN(*** Native TIFF support will not be included ***) |
| 268 |
- fi |
| 269 |
-fi |
| 270 |
- |
| 271 |
-PO_YES='#' |
| 272 |
-if test "$gettext" != 'no'; then |
| 273 |
- have_intl_header='no' |
| 274 |
- gettext_ok='no' |
| 275 |
- needs_lintl='no' |
| 276 |
- |
| 277 |
- AC_CHECK_HEADER(libintl.h, have_intl_header='yes') |
| 278 |
- if test "$have_intl_header" = 'yes'; then |
| 279 |
- AC_CHECK_FUNC(gettext,gettext_ok='yes') |
| 280 |
- |
| 281 |
- if test "$gettext_ok" = 'no'; then |
| 282 |
- AC_CHECK_LIB(intl,gettext,[gettext_ok='yes'; needs_lintl='yes']) |
| 283 |
- fi |
| 284 |
- fi |
| 285 |
- |
| 286 |
- iconv_ok='no' |
| 287 |
- needs_liconv='no' |
| 288 |
- AC_CHECK_FUNC(iconv, [iconv_ok='yes']) |
| 289 |
- if test "$iconv_ok" = "no"; then |
| 290 |
- AC_CHECK_LIB([iconv], [iconv], [iconv_ok='yes'; needs_liconv='yes']) |
| 291 |
- fi |
| 292 |
- |
| 293 |
- AC_CHECK_PROG(MSGFMT, msgfmt, msgfmt) |
| 294 |
- if test "$MSGFMT" != ""; then |
| 295 |
- if msgfmt --help 2>&1 | grep illegal >/dev/null ; then |
| 296 |
- echo "msgfmt isn't GNU version" |
| 297 |
- MSGFMT="" |
| 298 |
- fi |
| 299 |
- fi |
| 300 |
- |
| 301 |
- if test "$MSGFMT" != "" -a "$gettext_ok" != "no" -a "$iconv_ok" != "no" ; then |
| 302 |
- echo "msgfmt, iconv() and gettext() exist; will build i18n support" |
| 303 |
- AC_DEFINE(HAVE_GETTEXT,,Define if we are building i18n support) |
| 304 |
- PO_YES='' |
| 305 |
- if test "$needs_lintl" != "no"; then |
| 306 |
- intl_libs="-lintl" |
| 307 |
- LIBS="$intl_libs $LIBS" |
| 308 |
- fi |
| 309 |
- if test "$needs_liconv" != "no"; then |
| 310 |
- iconv_libs="-liconv" |
| 311 |
- LIBS="$iconv_libs $LIBS" |
| 312 |
- fi |
| 313 |
- else |
| 314 |
- echo "msgfmt and libintl don't both exist; will not build i18n support" |
| 315 |
- fi |
| 316 |
-fi |
| 317 |
- |
| 318 |
-AC_CHECK_HEADERS([locale.h stdlib.h string.h]) |
| 319 |
- |
| 320 |
-AC_SUBST(target) |
| 321 |
-AC_SUBST(mdjvulib) |
| 322 |
-AC_SUBST(oext) |
| 323 |
-AC_SUBST(OPTS) |
| 324 |
-AC_SUBST(INCS) |
| 325 |
-AC_SUBST(MSGFMT) |
| 326 |
-AC_SUBST(LIBRARY_VERSION) |
| 327 |
-AC_SUBST(DLLFLAGS) |
| 328 |
-AC_SUBST(PO_YES) |
| 329 |
-AC_SUBST(STATIC_YES) |
| 330 |
-AC_SUBST(SHARED_YES) |
| 331 |
+AC_CHECK_HEADERS([libintl.h locale.h stdint.h stdlib.h string.h]) |
| 332 |
|
| 333 |
# Checks for typedefs, structures, and compiler characteristics. |
| 334 |
+AC_SYS_LARGEFILE |
| 335 |
AC_HEADER_STDBOOL |
| 336 |
AC_C_INLINE |
| 337 |
AC_TYPE_SIZE_T |
| 338 |
- |
| 339 |
-CFLAGS="$CFLAGS -Wall -Wshadow" |
| 340 |
-CFLAGS="$CFLAGS -pedantic-errors -Wpointer-arith -Waggregate-return" |
| 341 |
-CFLAGS="$CFLAGS -Wlong-long -Wredundant-decls -Wcast-qual -Wcast-align" |
| 342 |
-DEFS="$DEFS -D__STRICT_ANSI__ -DNDEBUG" |
| 343 |
-OPTS="-Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations" |
| 344 |
+AC_TYPE_INT16_T |
| 345 |
+AC_TYPE_INT32_T |
| 346 |
+AC_TYPE_SIZE_T |
| 347 |
+AC_TYPE_UINT16_T |
| 348 |
+AC_TYPE_UINT32_T |
| 349 |
|
| 350 |
# Checks for library functions. |
| 351 |
AC_FUNC_MALLOC |
| 352 |
AC_FUNC_REALLOC |
| 353 |
AC_CHECK_FUNCS([memset pow setlocale strcspn strrchr]) |
| 354 |
|
| 355 |
-AC_CONFIG_FILES([Makefile]) |
| 356 |
-AC_CONFIG_FILES([src/Makefile]) |
| 357 |
-AC_CONFIG_FILES([tools/Makefile]) |
| 358 |
-AC_CONFIG_FILES([po/Makefile]) |
| 359 |
+# Trailer |
| 360 |
+AC_CONFIG_FILES([Makefile |
| 361 |
+ doc/Makefile |
| 362 |
+ doc/ru/Makefile |
| 363 |
+ include/Makefile |
| 364 |
+ po/Makefile.in]) |
| 365 |
AC_OUTPUT |
| 366 |
--- /dev/null |
| 367 |
+++ minidjvu-0.8.svn.2010.05.06+dfsg/doc/Makefile.am |
| 368 |
@@ -0,0 +1,5 @@ |
| 369 |
+SUBDIRS = ru |
| 370 |
+ |
| 371 |
+dist_man_MANS = minidjvu.1 |
| 372 |
+ |
| 373 |
+doc_DATA = decode.html encode.html tifftodjvu_help.html |
| 374 |
--- minidjvu-0.8.svn.2010.05.06+dfsg.orig/doc/minidjvu.1 |
| 375 |
+++ minidjvu-0.8.svn.2010.05.06+dfsg/doc/minidjvu.1 |
| 376 |
@@ -231,7 +231,7 @@ period). The default is "iff". |
| 377 |
.B "-w" |
| 378 |
.TP |
| 379 |
.B "--warnings" |
| 380 |
-Do not disable libtiff warnings. By default, TIFF warnings are supressed. |
| 381 |
+Do not disable libtiff warnings. By default, TIFF warnings are suppressed. |
| 382 |
Under Windows default TIFF warning handler creates a message box. |
| 383 |
This is unacceptable in a batch processing script, for instance. |
| 384 |
So the minidjvu default behavior is a workaround for libtiff default behavior. |
| 385 |
--- /dev/null |
| 386 |
+++ minidjvu-0.8.svn.2010.05.06+dfsg/doc/ru/Makefile.am |
| 387 |
@@ -0,0 +1,2 @@ |
| 388 |
+mandir = @mandir@/ru |
| 389 |
+dist_man_MANS = minidjvu.1 |
| 390 |
--- /dev/null |
| 391 |
+++ minidjvu-0.8.svn.2010.05.06+dfsg/include/Makefile.am |
| 392 |
@@ -0,0 +1,13 @@ |
| 393 |
+nobase_include_HEADERS = minidjvu/jb2.h minidjvu/alg/classify.h \ |
| 394 |
+ minidjvu/alg/compress.h minidjvu/alg/split.h minidjvu/alg/render.h \ |
| 395 |
+ minidjvu/alg/smooth.h minidjvu/alg/alg.h minidjvu/alg/adjust_y.h \ |
| 396 |
+ minidjvu/alg/clean.h minidjvu/alg/nosubst.h minidjvu/alg/erosion.h \ |
| 397 |
+ minidjvu/alg/blitsort.h minidjvu/alg/delegate.h \ |
| 398 |
+ minidjvu/alg/average.h minidjvu/djvu/iff.h minidjvu/djvu/djvu.h \ |
| 399 |
+ minidjvu/image-io/tiff.h minidjvu/image-io/pbm.h \ |
| 400 |
+ minidjvu/image-io/image-io.h minidjvu/image-io/bmp.h \ |
| 401 |
+ minidjvu/minidjvu.h minidjvu/base/4bitmap.h minidjvu/base/1error.h \ |
| 402 |
+ minidjvu/base/3graymap.h minidjvu/base/0porting.h \ |
| 403 |
+ minidjvu/base/version.h minidjvu/base/6string.h \ |
| 404 |
+ minidjvu/base/5image.h minidjvu/base/base.h minidjvu/base/2io.h \ |
| 405 |
+ minidjvu/matcher.h |
| 406 |
--- minidjvu-0.8.svn.2010.05.06+dfsg.orig/include/minidjvu/alg/smooth.h |
| 407 |
+++ minidjvu-0.8.svn.2010.05.06+dfsg/include/minidjvu/alg/smooth.h |
| 408 |
@@ -4,7 +4,7 @@ |
| 409 |
|
| 410 |
|
| 411 |
/* |
| 412 |
- * `smooth' is applied to a bitmap even before it's splitted. |
| 413 |
+ * `smooth' is applied to a bitmap even before it is split. |
| 414 |
* |
| 415 |
* Right now, the algorithm flips pixels which are surrounded |
| 416 |
* by at least 3 of 4 neighboring pixels of another color. |
| 417 |
--- /dev/null |
| 418 |
+++ minidjvu-0.8.svn.2010.05.06+dfsg/m4/doorjam |
| 419 |
@@ -0,0 +1 @@ |
| 420 |
+hold the m4 door open |
| 421 |
--- /dev/null |
| 422 |
+++ minidjvu-0.8.svn.2010.05.06+dfsg/po/LINGUAS |
| 423 |
@@ -0,0 +1 @@ |
| 424 |
+ru |
| 425 |
--- /dev/null |
| 426 |
+++ minidjvu-0.8.svn.2010.05.06+dfsg/po/Makevars |
| 427 |
@@ -0,0 +1,41 @@ |
| 428 |
+# Makefile variables for PO directory in any package using GNU gettext. |
| 429 |
+ |
| 430 |
+# Usually the message domain is the same as the package name. |
| 431 |
+DOMAIN = $(PACKAGE) |
| 432 |
+ |
| 433 |
+# These two variables depend on the location of this directory. |
| 434 |
+subdir = po |
| 435 |
+top_builddir = .. |
| 436 |
+ |
| 437 |
+# These options get passed to xgettext. |
| 438 |
+XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ |
| 439 |
+ |
| 440 |
+# This is the copyright holder that gets inserted into the header of the |
| 441 |
+# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding |
| 442 |
+# package. (Note that the msgstr strings, extracted from the package's |
| 443 |
+# sources, belong to the copyright holder of the package.) Translators are |
| 444 |
+# expected to transfer the copyright for their translations to this person |
| 445 |
+# or entity, or to disclaim their copyright. The empty string stands for |
| 446 |
+# the public domain; in this case the translators are expected to disclaim |
| 447 |
+# their copyright. |
| 448 |
+COPYRIGHT_HOLDER = Ilya Mezhirov and Alexey Kryukov |
| 449 |
+ |
| 450 |
+# This is the email address or URL to which the translators shall report |
| 451 |
+# bugs in the untranslated strings: |
| 452 |
+# - Strings which are not entire sentences, see the maintainer guidelines |
| 453 |
+# in the GNU gettext documentation, section 'Preparing Strings'. |
| 454 |
+# - Strings which use unclear terms or require additional context to be |
| 455 |
+# understood. |
| 456 |
+# - Strings which make invalid assumptions about notation of date, time or |
| 457 |
+# money. |
| 458 |
+# - Pluralisation problems. |
| 459 |
+# - Incorrect English spelling. |
| 460 |
+# - Incorrect formatting. |
| 461 |
+# It can be your email address, or a mailing list address where translators |
| 462 |
+# can write to without being subscribed, or the URL of a web page through |
| 463 |
+# which the translators can contact you. |
| 464 |
+MSGID_BUGS_ADDRESS = [email protected] |
| 465 |
+ |
| 466 |
+# This is the list of locale categories, beyond LC_MESSAGES, for which the |
| 467 |
+# message catalogs shall be used. It is usually empty. |
| 468 |
+EXTRA_LOCALE_CATEGORIES = |
| 469 |
--- /dev/null |
| 470 |
+++ minidjvu-0.8.svn.2010.05.06+dfsg/po/POTFILES.in |
| 471 |
@@ -0,0 +1,5 @@ |
| 472 |
+# List of source files which contain translatable strings. |
| 473 |
+src/alg/compress.c |
| 474 |
+src/base/1error.c |
| 475 |
+src/base/mdjvucfg.h |
| 476 |
+tools/minidjvu.c |
| 477 |
--- minidjvu-0.8.svn.2010.05.06+dfsg.orig/po/ru.po |
| 478 |
+++ minidjvu-0.8.svn.2010.05.06+dfsg/po/ru.po |
| 479 |
@@ -6,215 +6,402 @@ |
| 480 |
msgid "" |
| 481 |
msgstr "" |
| 482 |
"Project-Id-Version: Minidjvu 0.8\n" |
| 483 |
-"Report-Msgid-Bugs-To: Alexey Kryukov <[email protected]>\n" |
| 484 |
-"POT-Creation-Date: 2009-06-27 14:05+0400\n" |
| 485 |
+"Report-Msgid-Bugs-To: [email protected]\n" |
| 486 |
+"POT-Creation-Date: 2012-11-14 07:53+0000\n" |
| 487 |
"PO-Revision-Date: 2009-06-27 14:05+0400\n" |
| 488 |
"Last-Translator: Alexey Kryukov <[email protected]>\n" |
| 489 |
"Language-Team: Russian <[email protected]>\n" |
| 490 |
+"Language: ru\n" |
| 491 |
"MIME-Version: 1.0\n" |
| 492 |
"Content-Type: text/plain; charset=UTF-8\n" |
| 493 |
"Content-Transfer-Encoding: 8bit\n" |
| 494 |
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" |
| 495 |
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" |
| 496 |
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" |
| 497 |
"X-Poedit-Language: Russian\n" |
| 498 |
"X-Poedit-Country: RUSSIAN FEDERATION\n" |
| 499 |
|
| 500 |
-#: minidjvu.c:92 |
| 501 |
+#: src/alg/compress.c:154 |
| 502 |
+msgid "deciding what pieces are letters" |
| 503 |
+msgstr "выясняем, какие из участков являются буквами" |
| 504 |
+ |
| 505 |
+#: src/alg/compress.c:157 |
| 506 |
+msgid "sorting blits" |
| 507 |
+msgstr "сортировка блитов" |
| 508 |
+ |
| 509 |
+#: src/alg/compress.c:159 |
| 510 |
+msgid "sorting bitmaps" |
| 511 |
+msgstr "сортировка картинок" |
| 512 |
+ |
| 513 |
+#: src/alg/compress.c:164 |
| 514 |
+msgid "matching patterns" |
| 515 |
+msgstr "сопоставление с образцами" |
| 516 |
+ |
| 517 |
+#: src/alg/compress.c:167 |
| 518 |
+msgid "adjusting substitution coordinates" |
| 519 |
+msgstr "уточняются координаты подстановки" |
| 520 |
+ |
| 521 |
+#: src/alg/compress.c:170 |
| 522 |
+msgid "removing unused bitmaps" |
| 523 |
+msgstr "удаление неиспользуемых картинок" |
| 524 |
+ |
| 525 |
+#: src/alg/compress.c:175 |
| 526 |
#, c-format |
| 527 |
-msgid "Cannot generate a unique name for %s\n" |
| 528 |
-msgstr "Не удалось создать уникальное имя для %s\n" |
| 529 |
+msgid "the image now has %d bitmaps\n" |
| 530 |
+msgstr "теперь изображение содержит %d картинок\n" |
| 531 |
+ |
| 532 |
+#: src/alg/compress.c:181 |
| 533 |
+msgid "sorting bitmaps (again)" |
| 534 |
+msgstr "повторная сортировка картинок" |
| 535 |
+ |
| 536 |
+#: src/alg/compress.c:192 |
| 537 |
+msgid "finding prototypes" |
| 538 |
+msgstr "поиск прототипов" |
| 539 |
+ |
| 540 |
+#: src/alg/compress.c:196 |
| 541 |
+#, c-format |
| 542 |
+msgid "%d bitmaps have prototypes\n" |
| 543 |
+msgstr "%d картинок имеют прототипы\n" |
| 544 |
+ |
| 545 |
+#: src/alg/compress.c:288 |
| 546 |
+#, c-format |
| 547 |
+msgid "Classification: %d of %d completed\n" |
| 548 |
+msgstr "Классификация: выполнено %d из %d\n" |
| 549 |
+ |
| 550 |
+#: src/alg/compress.c:298 |
| 551 |
+#, c-format |
| 552 |
+msgid "Prototype search: %d of %d completed\n" |
| 553 |
+msgstr "Поиск прототипов: выполнено %d из %d\n" |
| 554 |
+ |
| 555 |
+#: src/alg/compress.c:319 |
| 556 |
+#, c-format |
| 557 |
+msgid "deciding what pieces are letters in page #%d\n" |
| 558 |
+msgstr "выясняем, какие из участков на странице #%d являются буквами\n" |
| 559 |
+ |
| 560 |
+#: src/alg/compress.c:322 |
| 561 |
+#, c-format |
| 562 |
+msgid "sorting letters in page #%d\n" |
| 563 |
+msgstr "сортировка букв на странице #%d\n" |
| 564 |
+ |
| 565 |
+#: src/alg/compress.c:331 |
| 566 |
+#, c-format |
| 567 |
+msgid "started classification\n" |
| 568 |
+msgstr "начинается классификация\n" |
| 569 |
+ |
| 570 |
+#: src/alg/compress.c:336 |
| 571 |
+#, c-format |
| 572 |
+msgid "finished classification\n" |
| 573 |
+msgstr "классификация окончена\n" |
| 574 |
+ |
| 575 |
+#: src/alg/compress.c:369 |
| 576 |
+#, c-format |
| 577 |
+msgid "started prototype search\n" |
| 578 |
+msgstr "начинается поиск прототипов\n" |
| 579 |
+ |
| 580 |
+#: src/alg/compress.c:372 |
| 581 |
+#, c-format |
| 582 |
+msgid "finished prototype search\n" |
| 583 |
+msgstr "поиск прототипов окончен\n" |
| 584 |
+ |
| 585 |
+#: src/base/1error.c:18 |
| 586 |
+msgid "unable to write to file" |
| 587 |
+msgstr "запись в файл невозможна" |
| 588 |
+ |
| 589 |
+#: src/base/1error.c:20 |
| 590 |
+msgid "unable to read from file" |
| 591 |
+msgstr "чтение из файла невозможно" |
| 592 |
+ |
| 593 |
+#: src/base/1error.c:22 |
| 594 |
+msgid "I/O error" |
| 595 |
+msgstr "ошибка ввода/вывода" |
| 596 |
|
| 597 |
-#: minidjvu.c:115 |
| 598 |
+#: src/base/1error.c:24 |
| 599 |
+msgid "bad PBM file" |
| 600 |
+msgstr "неподходящий файл PBM" |
| 601 |
+ |
| 602 |
+#: src/base/1error.c:26 |
| 603 |
+msgid "bad Windows BMP file (perhaps it has non-bitonal data)" |
| 604 |
+msgstr "неподходящий файл BMP (вероятно, изображение не является монохромным)" |
| 605 |
+ |
| 606 |
+#: src/base/1error.c:28 |
| 607 |
+msgid "bad DjVu file" |
| 608 |
+msgstr "неподходящий файл DjVu" |
| 609 |
+ |
| 610 |
+#: src/base/1error.c:30 |
| 611 |
+msgid "bad bilevel data in DjVu file" |
| 612 |
+msgstr "неподходящий формат монохромного изображения в файле DjVu" |
| 613 |
+ |
| 614 |
+#: src/base/1error.c:32 |
| 615 |
+msgid "bad TIFF file (perhaps it has non-bitonal data)" |
| 616 |
+msgstr "неподходящий файл TIFF (вероятно, изображение не является монохромным)" |
| 617 |
+ |
| 618 |
+#: src/base/1error.c:34 |
| 619 |
+msgid "unsupported type of DjVu file" |
| 620 |
+msgstr "эта разновидность файлов DjVu не поддерживается" |
| 621 |
+ |
| 622 |
+#: src/base/1error.c:36 |
| 623 |
+msgid "bilevel data not found in DjVu file" |
| 624 |
+msgstr "монохромное изображение не найдено в файле DjVu" |
| 625 |
+ |
| 626 |
+#: src/base/1error.c:38 |
| 627 |
+msgid "somehow prototype references recursed" |
| 628 |
+msgstr "ссылки на прототип находятся в циклической зависимости" |
| 629 |
+ |
| 630 |
+#: src/base/1error.c:40 |
| 631 |
+msgid "minidjvu was compiled without TIFF support" |
| 632 |
+msgstr "minidjvu собран без поддержки TIFF" |
| 633 |
+ |
| 634 |
+#: src/base/1error.c:42 |
| 635 |
+msgid "minidjvu was compiled without PNG support" |
| 636 |
+msgstr "minidjvu собран без поддержки PNG" |
| 637 |
+ |
| 638 |
+#: src/base/1error.c:45 |
| 639 |
+msgid "some weird error happened, probably caused by a bug in minidjvu" |
| 640 |
+msgstr "" |
| 641 |
+"Произошла непонятная ошибка. Скорее всего, она вызвана ошибкой в коде " |
| 642 |
+"minidjvu." |
| 643 |
+ |
| 644 |
+#: tools/minidjvu.c:93 |
| 645 |
#, c-format |
| 646 |
+msgid "Cannot generate a unique name for %s\n" |
| 647 |
+msgstr "Не удалось создать уникальное имя для %s\n" |
| 648 |
|
| 649 |
+#: tools/minidjvu.c:116 |
| 650 |
msgid "encode/decode bitonal DjVu files" |
| 651 |
msgstr "кодирование и расшифровка монохромных DJVU-файлов" |
| 652 |
|
| 653 |
-#: minidjvu.c:119 |
| 654 |
+#: tools/minidjvu.c:119 |
| 655 |
+#, c-format |
| 656 |
+msgid "minidjvu - %s\n" |
| 657 |
+msgstr "" |
| 658 |
+ |
| 659 |
+#: tools/minidjvu.c:120 |
| 660 |
#, c-format |
| 661 |
msgid "Warning: program and library version mismatch:\n" |
| 662 |
msgstr "Предупреждение: версии программы и библиотеки не совпадают:\n" |
| 663 |
|
| 664 |
-#: minidjvu.c:120 |
| 665 |
-#, c-format |
| 666 |
-msgid " program version %s, library version %s.\n" |
| 667 |
+#: tools/minidjvu.c:121 |
| 668 |
+#, fuzzy, c-format |
| 669 |
+msgid "" |
| 670 |
+" program version %s, library version %s.\n" |
| 671 |
+"\n" |
| 672 |
msgstr " версия программы %s, версия библиотеки %s.\n" |
| 673 |
|
| 674 |
-#: minidjvu.c:128 |
| 675 |
+#: tools/minidjvu.c:129 |
| 676 |
#, c-format |
| 677 |
msgid "Usage:\n" |
| 678 |
msgstr "Использование:\n" |
| 679 |
|
| 680 |
-#: minidjvu.c:129 |
| 681 |
+#: tools/minidjvu.c:130 |
| 682 |
#, c-format |
| 683 |
msgid "single page encoding/decoding:\n" |
| 684 |
msgstr "кодирование или расшифровка одиночной страницы:\n" |
| 685 |
|
| 686 |
-#: minidjvu.c:131 |
| 687 |
+#: tools/minidjvu.c:131 |
| 688 |
+#, c-format |
| 689 |
+msgid " minidjvu [options] <input file> <output file>\n" |
| 690 |
+msgstr "" |
| 691 |
+ |
| 692 |
+#: tools/minidjvu.c:132 |
| 693 |
#, c-format |
| 694 |
msgid "multiple pages encoding:\n" |
| 695 |
msgstr "многостраничное кодирование:\n" |
| 696 |
|
| 697 |
-#: minidjvu.c:133 |
| 698 |
+#: tools/minidjvu.c:133 |
| 699 |
+#, c-format |
| 700 |
+msgid " minidjvu [options] <input file> ... <output file>\n" |
| 701 |
+msgstr "" |
| 702 |
+ |
| 703 |
+#: tools/minidjvu.c:134 |
| 704 |
#, c-format |
| 705 |
msgid "Formats supported:\n" |
| 706 |
msgstr "Поддерживаемые форматы:\n" |
| 707 |
|
| 708 |
-#: minidjvu.c:135 |
| 709 |
+#: tools/minidjvu.c:136 |
| 710 |
#, c-format |
| 711 |
-msgid " DjVu (single-page bitonal), PBM, Windows BMP" |
| 712 |
+msgid " DjVu (single-page bitonal), PBM, Windows BMP" |
| 713 |
msgstr " DjVu (одностраничный монохромный), PBM, Windows BMP" |
| 714 |
|
| 715 |
-#: minidjvu.c:137 |
| 716 |
+#: tools/minidjvu.c:138 |
| 717 |
#, c-format |
| 718 |
msgid ", TIFF.\n" |
| 719 |
msgstr ", TIFF.\n" |
| 720 |
|
| 721 |
-#: minidjvu.c:139 |
| 722 |
+#: tools/minidjvu.c:140 |
| 723 |
#, c-format |
| 724 |
msgid "; TIFF support is OFF.\n" |
| 725 |
msgstr "; поддержка TIFF отключена.\n" |
| 726 |
|
| 727 |
-#: minidjvu.c:141 |
| 728 |
+#: tools/minidjvu.c:142 |
| 729 |
#, c-format |
| 730 |
msgid "Options:\n" |
| 731 |
msgstr "Параметры:\n" |
| 732 |
|
| 733 |
-#: minidjvu.c:142 |
| 734 |
+#: tools/minidjvu.c:143 |
| 735 |
#, c-format |
| 736 |
-msgid " -A, --Averaging: compute \"average\" representatives\n" |
| 737 |
-msgstr " -A, --Averaging: вычислять усредненные варианты представления символов\n" |
| 738 |
+msgid "" |
| 739 |
+" -A, --Averaging: compute \"average\" representatives\n" |
| 740 |
+msgstr "" |
| 741 |
+" -A, --Averaging: вычислять усредненные варианты " |
| 742 |
+"представления символов\n" |
| 743 |
|
| 744 |
-#: minidjvu.c:143 |
| 745 |
+#: tools/minidjvu.c:144 |
| 746 |
#, c-format |
| 747 |
-msgid " -a <n>, --aggression <n>: set aggression level (default 100)\n" |
| 748 |
-msgstr " -a <n>, --aggression <n>: установить уровень агрессии (по умолчанию 100)\n" |
| 749 |
+msgid " -a <n>, --aggression <n>: set aggression level (default 100)\n" |
| 750 |
+msgstr "" |
| 751 |
+" -a <n>, --aggression <n>: установить уровень агрессии (по умолчанию " |
| 752 |
+"100)\n" |
| 753 |
|
| 754 |
-#: minidjvu.c:144 |
| 755 |
+#: tools/minidjvu.c:145 |
| 756 |
#, c-format |
| 757 |
-msgid " -c, --clean remove small black pieces\n" |
| 758 |
+msgid " -c, --clean remove small black pieces\n" |
| 759 |
msgstr " -c, --clean удалять небольшие черные пятна\n" |
| 760 |
|
| 761 |
-#: minidjvu.c:145 |
| 762 |
+#: tools/minidjvu.c:146 |
| 763 |
#, c-format |
| 764 |
-msgid " -d <n> --dpi <n>: set resolution in dots per inch\n" |
| 765 |
-msgstr " -d <n> --dpi <n>: установить разрешение в точках на дюйм\n" |
| 766 |
+msgid " -d <n> --dpi <n>: set resolution in dots per inch\n" |
| 767 |
+msgstr "" |
| 768 |
+" -d <n> --dpi <n>: установить разрешение в точках на дюйм\n" |
| 769 |
|
| 770 |
-#: minidjvu.c:146 |
| 771 |
+#: tools/minidjvu.c:147 |
| 772 |
#, c-format |
| 773 |
-msgid " -e, --erosion sacrifice quality to gain in size\n" |
| 774 |
-msgstr " -e, --erosion пожертвовать качеством ради выигрыша в объеме\n" |
| 775 |
+msgid " -e, --erosion sacrifice quality to gain in size\n" |
| 776 |
+msgstr "" |
| 777 |
+" -e, --erosion пожертвовать качеством ради выигрыша в " |
| 778 |
+"объеме\n" |
| 779 |
|
| 780 |
-#: minidjvu.c:147 |
| 781 |
+#: tools/minidjvu.c:148 |
| 782 |
#, c-format |
| 783 |
-msgid " -i, --indirect: generate an indirect multipage document\n" |
| 784 |
-msgstr " -i, --indirect: сохранять каждую страницу документа как отдельный файл\n" |
| 785 |
+msgid "" |
| 786 |
+" -i, --indirect: generate an indirect multipage document\n" |
| 787 |
+msgstr "" |
| 788 |
+" -i, --indirect: сохранять каждую страницу документа как " |
| 789 |
+"отдельный файл\n" |
| 790 |
|
| 791 |
-#: minidjvu.c:148 |
| 792 |
+#: tools/minidjvu.c:149 |
| 793 |
#, c-format |
| 794 |
-msgid " -l, --lossy: use all lossy options (-s -c -m -e -A)\n" |
| 795 |
-msgstr " -l, --lossy: включить все параметры сжатия с потерями (-s -c -m -e -A)\n" |
| 796 |
+msgid "" |
| 797 |
+" -l, --lossy: use all lossy options (-s -c -m -e -A)\n" |
| 798 |
+msgstr "" |
| 799 |
+" -l, --lossy: включить все параметры сжатия с потерями " |
| 800 |
+"(-s -c -m -e -A)\n" |
| 801 |
|
| 802 |
-#: minidjvu.c:149 |
| 803 |
+#: tools/minidjvu.c:150 |
| 804 |
#, c-format |
| 805 |
-msgid " -m, --match: match and substitute patterns\n" |
| 806 |
-msgstr " -m, --match: использовать сравнение и подстановку образцов\n" |
| 807 |
+msgid " -m, --match: match and substitute patterns\n" |
| 808 |
+msgstr "" |
| 809 |
+" -m, --match: использовать сравнение и подстановку " |
| 810 |
+"образцов\n" |
| 811 |
|
| 812 |
-#: minidjvu.c:150 |
| 813 |
+#: tools/minidjvu.c:151 |
| 814 |
#, c-format |
| 815 |
-msgid " -n, --no-prototypes: do not search for prototypes\n" |
| 816 |
+msgid " -n, --no-prototypes: do not search for prototypes\n" |
| 817 |
msgstr " -n, --no-prototypes: отказаться от поиска прототипов\n" |
| 818 |
|
| 819 |
-#: minidjvu.c:151 |
| 820 |
+#: tools/minidjvu.c:152 |
| 821 |
#, c-format |
| 822 |
-msgid " -p <n>, --pages-per-dict <n>: pages per dictionary (default 10)\n" |
| 823 |
-msgstr " -p <n>, --pages-per-dict <n>: количество страниц в словаре (по умолчанию 10)\n" |
| 824 |
+msgid " -p <n>, --pages-per-dict <n>: pages per dictionary (default 10)\n" |
| 825 |
+msgstr "" |
| 826 |
+" -p <n>, --pages-per-dict <n>: количество страниц в словаре (по " |
| 827 |
+"умолчанию 10)\n" |
| 828 |
|
| 829 |
-#: minidjvu.c:152 |
| 830 |
+#: tools/minidjvu.c:153 |
| 831 |
#, c-format |
| 832 |
-msgid " -r, --report: report multipage coding progress\n" |
| 833 |
-msgstr " -r, --report: информировать о ходе многостраничного кодирования\n" |
| 834 |
+msgid " -r, --report: report multipage coding progress\n" |
| 835 |
+msgstr "" |
| 836 |
+" -r, --report: информировать о ходе многостраничного " |
| 837 |
+"кодирования\n" |
| 838 |
|
| 839 |
-#: minidjvu.c:153 |
| 840 |
+#: tools/minidjvu.c:154 |
| 841 |
#, c-format |
| 842 |
-msgid " -s, --smooth: remove some badly looking pixels\n" |
| 843 |
-msgstr " -s, --smooth: удалять отдельные неудачные пиксели\n" |
| 844 |
+msgid " -s, --smooth: remove some badly looking pixels\n" |
| 845 |
+msgstr "" |
| 846 |
+" -s, --smooth: удалять отдельные неудачные пиксели\n" |
| 847 |
|
| 848 |
-#: minidjvu.c:154 |
| 849 |
+#: tools/minidjvu.c:155 |
| 850 |
#, c-format |
| 851 |
-msgid " -v, --verbose: print messages about everything\n" |
| 852 |
+msgid " -v, --verbose: print messages about everything\n" |
| 853 |
msgstr " -v, --verbose: сообщать обо всех операциях\n" |
| 854 |
|
| 855 |
-#: minidjvu.c:155 |
| 856 |
+#: tools/minidjvu.c:156 |
| 857 |
+#, fuzzy, c-format |
| 858 |
+msgid "" |
| 859 |
+" -X, --Xtension: file extension for shared dictionary " |
| 860 |
+"files\n" |
| 861 |
+msgstr "" |
| 862 |
+" -e, --erosion пожертвовать качеством ради выигрыша в " |
| 863 |
+"объеме\n" |
| 864 |
+ |
| 865 |
+#: tools/minidjvu.c:157 |
| 866 |
#, c-format |
| 867 |
-msgid " -w, --warnings: do not suppress TIFF warnings\n" |
| 868 |
+msgid " -w, --warnings: do not suppress TIFF warnings\n" |
| 869 |
msgstr " -w, --warnings: не подавлять предупреждения TIFF\n" |
| 870 |
|
| 871 |
-#: minidjvu.c:156 |
| 872 |
+#: tools/minidjvu.c:158 |
| 873 |
#, c-format |
| 874 |
msgid "See the man page for detailed description of each option.\n" |
| 875 |
msgstr "Подробное описание всех параметров содержится в руководстве man.\n" |
| 876 |
|
| 877 |
-#: minidjvu.c:184 |
| 878 |
+#: tools/minidjvu.c:186 |
| 879 |
#, c-format |
| 880 |
msgid "loading a DjVu page from `%s'\n" |
| 881 |
msgstr "загрузка страницы DjVu из файла `%s'\n" |
| 882 |
|
| 883 |
-#: minidjvu.c:193 |
| 884 |
+#: tools/minidjvu.c:195 |
| 885 |
#, c-format |
| 886 |
msgid "loaded; the page has %d bitmaps and %d blits\n" |
| 887 |
msgstr "загрузка завершена; страница содержит %d картинок и %d блитов\n" |
| 888 |
|
| 889 |
-#: minidjvu.c:228 |
| 890 |
+#: tools/minidjvu.c:230 |
| 891 |
#, c-format |
| 892 |
msgid "encoding to `%s'\n" |
| 893 |
msgstr "кодирование в файл `%s'\n" |
| 894 |
|
| 895 |
-#: minidjvu.c:244 |
| 896 |
+#: tools/minidjvu.c:246 |
| 897 |
#, c-format |
| 898 |
msgid "loading from Windows BMP file `%s'\n" |
| 899 |
msgstr "загрузка изображения из файла Windows BMP `%s'\n" |
| 900 |
|
| 901 |
-#: minidjvu.c:249 |
| 902 |
+#: tools/minidjvu.c:251 |
| 903 |
#, c-format |
| 904 |
msgid "loading from TIFF file `%s'\n" |
| 905 |
msgstr "загрузка изображения из файла TIFF `%s'\n" |
| 906 |
|
| 907 |
-#: minidjvu.c:256 |
| 908 |
+#: tools/minidjvu.c:258 |
| 909 |
#, c-format |
| 910 |
msgid "resolution is %d dpi\n" |
| 911 |
msgstr "разрешение составляет %d dpi\n" |
| 912 |
|
| 913 |
-#: minidjvu.c:265 minidjvu.c:337 |
| 914 |
+#: tools/minidjvu.c:267 tools/minidjvu.c:339 |
| 915 |
#, c-format |
| 916 |
msgid "bitmap %d x %d rendered\n" |
| 917 |
msgstr "загружено битовое изображение %d x %d\n" |
| 918 |
|
| 919 |
-#: minidjvu.c:272 |
| 920 |
+#: tools/minidjvu.c:274 |
| 921 |
#, c-format |
| 922 |
msgid "loading from PBM file `%s'\n" |
| 923 |
msgstr "загрузка изображения из файла PBM `%s'\n" |
| 924 |
|
| 925 |
-#: minidjvu.c:284 minidjvu.c:344 |
| 926 |
+#: tools/minidjvu.c:286 tools/minidjvu.c:346 |
| 927 |
#, c-format |
| 928 |
msgid "smoothing the bitmap\n" |
| 929 |
msgstr "сглаживание битового изображения\n" |
| 930 |
|
| 931 |
-#: minidjvu.c:298 |
| 932 |
+#: tools/minidjvu.c:300 |
| 933 |
#, c-format |
| 934 |
msgid "saving to Windows BMP file `%s'\n" |
| 935 |
msgstr "сохранение в файл Windows BMP `%s'\n" |
| 936 |
|
| 937 |
-#: minidjvu.c:303 |
| 938 |
+#: tools/minidjvu.c:305 |
| 939 |
#, c-format |
| 940 |
msgid "saving to TIFF file `%s'\n" |
| 941 |
msgstr "сохранение в файл TIFF `%s'\n" |
| 942 |
|
| 943 |
-#: minidjvu.c:310 |
| 944 |
+#: tools/minidjvu.c:312 |
| 945 |
#, c-format |
| 946 |
msgid "saving to PBM file `%s'\n" |
| 947 |
msgstr "сохранение в файл PBM `%s'\n" |
| 948 |
|
| 949 |
-#: minidjvu.c:328 |
| 950 |
+#: tools/minidjvu.c:330 |
| 951 |
#, c-format |
| 952 |
msgid "" |
| 953 |
"\n" |
| 954 |
@@ -223,7 +410,7 @@ msgstr "" |
| 955 |
"\n" |
| 956 |
"РАСШИФРОВКА\n" |
| 957 |
|
| 958 |
-#: minidjvu.c:329 minidjvu.c:384 |
| 959 |
+#: tools/minidjvu.c:331 tools/minidjvu.c:386 |
| 960 |
#, c-format |
| 961 |
msgid "" |
| 962 |
"________\n" |
| 963 |
@@ -232,27 +419,27 @@ msgstr "" |
| 964 |
"___________\n" |
| 965 |
"\n" |
| 966 |
|
| 967 |
-#: minidjvu.c:356 |
| 968 |
+#: tools/minidjvu.c:358 |
| 969 |
#, c-format |
| 970 |
msgid "splitting the bitmap into pieces\n" |
| 971 |
msgstr "разбивка битового изображение на участки\n" |
| 972 |
|
| 973 |
-#: minidjvu.c:361 |
| 974 |
+#: tools/minidjvu.c:363 |
| 975 |
#, c-format |
| 976 |
-msgid "the splitted image has %d pieces\n" |
| 977 |
+msgid "the split image has %d pieces\n" |
| 978 |
msgstr "после разбиения картинка состоит из %d участков\n" |
| 979 |
|
| 980 |
-#: minidjvu.c:366 |
| 981 |
+#: tools/minidjvu.c:368 |
| 982 |
#, c-format |
| 983 |
msgid "cleaning\n" |
| 984 |
msgstr "очистка\n" |
| 985 |
|
| 986 |
-#: minidjvu.c:370 |
| 987 |
+#: tools/minidjvu.c:372 |
| 988 |
#, c-format |
| 989 |
msgid "the cleaned image has %d pieces\n" |
| 990 |
msgstr "после очистки картинка состоит из %d участков\n" |
| 991 |
|
| 992 |
-#: minidjvu.c:383 |
| 993 |
+#: tools/minidjvu.c:385 |
| 994 |
#, c-format |
| 995 |
msgid "" |
| 996 |
"\n" |
| 997 |
@@ -261,7 +448,7 @@ msgstr "" |
| 998 |
"\n" |
| 999 |
"КОДИРОВАНИЕ\n" |
| 1000 |
|
| 1001 |
-#: minidjvu.c:399 |
| 1002 |
+#: tools/minidjvu.c:401 |
| 1003 |
#, c-format |
| 1004 |
msgid "" |
| 1005 |
"\n" |
| 1006 |
@@ -270,7 +457,7 @@ msgstr "" |
| 1007 |
"\n" |
| 1008 |
"ФИЛЬТРОВКА\n" |
| 1009 |
|
| 1010 |
-#: minidjvu.c:400 |
| 1011 |
+#: tools/minidjvu.c:402 |
| 1012 |
#, c-format |
| 1013 |
msgid "" |
| 1014 |
"_________\n" |
| 1015 |
@@ -279,17 +466,19 @@ msgstr "" |
| 1016 |
"__________\n" |
| 1017 |
"\n" |
| 1018 |
|
| 1019 |
-#: minidjvu.c:443 |
| 1020 |
+#: tools/minidjvu.c:447 |
| 1021 |
#, c-format |
| 1022 |
msgid "when encoding many pages, output file must be DjVu\n" |
| 1023 |
-msgstr "при многостраничном кодировании результирующий файл должен быть в формате DjVu\n" |
| 1024 |
+msgstr "" |
| 1025 |
+"при многостраничном кодировании результирующий файл должен быть в формате " |
| 1026 |
+"DjVu\n" |
| 1027 |
|
| 1028 |
-#: minidjvu.c:451 |
| 1029 |
+#: tools/minidjvu.c:455 |
| 1030 |
#, c-format |
| 1031 |
msgid "Could not create a temporary file\n" |
| 1032 |
msgstr "Не удалось создать временный файл\n" |
| 1033 |
|
| 1034 |
-#: minidjvu.c:456 |
| 1035 |
+#: tools/minidjvu.c:460 |
| 1036 |
#, c-format |
| 1037 |
msgid "" |
| 1038 |
"\n" |
| 1039 |
@@ -298,7 +487,7 @@ msgstr "" |
| 1040 |
"\n" |
| 1041 |
"МНОГОСТРАНИЧНОЕ КОДИРОВАНИЕ\n" |
| 1042 |
|
| 1043 |
-#: minidjvu.c:457 |
| 1044 |
+#: tools/minidjvu.c:461 |
| 1045 |
#, c-format |
| 1046 |
msgid "" |
| 1047 |
"__________________\n" |
| 1048 |
@@ -307,181 +496,42 @@ msgstr "" |
| 1049 |
"___________________________\n" |
| 1050 |
"\n" |
| 1051 |
|
| 1052 |
-#: minidjvu.c:458 |
| 1053 |
+#: tools/minidjvu.c:462 |
| 1054 |
#, c-format |
| 1055 |
msgid "%d pages total\n" |
| 1056 |
msgstr "всего %d страниц\n" |
| 1057 |
|
| 1058 |
-#: minidjvu.c:489 |
| 1059 |
+#: tools/minidjvu.c:496 |
| 1060 |
#, c-format |
| 1061 |
msgid "Loading: %d of %d completed\n" |
| 1062 |
msgstr "Загрузка: выполнено %d из %d\n" |
| 1063 |
|
| 1064 |
-#: minidjvu.c:517 |
| 1065 |
+#: tools/minidjvu.c:524 |
| 1066 |
#, c-format |
| 1067 |
msgid "saving page #%d into %s using dictionary %s\n" |
| 1068 |
msgstr "сохранение страницы #%d в файл %s с использованием словаря %s\n" |
| 1069 |
|
| 1070 |
-#: minidjvu.c:531 |
| 1071 |
+#: tools/minidjvu.c:538 |
| 1072 |
#, c-format |
| 1073 |
msgid "Saving: %d of %d completed\n" |
| 1074 |
msgstr "Сохранение: выполнено %d из %d\n" |
| 1075 |
|
| 1076 |
-#: minidjvu.c:624 |
| 1077 |
+#: tools/minidjvu.c:631 |
| 1078 |
#, c-format |
| 1079 |
msgid "bad --pages-per-dict value\n" |
| 1080 |
msgstr "неподходящее значение --pages-per-dict\n" |
| 1081 |
|
| 1082 |
-#: minidjvu.c:636 |
| 1083 |
+#: tools/minidjvu.c:643 |
| 1084 |
#, c-format |
| 1085 |
msgid "bad resolution\n" |
| 1086 |
msgstr "неподходящее разрешение\n" |
| 1087 |
|
| 1088 |
-#: minidjvu.c:651 |
| 1089 |
+#: tools/minidjvu.c:664 |
| 1090 |
#, c-format |
| 1091 |
msgid "unknown option: %s\n" |
| 1092 |
msgstr "неизвестный параметр: %s\n" |
| 1093 |
|
| 1094 |
-#: minidjvu.c:699 |
| 1095 |
+#: tools/minidjvu.c:719 |
| 1096 |
#, c-format |
| 1097 |
msgid "alive_bitmap_counter = %d\n" |
| 1098 |
msgstr "счетчик битовых изображений = %d\n" |
| 1099 |
- |
| 1100 |
-#: compress.c:153 |
| 1101 |
-msgid "deciding what pieces are letters" |
| 1102 |
-msgstr "выясняем, какие из участков являются буквами" |
| 1103 |
- |
| 1104 |
-#: compress.c:156 |
| 1105 |
-msgid "sorting blits" |
| 1106 |
-msgstr "сортировка блитов" |
| 1107 |
- |
| 1108 |
-#: compress.c:158 |
| 1109 |
-msgid "sorting bitmaps" |
| 1110 |
-msgstr "сортировка картинок" |
| 1111 |
- |
| 1112 |
-#: compress.c:163 |
| 1113 |
-msgid "matching patterns" |
| 1114 |
-msgstr "сопоставление с образцами" |
| 1115 |
- |
| 1116 |
-#: compress.c:166 |
| 1117 |
-msgid "adjusting substitution coordinates" |
| 1118 |
-msgstr "уточняются координаты подстановки" |
| 1119 |
- |
| 1120 |
-#: compress.c:169 |
| 1121 |
-msgid "removing unused bitmaps" |
| 1122 |
-msgstr "удаление неиспользуемых картинок" |
| 1123 |
- |
| 1124 |
-#: compress.c:174 |
| 1125 |
-#, c-format |
| 1126 |
-msgid "the image now has %d bitmaps\n" |
| 1127 |
-msgstr "теперь изображение содержит %d картинок\n" |
| 1128 |
- |
| 1129 |
-#: compress.c:180 |
| 1130 |
-msgid "sorting bitmaps (again)" |
| 1131 |
-msgstr "повторная сортировка картинок" |
| 1132 |
- |
| 1133 |
-#: compress.c:191 |
| 1134 |
-msgid "finding prototypes" |
| 1135 |
-msgstr "поиск прототипов" |
| 1136 |
- |
| 1137 |
-#: compress.c:195 |
| 1138 |
-#, c-format |
| 1139 |
-msgid "%d bitmaps have prototypes\n" |
| 1140 |
-msgstr "%d картинок имеют прототипы\n" |
| 1141 |
- |
| 1142 |
-#: compress.c:287 |
| 1143 |
-#, c-format |
| 1144 |
-msgid "Classification: %d of %d completed\n" |
| 1145 |
-msgstr "Классификация: выполнено %d из %d\n" |
| 1146 |
- |
| 1147 |
-#: compress.c:297 |
| 1148 |
-#, c-format |
| 1149 |
-msgid "Prototype search: %d of %d completed\n" |
| 1150 |
-msgstr "Поиск прототипов: выполнено %d из %d\n" |
| 1151 |
- |
| 1152 |
-#: compress.c:318 |
| 1153 |
-#, c-format |
| 1154 |
-msgid "deciding what pieces are letters in page #%d\n" |
| 1155 |
-msgstr "выясняем, какие из участков на странице #%d являются буквами\n" |
| 1156 |
- |
| 1157 |
-#: compress.c:321 |
| 1158 |
-#, c-format |
| 1159 |
-msgid "sorting letters in page #%d\n" |
| 1160 |
-msgstr "сортировка букв на странице #%d\n" |
| 1161 |
- |
| 1162 |
-#: compress.c:330 |
| 1163 |
-#, c-format |
| 1164 |
-msgid "started classification\n" |
| 1165 |
-msgstr "начинается классификация\n" |
| 1166 |
- |
| 1167 |
-#: compress.c:335 |
| 1168 |
-#, c-format |
| 1169 |
-msgid "finished classification\n" |
| 1170 |
-msgstr "классификация окончена\n" |
| 1171 |
- |
| 1172 |
-#: compress.c:368 |
| 1173 |
-#, c-format |
| 1174 |
-msgid "started prototype search\n" |
| 1175 |
-msgstr "начинается поиск прототипов\n" |
| 1176 |
- |
| 1177 |
-#: compress.c:371 |
| 1178 |
-#, c-format |
| 1179 |
-msgid "finished prototype search\n" |
| 1180 |
-msgstr "поиск прототипов окончен\n" |
| 1181 |
- |
| 1182 |
-#: 1error.c:18 |
| 1183 |
-msgid "unable to write to file" |
| 1184 |
-msgstr "запись в файл невозможна" |
| 1185 |
- |
| 1186 |
-#: 1error.c:20 |
| 1187 |
-msgid "unable to read from file" |
| 1188 |
-msgstr "чтение из файла невозможно" |
| 1189 |
- |
| 1190 |
-#: 1error.c:22 |
| 1191 |
-msgid "I/O error" |
| 1192 |
-msgstr "ошибка ввода/вывода" |
| 1193 |
- |
| 1194 |
-#: 1error.c:24 |
| 1195 |
-msgid "bad PBM file" |
| 1196 |
-msgstr "неподходящий файл PBM" |
| 1197 |
- |
| 1198 |
-#: 1error.c:26 |
| 1199 |
-msgid "bad Windows BMP file (perhaps it has non-bitonal data)" |
| 1200 |
-msgstr "неподходящий файл BMP (вероятно, изображение не является монохромным)" |
| 1201 |
- |
| 1202 |
-#: 1error.c:28 |
| 1203 |
-msgid "bad DjVu file" |
| 1204 |
-msgstr "неподходящий файл DjVu" |
| 1205 |
- |
| 1206 |
-#: 1error.c:30 |
| 1207 |
-msgid "bad bilevel data in DjVu file" |
| 1208 |
-msgstr "неподходящий формат монохромного изображения в файле DjVu" |
| 1209 |
- |
| 1210 |
-#: 1error.c:32 |
| 1211 |
-msgid "bad TIFF file (perhaps it has non-bitonal data)" |
| 1212 |
-msgstr "неподходящий файл TIFF (вероятно, изображение не является монохромным)" |
| 1213 |
- |
| 1214 |
-#: 1error.c:34 |
| 1215 |
-msgid "unsupported type of DjVu file" |
| 1216 |
-msgstr "эта разновидность файлов DjVu не поддерживается" |
| 1217 |
- |
| 1218 |
-#: 1error.c:36 |
| 1219 |
-msgid "bilevel data not found in DjVu file" |
| 1220 |
-msgstr "монохромное изображение не найдено в файле DjVu" |
| 1221 |
- |
| 1222 |
-#: 1error.c:38 |
| 1223 |
-msgid "somehow prototype references recursed" |
| 1224 |
-msgstr "ссылки на прототип находятся в циклической зависимости" |
| 1225 |
- |
| 1226 |
-#: 1error.c:40 |
| 1227 |
-msgid "minidjvu was compiled without TIFF support" |
| 1228 |
-msgstr "minidjvu собран без поддержки TIFF" |
| 1229 |
- |
| 1230 |
-#: 1error.c:42 |
| 1231 |
-msgid "minidjvu was compiled without PNG support" |
| 1232 |
-msgstr "minidjvu собран без поддержки PNG" |
| 1233 |
- |
| 1234 |
-#: 1error.c:45 |
| 1235 |
-msgid "some weird error happened, probably caused by a bug in minidjvu" |
| 1236 |
-msgstr "Произошла непонятная ошибка. Скорее всего, она вызвана ошибкой в коде minidjvu." |
| 1237 |
- |
| 1238 |
--- minidjvu-0.8.svn.2010.05.06+dfsg.orig/src/alg/smooth.c |
| 1239 |
+++ minidjvu-0.8.svn.2010.05.06+dfsg/src/alg/smooth.c |
| 1240 |
@@ -18,17 +18,31 @@ static void smooth_row(unsigned char *r, |
| 1241 |
int32 i; |
| 1242 |
for (i = 0; i < n; i++) |
| 1243 |
{ |
| 1244 |
- int score = u[i] + l[i] + t[i-1] + t[i+1] - 2; |
| 1245 |
+ int score = u[i] + l[i] + t[i-1] + t[i+1]; |
| 1246 |
|
| 1247 |
- /* if (score > 0) |
| 1248 |
- r[i] = 1; |
| 1249 |
- else */ |
| 1250 |
- /* clearing black pixels doesn't look cool, alas */ |
| 1251 |
- |
| 1252 |
- if (score < 0) |
| 1253 |
- r[i] = 0; |
| 1254 |
- else |
| 1255 |
- r[i] = t[i]; |
| 1256 |
+ if (t[i] == 0) |
| 1257 |
+ { |
| 1258 |
+ /* Only turn white into black for a good reason. */ |
| 1259 |
+ r[i] = (score == 4); |
| 1260 |
+ } |
| 1261 |
+ else if (score == 0) |
| 1262 |
+ { |
| 1263 |
+ /* Good reason to clear the pixel. */ |
| 1264 |
+ r[i] = 0; |
| 1265 |
+ } |
| 1266 |
+ else if (score == 1) |
| 1267 |
+ { |
| 1268 |
+ /* Check for weak horizontal or vertical linking. */ |
| 1269 |
+ if (u[i] | l[i]) |
| 1270 |
+ r[i] = (u[i-1] & l[i-1]) | (u[i+1] & l[i+1]); |
| 1271 |
+ else |
| 1272 |
+ r[i] = (u[i-1] & u[i+1]) | (l[i-1] & l[i+1]); |
| 1273 |
+ } |
| 1274 |
+ else |
| 1275 |
+ { |
| 1276 |
+ /* Keep it black. */ |
| 1277 |
+ r[i] = 1; |
| 1278 |
+ } |
| 1279 |
} |
| 1280 |
} |
| 1281 |
|
| 1282 |
--- minidjvu-0.8.svn.2010.05.06+dfsg.orig/src/image-io/tiff.c |
| 1283 |
+++ minidjvu-0.8.svn.2010.05.06+dfsg/src/image-io/tiff.c |
| 1284 |
@@ -4,7 +4,7 @@ |
| 1285 |
|
| 1286 |
#include "../base/mdjvucfg.h" |
| 1287 |
|
| 1288 |
-#if HAVE_TIFF |
| 1289 |
+#ifdef HAVE_LIBTIFF |
| 1290 |
#include <tiffio.h> |
| 1291 |
#define MDJVU_USE_TIFFIO |
| 1292 |
#endif |
| 1293 |
@@ -14,7 +14,7 @@ |
| 1294 |
|
| 1295 |
MDJVU_IMPLEMENT int mdjvu_have_tiff_support(void) |
| 1296 |
{ |
| 1297 |
- #if HAVE_TIFF |
| 1298 |
+ #ifdef HAVE_LIBTIFF |
| 1299 |
return 1; |
| 1300 |
#else |
| 1301 |
return 0; |
| 1302 |
@@ -23,7 +23,7 @@ MDJVU_IMPLEMENT int mdjvu_have_tiff_supp |
| 1303 |
|
| 1304 |
MDJVU_IMPLEMENT void mdjvu_disable_tiff_warnings(void) |
| 1305 |
{ |
| 1306 |
- #if HAVE_TIFF |
| 1307 |
+ #ifdef HAVE_LIBTIFF |
| 1308 |
TIFFSetWarningHandler(NULL); |
| 1309 |
#endif |
| 1310 |
} |
| 1311 |
--- minidjvu-0.8.svn.2010.05.06+dfsg.orig/src/image-io/tiffload.c |
| 1312 |
+++ minidjvu-0.8.svn.2010.05.06+dfsg/src/image-io/tiffload.c |
| 1313 |
@@ -4,7 +4,7 @@ |
| 1314 |
|
| 1315 |
#include "../base/mdjvucfg.h" |
| 1316 |
|
| 1317 |
-#if HAVE_TIFF |
| 1318 |
+#ifdef HAVE_LIBTIFF |
| 1319 |
#include <tiffio.h> |
| 1320 |
#define MDJVU_USE_TIFFIO |
| 1321 |
#endif |
| 1322 |
@@ -13,7 +13,7 @@ |
| 1323 |
#include <stdlib.h> |
| 1324 |
#include <string.h> |
| 1325 |
|
| 1326 |
-#if HAVE_TIFF |
| 1327 |
+#ifdef HAVE_LIBTIFF |
| 1328 |
|
| 1329 |
static mdjvu_bitmap_t load_tiff(const char *path, int32 *presolution, mdjvu_error_t *perr, uint32 idx) |
| 1330 |
{ |
| 1331 |
@@ -104,8 +104,8 @@ static mdjvu_bitmap_t load_tiff(const ch |
| 1332 |
} |
| 1333 |
|
| 1334 |
/* clear the padding bits */ |
| 1335 |
- if (scanline_size & 7) |
| 1336 |
- scanline[scanline_size - 1] &= ~(0xFF >> (scanline_size & 7)); |
| 1337 |
+ if (w & 7) |
| 1338 |
+ scanline[scanline_size - 1] &= ~(0xFF >> (w & 7)); |
| 1339 |
|
| 1340 |
memcpy(mdjvu_bitmap_access_packed_row(result, i), |
| 1341 |
scanline, |
| 1342 |
@@ -134,11 +134,11 @@ MDJVU_IMPLEMENT uint32 mdjvu_get_tiff_pa |
| 1343 |
return dircount; |
| 1344 |
} |
| 1345 |
|
| 1346 |
-#endif /* HAVE_TIFF */ |
| 1347 |
+#endif /* HAVE_LIBTIFF */ |
| 1348 |
|
| 1349 |
MDJVU_IMPLEMENT mdjvu_bitmap_t mdjvu_load_tiff(const char *path, int32 *presolution, mdjvu_error_t *perr, uint32 idx) |
| 1350 |
{ |
| 1351 |
- #if HAVE_TIFF |
| 1352 |
+ #ifdef HAVE_LIBTIFF |
| 1353 |
return load_tiff(path, presolution, perr, idx); |
| 1354 |
#else |
| 1355 |
*perr = mdjvu_get_error(mdjvu_error_tiff_support_disabled); |
| 1356 |
--- minidjvu-0.8.svn.2010.05.06+dfsg.orig/src/image-io/tiffsave.c |
| 1357 |
+++ minidjvu-0.8.svn.2010.05.06+dfsg/src/image-io/tiffsave.c |
| 1358 |
@@ -4,14 +4,14 @@ |
| 1359 |
|
| 1360 |
#include "../base/mdjvucfg.h" |
| 1361 |
|
| 1362 |
-#if HAVE_TIFF |
| 1363 |
+#ifdef HAVE_LIBTIFF |
| 1364 |
#include <tiffio.h> |
| 1365 |
#define MDJVU_USE_TIFFIO |
| 1366 |
#endif |
| 1367 |
|
| 1368 |
#include <minidjvu/minidjvu.h> |
| 1369 |
|
| 1370 |
-#if HAVE_TIFF |
| 1371 |
+#ifdef HAVE_LIBTIFF |
| 1372 |
|
| 1373 |
#ifndef COMPRESSION_PACKBITS |
| 1374 |
#define COMPRESSION_PACKBITS 32771 |
| 1375 |
@@ -64,11 +64,11 @@ static int save_tiff(mdjvu_bitmap_t bitm |
| 1376 |
return 1; |
| 1377 |
} |
| 1378 |
|
| 1379 |
-#endif /* HAVE_TIFF */ |
| 1380 |
+#endif /* HAVE_LIBTIFF */ |
| 1381 |
|
| 1382 |
MDJVU_IMPLEMENT int mdjvu_save_tiff(mdjvu_bitmap_t bitmap, const char *path, mdjvu_error_t *perr) |
| 1383 |
{ |
| 1384 |
- #if HAVE_TIFF |
| 1385 |
+ #ifdef HAVE_LIBTIFF |
| 1386 |
return save_tiff(bitmap, path, perr); |
| 1387 |
#else |
| 1388 |
*perr = mdjvu_get_error(mdjvu_error_tiff_support_disabled); |
| 1389 |
--- minidjvu-0.8.svn.2010.05.06+dfsg.orig/tools/minidjvu.c |
| 1390 |
+++ minidjvu-0.8.svn.2010.05.06+dfsg/tools/minidjvu.c |
| 1391 |
@@ -3,7 +3,7 @@ |
| 1392 |
*/ |
| 1393 |
|
| 1394 |
#include <minidjvu/minidjvu.h> |
| 1395 |
-#include "../src/base/mdjvucfg.h" /* for i18n, HAVE_TIFF */ |
| 1396 |
+#include "../src/base/mdjvucfg.h" /* for i18n, HAVE_LIBTIFF */ |
| 1397 |
#include <stdlib.h> |
| 1398 |
#include <stdio.h> |
| 1399 |
#include <string.h> |
| 1400 |
@@ -38,8 +38,8 @@ const char* dict_suffix = NULL; |
| 1401 |
|
| 1402 |
static int get_ext_delim_pos(const char *fname) |
| 1403 |
{ |
| 1404 |
- int pos = strcspn(fname,"."); |
| 1405 |
- int last = 0; |
| 1406 |
+ size_t pos = strcspn(fname,"."); |
| 1407 |
+ size_t last = 0; |
| 1408 |
|
| 1409 |
while (last + pos != strlen(fname)) |
| 1410 |
{ |
| 1411 |
@@ -360,7 +360,7 @@ static mdjvu_image_t split_and_destroy(m |
| 1412 |
mdjvu_bitmap_destroy(bitmap); |
| 1413 |
if (verbose) |
| 1414 |
{ |
| 1415 |
- printf(_("the splitted image has %d pieces\n"), |
| 1416 |
+ printf(_("the split image has %d pieces\n"), |
| 1417 |
mdjvu_image_get_blit_count(image)); |
| 1418 |
} |
| 1419 |
if (clean) |
| 1420 |
@@ -671,7 +671,7 @@ static int process_options(int argc, cha |
| 1421 |
int main(int argc, char **argv) |
| 1422 |
{ |
| 1423 |
int arg_start; |
| 1424 |
-#ifdef HAVE_TIFF |
| 1425 |
+#ifdef HAVE_LIBTIFF |
| 1426 |
int tiff_cnt; |
| 1427 |
#endif |
| 1428 |
|
| 1429 |
@@ -695,7 +695,7 @@ int main(int argc, char **argv) |
| 1430 |
{ |
| 1431 |
multipage_encode(argc - 2, argv + 1, argv[argc - 1], 0); |
| 1432 |
} |
| 1433 |
-#ifdef HAVE_TIFF |
| 1434 |
+#ifdef HAVE_LIBTIFF |
| 1435 |
else if (decide_if_tiff(argv[1]) && (tiff_cnt = mdjvu_get_tiff_page_count(argv[1])) > 1 ) |
| 1436 |
{ |
| 1437 |
multipage_encode(tiff_cnt, argv + 1, argv[argc - 1], 1); |
| 1438 |
--- minidjvu-0.8.svn.2010.05.06+dfsg.orig/wscript |
| 1439 |
+++ minidjvu-0.8.svn.2010.05.06+dfsg/wscript |
| 1440 |
@@ -14,7 +14,7 @@ def configure(conf): |
| 1441 |
conf.check(header_name='math.h') |
| 1442 |
conf.check(lib='m') |
| 1443 |
|
| 1444 |
- conf.check(header_name='tiffio.h', define_name='HAVE_TIFF') |
| 1445 |
+ conf.check(header_name='tiffio.h', define_name='HAVE_LIBTIFF') |
| 1446 |
conf.check(lib='tiff') |
| 1447 |
|
| 1448 |
conf.check(header_name='libintl.h', define_name='HAVE_I18N') |