4.4.1

Author: mistydemeo

ChangeLog

@@ -1,3 +1,14 @@
+2009-03-14  Motoyuki Kasahara  <m-kasahr@sra.co.jp>
+
+	* Version 4.4.1.
+
+	* configure.ac (AC_INIT): Set version to 4.4.1.
+	* configure.ac (LIBEB_VERSION_INFO): Set LIBEB_VERSION_INFO to 14:0:1.
+
+	* eb/binary.c (eb_set_binary_mono_graphic, eb_set_binary_gray_graphic,
+	eb_set_binary_wave, eb_set_binary_color_graphic): Apply large
+	file support patch by Kazuhiro Ito.
+
 2009-02-28  Motoyuki Kasahara  <m-kasahr@sra.co.jp>
 
 	* Version 4.4.

NEWS

@@ -1,8 +1,13 @@
+バージョン 4.4.1 における主な変更点:
+
+* 画像、音声データを扱う際に、データが格納されているファイルの大きさが
+  2GB を正しく扱えなかったので修正した。
+
 バージョン 4.4 における主な変更点:
 
 * 2GB を超える大きさのファイルを扱えるようにした。ただし、システム側で
   対応していることが前提条件。
-* EBZIP形式の圧縮ファイルで、4294967296 ～1099511627775バイト (4GB～1TB)
+* EBZIP形式の圧縮ファイルで、4294967296〜1099511627775バイト (4GB〜1TB)
   のファイルの表現方法を規定した。ebzip, ebunzip はこの規定に沿って圧縮
   および伸張を行なう。
 * ebzip, ebunzip がディレクトリ作成に失敗したとき、何もエラーメッセージ

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for eb 4.4.
+# Generated by GNU Autoconf 2.63 for eb 4.4.1.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 # 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
@@ -743,8 +743,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='eb'
 PACKAGE_TARNAME='eb'
-PACKAGE_VERSION='4.4'
-PACKAGE_STRING='eb 4.4'
+PACKAGE_VERSION='4.4.1'
+PACKAGE_STRING='eb 4.4.1'
 PACKAGE_BUGREPORT=''
 
 ac_unique_file="eb/eb.c"
@@ -1512,7 +1512,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures eb 4.4 to adapt to many kinds of systems.
+\`configure' configures eb 4.4.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1582,7 +1582,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of eb 4.4:";;
+     short | recursive ) echo "Configuration of eb 4.4.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1706,7 +1706,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-eb configure 4.4
+eb configure 4.4.1
 generated by GNU Autoconf 2.63
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1720,7 +1720,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by eb $as_me 4.4, which was
+It was created by eb $as_me 4.4.1, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   $ $0 $@
@@ -2438,7 +2438,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='eb'
- VERSION='4.4'
+ VERSION='4.4.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2581,7 +2581,7 @@ am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
 
 
 
-LIBEB_VERSION_INFO=13:0:0
+LIBEB_VERSION_INFO=14:0:1
 
 
 EB_VERSION_MAJOR=4
@@ -15495,7 +15495,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by eb $as_me 4.4, which was
+This file was extended by eb $as_me 4.4.1, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -15558,7 +15558,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
-eb config.status 4.4
+eb config.status 4.4.1
 configured by $0, generated by GNU Autoconf 2.63,
   with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 

configure.ac

@@ -1,15 +1,15 @@
 dnl *
 dnl * Process this file with autoconf to produce a configure script.
 dnl *
-AC_INIT(eb, 4.4)
+AC_INIT(eb, 4.4.1)
 AC_CONFIG_SRCDIR(eb/eb.c)
 AC_PREREQ(2.54)
 AM_INIT_AUTOMAKE
 
 dnl *
 dnl * Library version info.
 dnl *
-LIBEB_VERSION_INFO=13:0:0
+LIBEB_VERSION_INFO=14:0:1
 AC_SUBST(LIBEB_VERSION_INFO)
 
 EB_VERSION_MAJOR=4

eb/binary.c

@@ -261,8 +261,8 @@ width=%d, height=%d)",
     context = &book->binary_context;
     context->code = EB_BINARY_MONO_GRAPHIC;
     context->zio = &book->subbook_current->text_zio;
-    context->location = (position->page - 1) * EB_SIZE_PAGE + position->offset
-	+ (width + 7) / 8 * (height - 1);
+    context->location = ((off_t) position->page - 1) * EB_SIZE_PAGE
+	+ position->offset + (width + 7) / 8 * (height - 1);
     context->size = (width + 7) / 8 * height;
     context->offset = 0;
     context->cache_offset = 0;
@@ -509,8 +509,8 @@ width=%d, height=%d)",
 
     context->code = EB_BINARY_GRAY_GRAPHIC;
     context->zio = &book->subbook_current->text_zio;
-    context->location = (position->page - 1) * EB_SIZE_PAGE + position->offset
-	+ (width + 1) / 2 * (height - 1);
+    context->location = ((off_t) position->page - 1) * EB_SIZE_PAGE
+	+ position->offset + (width + 1) / 2 * (height - 1);
     context->size = (width + 1) / 2 * height;
     context->offset = 0;
     context->cache_offset = 0;
@@ -621,9 +621,9 @@ end_position={%d,%d})",
 	goto failed;
     }
 
-    start_location = (start_position->page - 1) * EB_SIZE_PAGE
+    start_location = ((off_t) start_position->page - 1) * EB_SIZE_PAGE
 	+ start_position->offset;
-    end_location   = (end_position->page - 1)   * EB_SIZE_PAGE
+    end_location   = ((off_t) end_position->page - 1)   * EB_SIZE_PAGE
 	+ end_position->offset;
 
     context = &book->binary_context;
@@ -787,7 +787,8 @@ eb_set_binary_color_graphic(EB_Book *book, const EB_Position *position)
     context = &book->binary_context;
     context->code = EB_BINARY_COLOR_GRAPHIC;
     context->zio = &book->subbook_current->graphic_zio;
-    context->location = (position->page - 1) * EB_SIZE_PAGE + position->offset;
+    context->location = ((off_t) position->page - 1) * EB_SIZE_PAGE
+	+ position->offset;
     context->offset = 0;
     context->cache_length = 0;
     context->cache_offset = 0;