fix: windows build: -mwindows in LDFLAGS instead of CLFAGS

print amount of correctly read sectors during session
when at least one read failed, in verbose mode

.github/workflows/make-dist.sh

@@ -0,0 +1,52 @@
+#!/bin/bash
+set -e
+set -x
+
+github_ref="$1"
+
+case "$MSYSTEM" in
+    MINGW64) os=win64;   suf=$os-portable; exe=.exe;;
+    MINGW32) os=win32;   suf=$os-portable; exe=.exe;;
+    *)       os=linux64; suf=$os-static;   exe='';;
+esac
+
+./dvdisaster$exe --version
+
+if ./dvdisaster$exe --version | grep -q NOGUI; then
+    GUI=0
+    suffix=$suf-cli-only
+else
+    GUI=1
+    suffix=$suf
+fi
+
+archive=dvdisaster-$(echo "$github_ref" | grep -Eo '[^/]+$')-$suffix.zip
+echo "Archive name is $archive"
+echo "::set-output name=archive::$archive"
+
+mkdir -p dist/locale
+cp -vr locale/*/ dist/locale/
+if [ "$os" != "linux64" ]; then
+  if [ "$GUI" = 1 ]; then
+    mkdir -p dist/share/themes dist/lib/gtk-2.0
+    cp -vr $MINGW_PREFIX/share/themes/MS-Windows dist/share/themes/
+    cp -vr $MINGW_PREFIX/lib/gtk-2.0/* dist/lib/gtk-2.0/
+    rm -rf dist/lib/gtk-2.0/include
+  fi
+  mkdir -p dist/lib
+  ntldd -R dvdisaster
+  for i in $(ntldd -R dvdisaster | awk '/mingw/ {print $3}' | tr \\\\ / | grep -Eo '[^/]+$')
+  do
+    test -e $MINGW_PREFIX/bin/$i && cp -va $MINGW_PREFIX/bin/$i dist/
+  done
+  find dist -type f -name "*.a" -delete
+fi
+man -t documentation/dvdisaster.en.1 | ps2pdf - dist/dvdisaster.pdf
+cp CHANGELOG TODO dvdisaster documentation/dvdisaster.*.1 documentation/user-manual/manual.pdf dist/
+cp CREDITS.en dist/CREDITS
+if command -v zip >/dev/null; then
+    mv dist ${archive/.zip/}
+    zip -9r $archive ${archive/.zip/}
+    mv ${archive/.zip/} dist
+fi
+echo "dist done ($archive)"

.github/workflows/release.yml

@@ -0,0 +1,142 @@
+name: autobuild
+
+on:
+  release:
+    types: [published]
+
+jobs:
+  win:
+    runs-on: windows-2016
+    strategy:
+      matrix:
+        arch: [x86_64, i686]
+        ui: [cli, gui]
+        include:
+          - arch: x86_64
+            msystem: MINGW64
+            grep: x86-64
+          - arch: i686
+            msystem: MINGW32
+            grep: 386
+          - ui: cli
+            clionly: --with-cli-only
+    defaults:
+      run:
+        shell: msys2 {0}
+    steps:
+    - uses: msys2/setup-msys2@v2
+      with:
+        msystem: ${{ matrix.msystem }}
+        update: false
+        install: git diffutils make pkg-config mingw-w64-${{ matrix.arch }}-glib2 mingw-w64-${{ matrix.arch }}-gcc mingw-w64-${{ matrix.arch }}-ghostscript mingw-w64-${{ matrix.arch }}-ntldd-git man zip
+    - name: install GUI prereqs
+      if: matrix.ui == 'gui'
+      run: pacman -S --noconfirm mingw-w64-${{ matrix.arch }}-gtk2
+    - name: git config
+      run: git config --global core.autocrlf input
+      shell: bash
+    - uses: actions/checkout@v2
+    - name: configure
+      run: ./configure ${{ matrix.clionly }}
+    - name: make
+      run: nproc && make -j$(nproc)
+    - name: check executable
+      run: |
+          ./dvdisaster.exe --version
+          file dvdisaster.exe
+          if ./dvdisaster.exe --version | grep dirty; then exit 1; fi
+          file dvdisaster.exe | grep -q '${{ matrix.grep }}, for MS Windows'
+    - name: check executable (GUI)
+      if: matrix.ui == 'gui'
+      run: if ./dvdisaster.exe --version | grep NOGUI; then exit 1; fi
+    - name: check executable (CLI)
+      if: matrix.ui == 'cli'
+      run: ./dvdisaster.exe --version | grep NOGUI
+    - name: prepare dist
+      run: ./.github/workflows/make-dist.sh ${{ github.ref }}
+      id: dist
+    - name: check executability of dist from cmd.exe
+      shell: cmd
+      run: |
+          cd dist
+          dvdisaster.exe --version
+    - name: Upload Release Asset
+      id: upload-release-asset
+      uses: actions/upload-release-asset@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ github.event.release.upload_url }}
+        asset_path: ./${{ steps.dist.outputs.archive }}
+        asset_name: ${{ steps.dist.outputs.archive }}
+        asset_content_type: application/zip
+
+  linux64-cli:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: install prerequisites
+      run: sudo apt update && sudo apt install -y libglib2.0-dev ghostscript man
+    - name: configure
+      run: ./configure --with-cli-only
+    - name: make
+      run: nproc && make -j$(nproc) && make static && mv -f dvdisaster-static dvdisaster
+    - name: check executable
+      run: |
+        ./dvdisaster --version && ./dvdisaster --version | grep -q dirty || true
+        file dvdisaster && file dvdisaster | grep -q 'ELF 64' && file dvdisaster | grep -q 'statically linked'
+
+    - name: build dist
+      run: ./.github/workflows/make-dist.sh ${{ github.ref }}
+      id: dist
+    - name: Upload Release Asset
+      id: upload-release-asset
+      uses: actions/upload-release-asset@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ github.event.release.upload_url }}
+        asset_path: ./${{ steps.dist.outputs.archive }}
+        asset_name: ${{ steps.dist.outputs.archive }}
+        asset_content_type: application/zip
+
+  linux64-appimage:
+    runs-on: ubuntu-16.04
+    steps:
+    - uses: actions/checkout@v2
+    - name: install prerequisites
+      run: sudo apt update && sudo apt install -y libglib2.0-dev ghostscript man wget libgtk2.0-dev gtk2-engines-pixbuf gtk2-engines pkg-config gnome-themes-standard
+    - name: configure
+      run: ./configure --prefix=/usr
+    - name: make
+      run: nproc && make -j$(nproc) && make
+    - name: make install
+      run: touch documentation/user-manual/manual.pdf && mkdir /tmp/dist && make install DESTDIR=/tmp/dist
+    - name: copy things to dist
+      run: |
+        install -d /tmp/dist/usr/lib/gtk-2.0
+        cp -va $(pkg-config --variable=libdir gtk+-2.0)/gtk-2.0/$(pkg-config --variable=gtk_binary_version gtk+-2.0)/* /tmp/dist/usr/lib/gtk-2.0
+    - name: get linuxdeploy
+      run: wget https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage && chmod 755 linuxdeploy-x86_64.AppImage
+    - name: build appimage
+      run: |
+        export VERSION=$(echo "${{ github.ref }}" | grep -Eo '[^/]+$')
+        ./linuxdeploy-x86_64.AppImage -d contrib/dvdisaster.desktop -i contrib/dvdisaster64.png -i contrib/dvdisaster48.png -i contrib/dvdisaster32.png -i contrib/dvdisaster16.png --icon-filename dvdisaster --custom-apprun=contrib/AppRun.sh --appdir /tmp/dist/ --output appimage
+    - name: test appimage
+      id: dist
+      run: |
+        chmod 755 dvdisaster*.AppImage && ./dvdisaster*.AppImage --version
+        archive=$(ls -1 dvdisaster*.AppImage)
+        echo "::set-output name=archive::$archive"
+        echo "appimage is <$archive>"
+    - name: Upload Release Asset
+      id: upload-release-asset
+      uses: actions/upload-release-asset@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ github.event.release.upload_url }}
+        asset_path: ./${{ steps.dist.outputs.archive }}
+        asset_name: ${{ steps.dist.outputs.archive }}
+        asset_content_type: application/zip
+

.github/workflows/tests.yml

@@ -0,0 +1,116 @@
+name: non-regression tests
+
+on: [pull_request]
+
+jobs:
+  win:
+    runs-on: windows-2016
+    strategy:
+      matrix:
+        arch: [x86_64, i686]
+        ui: [cli, gui]
+        printf: [fmtdbg, normal]
+        include:
+          - arch: x86_64
+            msystem: MINGW64
+            grep: x86-64
+          - arch: i686
+            msystem: MINGW32
+            grep: 386
+          - ui: cli
+            clionly: --with-cli-only
+          - printf: fmtdbg
+            debugprintf: --with-debug-printf-format
+    defaults:
+      run:
+        shell: msys2 {0}
+    steps:
+    - uses: msys2/setup-msys2@v2
+      with:
+        msystem: ${{ matrix.msystem }}
+        update: false
+        install: git diffutils make pkg-config mingw-w64-${{ matrix.arch }}-glib2 mingw-w64-${{ matrix.arch }}-gcc mingw-w64-${{ matrix.arch }}-ghostscript mingw-w64-${{ matrix.arch }}-ntldd-git man zip
+    - name: install GUI prereqs
+      if: matrix.ui == 'gui'
+      run: pacman -S --noconfirm mingw-w64-${{ matrix.arch }}-gtk2
+    - name: git config
+      run: git config --global core.autocrlf input
+      shell: bash
+    - uses: actions/checkout@v2
+    - name: configure
+      run: |
+          echo running ./configure ${{ matrix.clionly }} ${{ matrix.debugprintf }} --with-werror
+          ./configure ${{ matrix.clionly }} ${{ matrix.debugprintf }}    --with-werror
+    - name: make
+      run: nproc && make -j$(nproc)
+    - name: check executable
+      run: |
+          ./dvdisaster.exe --version
+          file dvdisaster.exe
+          if ./dvdisaster.exe --version | grep dirty; then exit 1; fi
+          file dvdisaster.exe | grep -q '${{ matrix.grep }}, for MS Windows'
+    - name: check executable (GUI)
+      if: matrix.ui == 'gui'
+      run: |
+          ./dvdisaster.exe --version
+          if ./dvdisaster.exe --version | grep NOGUI; then exit 1; fi
+    - name: check executable (CLI)
+      if: matrix.ui == 'cli'
+      run: |
+          ./dvdisaster.exe --version
+          ./dvdisaster.exe --version | grep NOGUI
+    - name: try to prepare dist
+      run: ./.github/workflows/make-dist.sh ${{ github.ref }}
+    - name: run regression tests
+      if: matrix.printf == 'normal'
+      env:
+        REGTEST_NO_UTF8: 1
+      run: mkdir /var/tmp/regtest && ./regtest/runtests.sh
+
+  linux:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ui: [cli, gui]
+        printf: [fmtdbg, normal]
+        include:
+          - ui: cli
+            clionly: --with-cli-only
+          - printf: fmtdbg
+            debugprintf: --with-debug-printf-format
+    steps:
+    - uses: actions/checkout@v2
+    - name: install prerequisites
+      env:
+        DEBIAN_FRONTEND: noninteractive
+      run: sudo apt-get update && sudo apt-get install -y libglib2.0-dev ghostscript man jq
+    - name: install prerequisites (GUI)
+      if: matrix.ui == 'gui'
+      env:
+        DEBIAN_FRONTEND: noninteractive
+      run: sudo apt-get install -y libgtk2.0-dev
+    - name: configure
+      run: |
+          echo ./configure ${{ matrix.clionly }} ${{ matrix.debugprintf }} --with-werror
+          ./configure ${{ matrix.clionly }} ${{ matrix.debugprintf }} --with-werror
+    - name: make
+      run: nproc && make -j$(nproc)
+    - name: check executability
+      run: ./dvdisaster --version
+    - name: check executable (GUI)
+      if: matrix.ui == 'gui'
+      run: |
+          ./dvdisaster --version
+          if ./dvdisaster --version | grep NOGUI; then exit 1; fi
+    - name: check executable (CLI)
+      if: matrix.ui == 'cli'
+      run: |
+          ./dvdisaster --version
+          ./dvdisaster --version | grep NOGUI
+    - name: prepare dist
+      run: ./.github/workflows/make-dist.sh ${{ github.ref }}
+    - name: regression tests
+      if: matrix.printf == 'normal'
+      env:
+        REGTEST_NO_UTF8: 1
+      run: mkdir /var/tmp/regtest && ./regtest/runtests.sh

.gitignore

@@ -1,3 +1,18 @@
 .pc
 *.o
 *~
+*.gcno
+*.gcda
+*.gcov
+Makefile.config
+configure.log
+locale/Makefile
+GNUmakefile
+.gitignore
+simple-md5sum
+inlined-icons.h
+help-dialogs.h
+dvdisaster
+build.h
+dvdisaster.mo
+locale/messages.pot

COPYING

@@ -1,285 +1,625 @@
                     GNU GENERAL PUBLIC LICENSE
-                       Version 2, June 1991
+                       Version 3, 29 June 2007
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                          59 Temple Place - Suite 330
-                          Boston, MA 02111-1307, USA.
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
                             Preamble
 
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
 your programs, too.
 
   When we speak of free software, we are referring to freedom, not
 price.  Our General Public Licenses are designed to make sure that you
 have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
 
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
 
   For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
 
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
 
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
 
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
-
-                    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
+                       TERMS AND CONDITIONS
 
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
+  0. Definitions.
 
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
+  "This License" refers to version 3 of the GNU General Public License.
 
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
 
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
 
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
 
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
 
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
 
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
 
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
 
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
+  1. Source Code.
 
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
 
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
 
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
 
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
 
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
 
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
+  The Corresponding Source for a work in source code form is that
+same work.
 
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
 this License.
 
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
 otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
 
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
+  13. Use with the GNU Affero General Public License.
 
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
 
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
+  14. Revised Versions of this License.
 
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
 be similar in spirit to the present version, but may differ in detail to
 address new problems or concerns.
 
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
 
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
 
-                            NO WARRANTY
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
 
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
+  15. Disclaimer of Warranty.
 
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
 
                      END OF TERMS AND CONDITIONS
-
+
             How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
@@ -288,15 +628,15 @@ free software which everyone can redistribute and change under these terms.
 
   To do so, attach the following notices to the program.  It is safest
 to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
+state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
     <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 19yy  <name of author>
+    Copyright (C) <year>  <name of author>
 
-    This program is free software; you can redistribute it and/or modify
+    This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
+    the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
@@ -305,37 +645,30 @@ the "copyright" line and a pointer to where the full notice is found.
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; see the file COPYING.  If not, write to
-    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-    Boston, MA 02111-1307, USA.
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
 
-    Gnomovision version 69, Copyright (C) 19yy name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.
 
 The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
 
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
 
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.

CREDITS.cs

@@ -1,45 +0,0 @@
-Mnoho poděkování patří následujícím lidem (v alfabetickém pořadí):
-
-Pablo Almeida (pabloalmeidaff9@gmail.com)	
-   provides and maintains the Portuguese translation.
-
-Harald Bögeholz (hwb@heise.de)
-   poskytl řadu podstatných diskuzí o obnově dat na CD/DVD
-   a opravě chyb Reed-Solomon.
-   "Adaptivní strategie čtení" v programu dvdisaster je založena na
-   na jeho doporučeních a nápadech; implementoval podobnou strategii
-   předtím a publikoval ji v čísle 16/2005 německého periodika "c't".
-
-Julian Einwag (julian@einwag.de).
-   provides and maintains the Mac OS X / Darwin port.
-
-Igor Gorbounov (igorbounov@topazelectro.ru)
-   provides and maintains the Russian translation.
-
-Andrei Grecu (andrei.grecu@aon.at)
-   provided an algorithm for recovering defective CD sectors
-   from multiple incomplete RAW reading attempts.
-
-Phil Karn 
-   napsal vynikající knihovnu pro tvorbu a dekódování kódu Reed-Solomon.
-   Tento projekt si vzal hodně inspirace - a dokonce kódu - 
-   z jeho knihovny, kterou lze nalézt na http://www.ka9q.net/code/fec/
-
-   Protože byl kód optimalizován a zkrácen pro speciální potřeby
-   programu dvdisaster, měli byste ziskat originální věc, máte-li
-   zájem na zabudování RS kódů do vaší aplikace.
-
-Daniel Nylander (info@danielnylander.se)
-   provides and maintains the Swedish translation.
-
-Andrea Polverini (polve@polve.com) 
-   poskytuje a udržuje italský překlad.
-
-Luboš Staněk (lubek@users.sourceforge.net)
-   poskytuje a udržuje český překlad.
-
-Sergey Svishchev (svs@ropnet.ru)
-   provided the NetBSD port.
-
-Mnoho dalších lidí poskytlo další doporučení a chybové zprávy;
-podrobnosti viz soubor CHANGELOG.

CREDITS.de

@@ -36,6 +36,9 @@ Daniel Nylander (info@danielnylander.se)
 Andrea Polverini (polve@polve.com) 
    erstellt und pflegt die italienische Übersetzung.
 
+Jindřich Šesták <khagaroth@users.sourceforge.net>
+   hat die tschechische Übersetzung ab Version 0.79.3 übernommen.
+
 Luboš Staněk (lubek@users.sourceforge.net)
    erstellt und pflegt die tschechische Übersetzung.
 

CREDITS.en

@@ -35,8 +35,11 @@ Daniel Nylander (info@danielnylander.se)
 Andrea Polverini (polve@polve.com) 
    provides and maintains the Italian translation.
 
+Jindřich Šesták <khagaroth@users.sourceforge.net>
+   took over the Czech translation since version 0.79.3.
+
 Luboš Staněk (lubek@users.sourceforge.net)
-   provides and maintains the Czech translation.
+   provided and maintained the Czech translation up to version 0.72.3.
 
 Sergey Svishchev (svs@ropnet.ru)
    provided the NetBSD port.

GNUmakefile

@@ -1,4 +0,0 @@
-all:
-	@echo
-	@echo "Please create a Makefile by entering \"bash configure\" first"
-	@echo

GNUmakefile.template

@@ -5,12 +5,16 @@
 # Currently supported locales
 
 PO_LOCALES = pt_BR cs de it ru sv
-MAN_LOCALES = cs de it
-DOC_LOCALES = de en ru
+MAN_LOCALES = de
 
 # Search for TAGS: online-docs
 # Don't forget edit NODIST for new doc locales
 
+# Local settings (not changeable from the configure script)
+
+# Where to put tar archives (arch, srcdist)
+TAR_PREFIX=/dev/shm
+
 ######################################################################
 # Take over variables from configure
 ######################################################################
@@ -25,8 +29,8 @@ MANDIR = $(CFG_MANDIR)
 DOCDIR = $(CFG_DOCDIR)
 DOCSUBDIR = $(CFG_DOCDIR)/$(CFG_DOCSUBDIR)
 LOCALEDIR = $(CFG_LOCALEDIR)
-PHPMOUNTDIR = $(CFG_PHPMOUNTDIR)
 BUILDROOT = $(CFG_BUILDROOT)
+BUILDTMP = $(CFG_BUILDTMP)
 
 INTL_INCL   = $(CFG_INTL_INCL)
 INTL_LFLAGS = $(CFG_INTL_LFLAGS)
@@ -35,57 +39,72 @@ INTL_LIBS   = $(CFG_INTL_LIBS)
 CAM_LFLAGS = $(CFG_CAM_LFLAGS)
 CAM_LIBS   = $(CFG_CAM_LIBS)
 
-GTK_CFLAGS   = $(CFG_GTK2_CFLAGS)
-GTK_LIBS     = $(CFG_GTK2_LIBS)
-GTK_BINDIR   = $(CFG_GTK2_BINDIR)
+GTK_CFLAGS   = $(CFG_GTK2_CFLAGS) $(CFG_GLIB2_CFLAGS)
+GTK_LIBS     = $(CFG_GTK2_LIBS) $(CFG_GLIB2_LIBS)
+GTK_BINDIR   = $(CFG_GTK2_BINDIR) $(CFG_GLIB2_BINDIR)
 
 EFENCE_LFLAGS = $(CFG_EFENCE_LFLAGS)
 EFENCE_LIBS   = $(CFG_EFENCE_LIBS)
 
 SYS_OPTIONS  = $(CFG_SYS_OPTIONS)
+SYS_NAME     = $(CFG_SYS_NAME)
 HAVE_OPTIONS = $(CFG_HAVE_OPTIONS)
 WITH_OPTIONS = $(CFG_WITH_OPTIONS)
 OTHER_OPTIONS = $(CFG_OTHER_OPTIONS) -DVERSION=\"$(VERSION)\"
-EXE_SUFFIX   = $(CFG_EXE_SUFFIX)
 SSE2_OPTIONS = $(CFG_SSE2_OPTIONS)
+ALTIVEC_OPTIONS = $(CFG_ALTIVEC_OPTIONS)
 
 LOCATIONS = -DSRCDIR=\"$(SRCDIR)\" -DBINDIR=\"$(BINDIR)\" -DDOCDIR=\"$(DOCSUBDIR)\" -DLOCALEDIR=\"$(LOCALEDIR)\"
-COPTS = $(CFLAGS) $(LOCATIONS) $(SYS_OPTIONS) $(HAVE_OPTIONS) $(WITH_OPTIONS) $(OTHER_OPTIONS) $(INTL_INCL) $(CAM_INCL) $(GTK_CFLAGS)
-LOPTS = $(LDFLAGS) $(INTL_LFLAGS) $(CAM_LFLAGS) $(EFENCE_LFLAGS)
+COPTS = $(CFLAGS) $(LOCATIONS) $(SYS_OPTIONS) $(SYS_NAME) $(HAVE_OPTIONS) $(WITH_OPTIONS) $(OTHER_OPTIONS) $(INTL_INCL) $(CAM_INCL) $(GTK_CFLAGS) $(MUDFLAP_CFLAGS)
+LOPTS = $(LDFLAGS) $(INTL_LFLAGS) $(CAM_LFLAGS) $(EFENCE_LFLAGS) $(MUDFLAP_LFLAGS)
 
-LIBS = $(INTL_LIBS) $(CAM_LIBS) $(GTK_LIBS) $(EFENCE_LIBS) -lm
+LIBS = $(INTL_LIBS) $(CAM_LIBS) $(GTK_LIBS) $(EFENCE_LIBS) $(MUDFLAP_LIBS) -lm
 
 CFILES = $(CFG_CFILES)
 OFILES = $(CFG_OFILES)
 
+# special case for DESTDIR, if BUILDROOT is undef and DESTDIR is,
+# set BUILDROOT to DESTDIR
+ifeq "" "$(BUILDROOT)"
+BUILDROOT = $(DESTDIR)
+endif
+
 ######################################################################
 # Compilation related
 ######################################################################
 
-.PHONY : all help show locale time-stamp
+.PHONY : all help show locale
 
-.c.o:
-	@echo "Compiling:" $*.c
-	@$(CC) $(COPTS) -c $*.c
+all: dvdisaster
 
-all: time-stamp dvdisaster images 
+src/build.h:
+	@echo "Updating:" src/build.h
+	@$(SRCDIR)/scripts/time-stamper.bash $(SRCDIR)/src/build.h
+
+${BUILDTMP}/%.o : src/%.c
+	@echo "Compiling:" $?
+	@$(CC) $(COPTS) -c $? -o $@
+
+${BUILDTMP}/build.o : src/build.c src/build.h
+	@echo "Compiling:" src/build.o
+	@$(CC) $(COPTS) -c src/build.c -o $@
+
+${BUILDTMP}/closure.o : src/closure.c src/inlined-icons.h
+	@echo "Compiling:" src/closure.c
+	@$(CC) $(COPTS) -c src/closure.c -o $@
+
+${BUILDTMP}/icon-factory.o : src/icon-factory.c src/inlined-icons.h
+	@echo "Compiling:" src/icon-factory.c
+	@$(CC) $(COPTS) -c src/icon-factory.c -o $@
 
 # Building the dvdisaster binary
 
-time-stamp:
-	@$(SRCDIR)/scripts/time-stamper.bash $(SRCDIR)/build.h
-
-dvdisaster: inlined-icons.h $(OFILES) 
+dvdisaster: $(ICONS) $(OFILES)
+	@echo "Linking  : dvdisaster"
 	@if test $(CFG_SYS_OPTIONS) == -DSYS_MINGW; \
-	then echo "Linking  : dvdisaster-win, dvdisaster"; \
-	     windres -v winres.rc -O coff -o winres.o >/dev/null ; \
-	     $(CC) $(COPTS) -c dvdisaster.c ; \
-	     $(CC) $(LOPTS) $(OFILES) winres.o $(LIBS) -lole32 -mwindows -o dvdisaster-win; \
-	     $(CC) $(COPTS) -DWIN_CONSOLE -c dvdisaster.c ; \
-	     $(CC) $(LOPTS) $(OFILES) $(LIBS) -lole32 -o dvdisaster; \
-	     if ! test -e signature; then dvdisaster --debug --sign; fi; \
-	else echo "Linking  : dvdisaster"; \
-	     $(CC) $(LOPTS) $(OFILES) $(LIBS) -o dvdisaster; \
+	then windres -v src/winres.rc -O coff -o ${BUILDTMP}/winres.o >/dev/null ; \
+	     $(CC) $(LOPTS) $(OFILES) $(LIBS) ${BUILDTMP}/winres.o -o dvdisaster ; \
+	else $(CC) $(LOPTS) $(OFILES) $(LIBS) -o dvdisaster ; \
 	fi
 	@if test -e locale/de/LC_MESSAGES/dvdisaster.mo \
 	 || echo $(WITH_OPTIONS) | grep "NLS_NO" >/dev/null; \
@@ -93,147 +112,88 @@ dvdisaster: inlined-icons.h $(OFILES)
 	else $(MAKE) --no-print-directory -C locale; \
 	fi
 
-inlined-icons.h: icons/read.png icons/create.png icons/scan.png icons/fix.png icons/verify.png
-	@gdk-pixbuf-csource --raw --name=dvdisaster_read     icons/read.png      >inlined-icons.h
-	@gdk-pixbuf-csource --raw --name=dvdisaster_create   icons/create.png   >>inlined-icons.h
-	@gdk-pixbuf-csource --raw --name=dvdisaster_scan     icons/scan.png     >>inlined-icons.h
-	@gdk-pixbuf-csource --raw --name=dvdisaster_fix      icons/fix.png      >>inlined-icons.h
-	@gdk-pixbuf-csource --raw --name=dvdisaster_verify   icons/verify.png   >>inlined-icons.h
-	@gdk-pixbuf-csource --raw --name=dvdisaster_open_ecc icons/open-ecc.png >>inlined-icons.h
-	@gdk-pixbuf-csource --raw --name=dvdisaster_open_img icons/open-img.png >>inlined-icons.h
+# gdk-pixbuf-csource sometimes produces truncated output, so we have to ensure the output
+# is valid before appending it to inlined-icons.h:
+src/inlined-icons.h: icons/read.png icons/create.png icons/scan.png icons/fix.png icons/verify.png icons/strip.png icons/open-ecc.png icons/open-img.png icons/cd.png icons/gtk-help.png icons/gtk-index.png icons/gtk-preferences.png icons/gtk-quit.png icons/gtk-stop.png icons/tooltip.png icons/nothing.png
+	@echo "Building:" src/inlined-icons.h
+	@rm -f src/inlined-icons.h
+	@while gdk-pixbuf-csource --raw --name=dvdisaster_read            icons/read.png            >src/.icons.tmp; do grep -q '"};' src/.icons.tmp && break; done; cat src/.icons.tmp >>src/inlined-icons.h
+	@while gdk-pixbuf-csource --raw --name=dvdisaster_create          icons/create.png          >src/.icons.tmp; do grep -q '"};' src/.icons.tmp && break; done; cat src/.icons.tmp >>src/inlined-icons.h
+	@while gdk-pixbuf-csource --raw --name=dvdisaster_scan            icons/scan.png            >src/.icons.tmp; do grep -q '"};' src/.icons.tmp && break; done; cat src/.icons.tmp >>src/inlined-icons.h
+	@while gdk-pixbuf-csource --raw --name=dvdisaster_fix             icons/fix.png             >src/.icons.tmp; do grep -q '"};' src/.icons.tmp && break; done; cat src/.icons.tmp >>src/inlined-icons.h
+	@while gdk-pixbuf-csource --raw --name=dvdisaster_verify          icons/verify.png          >src/.icons.tmp; do grep -q '"};' src/.icons.tmp && break; done; cat src/.icons.tmp >>src/inlined-icons.h
+	@while gdk-pixbuf-csource --raw --name=dvdisaster_strip           icons/strip.png           >src/.icons.tmp; do grep -q '"};' src/.icons.tmp && break; done; cat src/.icons.tmp >>src/inlined-icons.h
+	@while gdk-pixbuf-csource --raw --name=dvdisaster_open_ecc        icons/open-ecc.png        >src/.icons.tmp; do grep -q '"};' src/.icons.tmp && break; done; cat src/.icons.tmp >>src/inlined-icons.h
+	@while gdk-pixbuf-csource --raw --name=dvdisaster_open_img        icons/open-img.png        >src/.icons.tmp; do grep -q '"};' src/.icons.tmp && break; done; cat src/.icons.tmp >>src/inlined-icons.h
+	@while gdk-pixbuf-csource --raw --name=dvdisaster_cd              icons/cd.png              >src/.icons.tmp; do grep -q '"};' src/.icons.tmp && break; done; cat src/.icons.tmp >>src/inlined-icons.h
+	@while gdk-pixbuf-csource --raw --name=dvdisaster_gtk_help        icons/gtk-help.png        >src/.icons.tmp; do grep -q '"};' src/.icons.tmp && break; done; cat src/.icons.tmp >>src/inlined-icons.h
+	@while gdk-pixbuf-csource --raw --name=dvdisaster_gtk_index       icons/gtk-index.png       >src/.icons.tmp; do grep -q '"};' src/.icons.tmp && break; done; cat src/.icons.tmp >>src/inlined-icons.h
+	@while gdk-pixbuf-csource --raw --name=dvdisaster_gtk_preferences icons/gtk-preferences.png >src/.icons.tmp; do grep -q '"};' src/.icons.tmp && break; done; cat src/.icons.tmp >>src/inlined-icons.h
+	@while gdk-pixbuf-csource --raw --name=dvdisaster_gtk_quit        icons/gtk-quit.png        >src/.icons.tmp; do grep -q '"};' src/.icons.tmp && break; done; cat src/.icons.tmp >>src/inlined-icons.h
+	@while gdk-pixbuf-csource --raw --name=dvdisaster_gtk_stop        icons/gtk-stop.png        >src/.icons.tmp; do grep -q '"};' src/.icons.tmp && break; done; cat src/.icons.tmp >>src/inlined-icons.h
+	@while gdk-pixbuf-csource --raw --name=dvdisaster_tooltip         icons/tooltip.png         >src/.icons.tmp; do grep -q '"};' src/.icons.tmp && break; done; cat src/.icons.tmp >>src/inlined-icons.h
+	@while gdk-pixbuf-csource --raw --name=dvdisaster_nothing         icons/nothing.png         >src/.icons.tmp; do grep -q '"};' src/.icons.tmp && break; done; cat src/.icons.tmp >>src/inlined-icons.h
+	@rm -f src/.icons.tmp
 
-help-dialogs.o: help-dialogs.c simple-md5sum
+$(BUILDTMP)/help-dialogs.o: src/help-dialogs.c simple-md5sum
 	@if test -e fingerprints.md5; \
-	then if test -e help-dialogs.h; then rm help-dialogs.h; fi; \
-	     mv inlined-icons.h inlined-icons.saved; \
-	     mv build.h build.saved; \
-	     ./simple-md5sum -b *.h *.c | sort -k2 >tmp.md5; \
+	then if test -e src/help-dialogs.h; then rm src/help-dialogs.h; fi; \
+	     ./simple-md5sum -b src/*.h src/*.c | grep -vF -e inlined-icons.h -e build.h | sort -k2 >tmp.md5; \
 	     sort -k2 < fingerprints.md5 >tmp2.md5; \
-	     mv inlined-icons.saved inlined-icons.h; \
-	     mv build.saved build.h; \
 	     if ! cmp tmp2.md5 tmp.md5 >/dev/null; \
-	     then echo "#define MODIFIED_SOURCE 1" >> help-dialogs.h; \
-	     else echo "#define UNMODIFIED_SOURCE 1" >> help-dialogs.h; \
+	     then echo "#define MODIFIED_SOURCE 1" >> src/help-dialogs.h; \
+	     else echo "#define UNMODIFIED_SOURCE 1" >> src/help-dialogs.h; \
 	     fi; \
 	     rm tmp.md5 tmp2.md5; \
-	else echo "#define MODIFIED_SOURCE 1" >> help-dialogs.h; \
+	else echo "#define MODIFIED_SOURCE 1" >> src/help-dialogs.h; \
 	fi
-	@echo "Compiling:" $*.c
-	@$(CC) $(COPTS) -c $*.c
+	@echo "Compiling:" src/help-dialogs.c
+	@$(CC) $(COPTS) -c src/help-dialogs.c -o $(BUILDTMP)/help-dialogs.o
 
-rs-encoder-sse2.o: rs-encoder-sse2.c
-	@echo "Compiling:" $*.c
-	@$(CC) $(SSE2_OPTIONS) $(COPTS) -c $*.c
+$(BUILDTMP)/rs-encoder-sse2.o: src/rs-encoder-sse2.c
+	@echo "Compiling:" src/rs-encoder-sse2.c
+	@$(CC) $(SSE2_OPTIONS) $(COPTS) -c src/rs-encoder-sse2.c -o $(BUILDTMP)/rs-encoder-sse2.o
+
+$(BUILDTMP)/rs-encoder-altivec.o: src/rs-encoder-altivec.c
+	@echo "Compiling:" src/rs-encoder-altivec.c
+	@$(CC) $(ALTIVEC_OPTIONS) $(COPTS) -c src/rs-encoder-altivec.c -o $(BUILDTMP)/rs-encoder-altivec.o
 
 locale:
 	@$(MAKE) --no-print-directory -C locale
 
-simple-md5sum: md5.c
-	@$(CC) $(COPTS) -DSIMPLE_MD5SUM md5.c -o simple-md5sum
+untranslated:
+	@$(MAKE) --no-print-directory -C locale check-untranslated
 
-# Stuff needed to generate or prepare the documentation
-# TAG: online-docs
+simple-md5sum: src/md5.c
+	@$(CC) $(COPTS) $(MUDFLAP_CFLAGS) -DSIMPLE_MD5SUM src/md5.c $(LDFLAGS) $(MUDFLAP_LFLAGS) $(MUDFLAP_LIBS) -o simple-md5sum
 
-.PHONY : images pack-images lock-images mount-php html localhtml thumbnails thumbails-lazy
+version.tex:
+	@test -d $(SRCDIR)/documentation/config || mkdir $(SRCDIR)/documentation/config
+	@echo "\\newcommand{\\projectversion}{$(VERSION)}" >$(SRCDIR)/documentation/config/version.tex
 
-documentation/images/email.png:
-	@if test -e THESE_ARE_THE_DEVEL_SOURCES; then \
-	  echo "not touching images"; \
-        else \
-	  $(MAKE) --no-print-directory -C tools; \
-	  echo -n "Unpacking images (may take a while) ... "; \
-	  cd $(SRCDIR)/documentation/images; \
-	  $(SRCDIR)/tools/pngpack -u ../images-common.pngpack >../pngpack.log; \
-	  echo -n "common "; \
-	  for i in $(DOC_LOCALES); do \
-	    (cd $(SRCDIR)/documentation/$$i/images; \
-	    $(SRCDIR)/tools/pngpack -u ../../images-$$i.pngpack -t160,../thumbnails >>../../pngpack.log  2>&1); \
-	    echo -n "$$i "; \
-	  done;  \
-	  echo "- done"; \
-        fi
+manual: version.tex
+	@echo "Producing user manual... "
+	@$(MAKE) --no-print-directory -C documentation/user-manual manual.pdf
 
-images: documentation/images/email.png
+manualclean:
+	@echo "Removing temporary user manual files... "
+	@$(MAKE) --no-print-directory -C documentation/user-manual clean
 
-lock-images:
-	@touch documentation/MAKE_SRCDIST
+manualarchclean:
+	@echo "Removing generated user manual files... "
+	@$(MAKE) --no-print-directory -C documentation/user-manual archclean
 
+codecs:
+	@echo "Producing codecs specification documentation... "
+	@$(MAKE) --no-print-directory -C documentation/codec-specs
 
-pack-images: tools/pngpack
-	@echo -n "Packing images (may take a while) ... "
-	@cd documentation/images; $(SRCDIR)/tools/pngpack -p ../images-common.pngpack *.png >../pngpack.log;
-	@for i in $(DOC_LOCALES); do \
-	  (cd documentation/$$i/images; \
-	  $(SRCDIR)/tools/pngpack -p ../../images-$${i}.pngpack *.png >>../../pngpack.log); \
-	  echo -n "$$i "; \
-	done
-	@echo "- done"
+codecsclean:
+	@echo "Removing temporary codecs specification documentation files... "
+	@$(MAKE) --no-print-directory -C documentation/codec-specs clean
 
-tools/pngpack: tools/pngpack.c
-	@$(MAKE) --no-print-directory -C tools
-
-thumbnails: pack-images
-	@echo -n "unpacking thumbnails ... "
-	@for i in $(DOC_LOCALES); do \
-	  mkdir $(SRCDIR)/documentation/temp; \
-	  if ! test -e $(SRCDIR)/documentation/$$i/thumbnails; then mkdir $(SRCDIR)/documentation/$$i/thumbnails; fi; \
-	  (cd documentation/temp; \
-	  $(SRCDIR)/tools/pngpack -u ../images-$${i}.pngpack *.png -t160,../$$i/thumbnails >>../pngpack.log); \
-	  echo -n "$$i "; \
-	  rm -rf $(SRCDIR)/documentation/temp; \
-	done
-	@echo "- done"
-
-version.php:
-	@echo "<?php" >$(SRCDIR)/documentation/include/version.php
-	@echo "\$$version=\"$(VERSION)\";" >>$(SRCDIR)/documentation/include/version.php
-	@echo "\$$pkgname=\"$(PKGNAME)\";" >>$(SRCDIR)/documentation/include/version.php
-	@echo "\$$cooked_version=\""$(CFG_FULL_VERSION)"\";" >>$(SRCDIR)/documentation/include/version.php
-	@if test -e help-dialogs.h && grep UNMODIFIED help-dialogs.h >/dev/null; \
-	then echo "\$$modified_source=0;" >>$(SRCDIR)/documentation/include/version.php; \
-	else echo "\$$modified_source=1;" >>$(SRCDIR)/documentation/include/version.php; \
-	fi
-	@echo "\$$mode=\"www\";" >>$(SRCDIR)/documentation/include/version.php
-	@echo "?>" >>$(SRCDIR)/documentation/include/version.php
-
-mount-php:
-	@if ! test -e $(PHPMOUNTDIR)/dvdisaster.de.1; then\
-	  echo "* In order to create the *.html documentation from the PHP templates";\
-	  echo "* we need to bind mount the documentation under your local Web server";\
-	  echo "* HTML document directory (as specified by configure --phpmountdir).";\
-	  echo "* You need sudo priviledges to execute the command below:";\
-	  echo ;\
-	fi
-	if ! test -e $(PHPMOUNTDIR)/dvdisaster.de.1; then\
-	  if ! test -e $(PHPMOUNTDIR); then sudo mkdir -p $(PHPMOUNTDIR); fi;\
-	  sudo mount -o bind $(SRCDIR)/documentation $(PHPMOUNTDIR) ;\
-	fi
-	make version.php
-	make thumbnails
-
-html: mount-php version.php
-	@echo -n "Producing html documentation... "
-	@if ! test -e $(SRCDIR)/documentation/wget-tmp; then \
-	  mkdir $(SRCDIR)/documentation/wget-tmp; \
-	fi
-	@cd $(SRCDIR)/documentation/wget-tmp; \
-	  wget -r -p -l 0 -nH --cut-dirs=1 --html-extension --convert-links -q http://localhost/dvdisaster/index.html
-	@$(SRCDIR)/scripts/convert-wgetted.bash $(SRCDIR)
-	@rm -rf $(SRCDIR)/documentation/wget-tmp
-	@echo "done."
-
-localhtml: mount-php version.php
-	@sed "s/www/local/" <$(SRCDIR)/documentation/include/version.php >$(SRCDIR)/documentation/include/version1.php
-	@mv $(SRCDIR)/documentation/include/version1.php $(SRCDIR)/documentation/include/version.php
-	@echo -n "Producing html documentation... "
-	@if ! test -e $(SRCDIR)/documentation/wget-tmp; then \
-	  mkdir $(SRCDIR)/documentation/wget-tmp; \
-	fi
-	@cd $(SRCDIR)/documentation/wget-tmp; \
-	  wget -r -p -l 0 -nH --cut-dirs=1 --html-extension --convert-links -q http://localhost/dvdisaster/index.html
-	@$(SRCDIR)/scripts/convert-wgetted.bash $(SRCDIR)
-	@rm -rf $(SRCDIR)/documentation/wget-tmp
-	@echo "done."
+codecsarchclean:
+	@echo "Removing generated codecs specification documentation files... "
+	@$(MAKE) --no-print-directory -C documentation/codec-specs archclean
 
 # Some usage info
 
@@ -245,12 +205,12 @@ help:
 	@echo "uninstall - uninstall dvdisaster"
 	@echo
 	@echo "Documentation related:"
-	@echo "mount-php - mount documentation sub directory"
-	@echo "www-images- create package of .php and .png files"
-	@echo "www       - create package of .php files only"
-	@echo "html      - create html version of internet documentation"
-	@echo "localhtml - create html version for local documentation"
-	@echo "thumbnails- unconditionally recreate all thumbnails"
+	@echo "manual    - create the user manual (requires LaTeX)"
+	@echo "codecs    - create the codecs spec documentation (requires LaTeX)"
+	@echo 
+	@echo "Locale related:"
+	@echo "locale    - update locale files"
+	@echo "untranslated - show untranslated German strings"
 	@echo 
 	@echo "Package maintenance:"
 	@echo "clean     - remove all easily rebuildable files"
@@ -258,8 +218,6 @@ help:
 	@echo "archclean - remove all files which are rebuildable in an development setup"
 	@echo "arch      - distclean and tar the source directory (dirty)"
 	@echo "srcdist   - produce the source distribution tarball (polished)"
-	@echo "macdist   - produce application bundle for Mac OS X"
-	@echo "windist   - produce the binary setup.exe for Windows"
 
 # Build configuration printing
 
@@ -277,8 +235,8 @@ show:
 	@echo "LOCALEDIR    = " $(LOCALEDIR)
 	@echo "DOCDIR       = " $(DOCDIR)
 	@echo "DOCSUBDIR    = " $(DOCSUBDIR)
-	@echo "PHPMOUNTDIR  = " $(PHPMOUNTDIR)
 	@echo "BUILDROOT    = " $(BUILDROOT)
+	@echo "BUILDTMP     = " $(BUILDTMP)
 	@echo
 	@echo "INTL_INCL    = " $(INTL_INCL)
 	@echo "INTL_LFLAGS  = " $(INTL_LFLAGS)
@@ -290,11 +248,12 @@ show:
 	@echo "EFENCE_LIBS  = " $(EFENCE_LIBS)
 	@echo
 	@echo "SYS_OPTIONS  = " $(SYS_OPTIONS)
-	@echo "EXE_SUFFIX   = " $(EXE_SUFFIX)
+	@echo "SYS_NAME     = " $(SYS_NAME)
 	@echo "HAVE_OPTIONS = " $(HAVE_OPTIONS)
 	@echo "WITH_OPTIONS = " $(WITH_OPTIONS)
 	@echo "OTHER_OPTIONS= " $(OTHER_OPTIONS)
 	@echo "SSE2_OPTIONS = " $(SSE2_OPTIONS)
+	@echo "ALTIVEC_OPTIONS= " $(ALTIVEC_OPTIONS)
 	@echo
 	@echo "CFLAGS       = " $(CFLAGS)
 	@echo "COPTS        = " $(COPTS)
@@ -306,46 +265,28 @@ show:
 ######################################################################
 
 .PHONY : install uninstall clean distclean arch
-.PHONY : www www-images 
-.PHONY : srcdist macdist windist
+.PHONY : srcdist dist
 
-install: dvdisaster images
+install: dvdisaster manual
 	@echo "Installing package..."
 	install -d $(BUILDROOT)$(BINDIR)
-	install dvdisaster$(EXE_SUFFIX) $(BUILDROOT)$(BINDIR)
+	install dvdisaster $(BUILDROOT)$(BINDIR)
 	install -d $(BUILDROOT)$(DOCSUBDIR)
 	install -m 644 CHANGELOG $(BUILDROOT)$(DOCSUBDIR)
 	install -m 644 COPYING $(BUILDROOT)$(DOCSUBDIR)
 	install -m 644 CREDITS* $(BUILDROOT)$(DOCSUBDIR)
 	install -m 644 README.MODIFYING $(BUILDROOT)$(DOCSUBDIR)
 	install -m 644 TODO $(BUILDROOT)$(DOCSUBDIR)
-	for i in $(DOC_LOCALES); do \
-	  install -d $(BUILDROOT)$(DOCSUBDIR)/$$i; \
-	  (cd documentation; install -m 644 $$i/*.html $(BUILDROOT)$(DOCSUBDIR)/$$i); \
-	  install -d $(BUILDROOT)$(DOCSUBDIR)/$$i/images; \
-	  (cd documentation/$$i; install -m 644 images/*.png $(BUILDROOT)$(DOCSUBDIR)/$$i/images); \
-	  install -d $(BUILDROOT)$(DOCSUBDIR)/$$i/thumbnails; \
-	  (cd documentation/$$i; install -m 644 thumbnails/*.png $(BUILDROOT)$(DOCSUBDIR)/$$i/thumbnails); \
-	done
-	install -d $(BUILDROOT)$(DOCSUBDIR)/images
-	cd documentation; install -m 644 images/*.png $(BUILDROOT)$(DOCSUBDIR)/images
-#	cd documentation; install -m 644 images/*.jpg $(BUILDROOT)$(DOCSUBDIR)/images
-	install -d $(BUILDROOT)$(DOCSUBDIR)/include
-	cd documentation; install -m 644 include/*.css $(BUILDROOT)$(DOCSUBDIR)/include
+	install -d $(BUILDROOT)$(DOCSUBDIR)
+	(cd documentation/user-manual; install -m 644 manual.pdf $(BUILDROOT)$(DOCSUBDIR))
 	install -d $(BUILDROOT)$(MANDIR)/man1
-	install -d $(BUILDROOT)$(MANDIR)/cs/man1
 	install -d $(BUILDROOT)$(MANDIR)/de/man1
-	install -d $(BUILDROOT)$(MANDIR)/it/man1
 	cd documentation; \
 	  ESCAPED_DOCSUBDIR=`echo $(DOCSUBDIR) | sed -e 's/\//\\\\\//g'`; \
-	  sed "s/%docdir%/$$ESCAPED_DOCSUBDIR\/en/" <dvdisaster.en.1 >dvdisaster.updated; \
+	  sed "s/%docdir%/$$ESCAPED_DOCSUBDIR/" <dvdisaster.en.1 >dvdisaster.updated; \
 	  install -m 644 dvdisaster.updated $(BUILDROOT)$(MANDIR)/man1/dvdisaster.1; \
-	  sed "s/%docdir%/$$ESCAPED_DOCSUBDIR\/cs/" <dvdisaster.cs.1 >dvdisaster.updated; \
-	  install -m 644 dvdisaster.updated $(BUILDROOT)$(MANDIR)/cs/man1/dvdisaster.1; \
-	  sed "s/%docdir%/$$ESCAPED_DOCSUBDIR\/de/" <dvdisaster.de.1 >dvdisaster.updated; \
+	  sed "s/%docdir%/$$ESCAPED_DOCSUBDIR/" <dvdisaster.de.1 >dvdisaster.updated; \
 	  install -m 644 dvdisaster.updated $(BUILDROOT)$(MANDIR)/de/man1/dvdisaster.1; \
-	  sed "s/%docdir%/$$ESCAPED_DOCSUBDIR\/en/" <dvdisaster.it.1 >dvdisaster.updated; \
-	  install -m 644 dvdisaster.updated $(BUILDROOT)$(MANDIR)/it/man1/dvdisaster.1; \
 	  rm dvdisaster.updated
 	if echo $(WITH_OPTIONS) | grep "NLS_YES" >/dev/null; then \
 	  cd locale; \
@@ -357,20 +298,20 @@ install: dvdisaster images
 	@echo "# dvdisaster uninstaller script" > $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
 	@echo "# Usage: sh dvdisaster-uninstall.sh" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
 	@echo >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
-	@echo "rm -f $(BINDIR)/dvdisaster $(BINDIR)/dvdisaster.exe $(BINDIR)/dvdisaster-win.exe $(BINDIR)/dvdisaster-uninstall.sh" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
+	@echo "rm -f $(BINDIR)/dvdisaster $(BINDIR)/dvdisaster-uninstall.sh" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
 	@echo "rm -rf $(DOCSUBDIR)" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
-	@echo "rm -f $(MANDIR)/man1/dvdisaster.1" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
 	@for i in $(PO_LOCALES); do \
 	  echo "rm $(LOCALEDIR)/$$i/LC_MESSAGES/dvdisaster.mo" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh ; \
 	done
+	@echo "rm -f $(MANDIR)/man1/dvdisaster.1" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
 	@for i in $(MAN_LOCALES); do \
 	  echo "rm $(MANDIR)/$$i/man1/dvdisaster.1" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh ; \
 	done
 	@echo "echo \"dvdisaster has been uninstalled.\"" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
-	
+
 uninstall:
 	@echo "Uninstalling package..."
-	rm -f $(BINDIR)/dvdisaster $(BINDIR)/dvdisaster.exe $(BINDIR)/dvdisaster-win.exe $(BINDIR)/dvdisaster-uninstall.sh
+	rm -f $(BINDIR)/dvdisaster $(BINDIR)/dvdisaster-uninstall.sh
 	rm -rf $(DOCSUBDIR)
 	rm -f $(MANDIR)/man1/dvdisaster.1
 	for i in $(PO_LOCALES); do \
@@ -382,135 +323,52 @@ uninstall:
 
 archclean: distclean
 	@echo "Removing rebuildable documentation parts"
-	@for i in $(DOC_LOCALES); do \
-	   rm -f documentation/$$i/*.html; \
-	   rm -f documentation/$$i/thumbnails/*.png; \
-	done
+	@$(MAKE) --no-print-directory -C $(SRCDIR)/documentation/codec-specs archclean
+	@$(MAKE) --no-print-directory -C $(SRCDIR)/documentation/user-manual archclean
 
 distclean: clean
 	@echo "Removing configuration files"
-	@rm -f configure.log Makefile.config GNUmakefile locale/Makefile
+	@rm -f configure.log Makefile.config src/build.h GNUmakefile locale/Makefile
 	@for i in locale/?? locale/??_??; do rm -rf $$i; done
-	@echo "all:" >>GNUmakefile
-	@echo -e "\t@echo" >>GNUmakefile
-	@echo -e "\t@echo \"Please create a Makefile by entering \\\"bash configure\\\" first\"" >>GNUmakefile
-	@echo -e "\t@echo" >>GNUmakefile
-	@if test -e tools/Makefile.config; then $(MAKE) --no-print-directory -C tools distclean; fi
+
+# There might be a not executable simple-md5sum from a compiler run
+# under a different architecture, so make sure we have a working binary
+# in the clean target.
 
 clean:
 	@echo "Removing rebuildable files"
-	@rm -rf *.o medium.* dvdisaster simple-md5sum *.exe *.zip .dvdisaster core core.* *.core *.stackdump
-	@rm -f inlined-icons.h help-dialogs.h
-	@rm -f wininst/installer.iss wininst/signature
-	@if test -e win-build-dir; then rm -rf win-build-dir; fi
-	@rm -rf macinst/.dvdisaster.app macinst/dvdisaster.app macinst/dvdisaster.app.zip macinst/dvdisaster.bundle
+	@rm -rf *.o $(BUILDTMP)/*.o medium.* abbild.* dvdisaster .dvdisaster core core.* *.core
+	@rm -f src/inlined-icons.h src/help-dialogs.h
 	@find . -name \*\~ -print | xargs rm -f;
 	@find . -name \*.mo -print | xargs rm -f;
 	@find . -name \#\*\# -print | xargs rm -f;
-	@if test -e THESE_ARE_THE_DEVEL_SOURCES && ! test -e documentation/MAKE_SRCDIST; then rm -f documentation/images-*.pngpack documentation/thumbnails-*.pngpack; fi
-	@rm -f documentation/pngpack.log
-	@rm -f documentation/include/version.php
-	@rm -rf documentation/wget-tmp
-	@if test -e tools/Makefile.config; then $(MAKE) --no-print-directory -C tools clean; fi
+	@rm -f documentation/config/version.tex
 	@if test -e $(PKGNAME); then rm -rf $(PKGNAME); fi
 	@if test -e ~/.dvdisaster-original-author; then \
 	  mv build.h build.saved ;\
-	  md5sum -b *.h *.c >fingerprints.md5 ;\
+	  if ! test -x simple-md5sum || ! ./simple-md5sum >/dev/null 2>&1; then \
+	    rm -f simple-md5sum; \
+	    $(MAKE) --no-print-directory simple-md5sum; \
+	    echo "[simple-md5sum (re-)built]"; \
+	  fi; \
+	  ./simple-md5sum -b src/*.h src/*.c >fingerprints.md5 ;\
 	  mv build.saved build.h; \
 	fi
-	@if test -e $(SRCDIR)/papers; then \
-	  $(MAKE) --no-print-directory -C papers clean; \
-	fi
+	@rm -f simple-md5sum
+	@$(MAKE) --no-print-directory -C $(SRCDIR)/documentation/codec-specs clean;
+	@$(MAKE) --no-print-directory -C $(SRCDIR)/documentation/user-manual clean;
+	@$(MAKE) --no-print-directory -C $(SRCDIR)/locale clean;
 
-BUILD=`grep BUILD $(SRCDIR)/build.h | cut -d ' ' -f 3`
-arch:	archclean time-stamp
-	@cd .. ; tar -c -z -f $(PKGNAME)-$(BUILD).tgz $(PKGNAME)
-
-# TAG: online-docs
-www:   version.php
-	@cd documentation ; \
-	tar cjf ../../www.tar.bz2 pubkey.asc index.html include/dvdisaster.css de/*.html en/*.html ru/*.html
-
-www-images: thumbnails version.php
-	@cd documentation ; \
-	tar cjf ../../www.tar.bz2 pubkey.asc index.html include/dvdisaster.css  de/*.html en/*.html ru/*.html images/*.png de/images/*.png de/thumbnails/*.png en/images/*.png en/thumbnails/*.png ru/images/*.png ru/thumbnails/*.png
+BUILD=`grep BUILD $(SRCDIR)/src/build.h | cut -d ' ' -f 3`
+arch:	archclean build.h
+	@cd .. ; tar -c -z -f $(TAR_PREFIX)/$(PKGNAME)-$(BUILD).tgz $(PKGNAME)
 
 INSTALL: documentation/install.template
 	@sed "s/@@PKGNAME/$(PKGNAME)/" <documentation/install.template >INSTALL
 
-srcdist: INSTALL localhtml lock-images clean distclean 
-	@rm -f documentation/MAKE_SRCDIST
-	@cd .. ; tar -c -j -X $(PKGNAME)/NODIST -f $(PKGNAME).tar.bz2 $(PKGNAME)
-	@cd .. ; gpg --default-key 091ad320 --detach-sign --output $(PKGNAME).tar.bz2.gpg --armor $(PKGNAME).tar.bz2 
-	@rm -f documentation/images-*.pngpack
+srcdist: INSTALL distclean manual manualclean codecsclean
+	@cd .. ; tar -c -j -X $(PKGNAME)/NODIST -f $(TAR_PREFIX)/$(PKGNAME).tar.bz2 $(PKGNAME)
+	@cd .. ; gpg --homedir .gnupg --default-key 758BCC23 --detach-sign --output $(TAR_PREFIX)/$(PKGNAME).tar.bz2.gpg --armor $(TAR_PREFIX)/$(PKGNAME).tar.bz2 
 
-prepare-dist:
-	@if test -e win-build-dir; then rm -rf win-build-dir; fi
-	@mkdir win-build-dir
-	@mkdir win-build-dir/documentation
-	@cp -r CHANGELOG COPYING CREDITS* README.MODIFYING TODO dvdisaster.exe dvdisaster-win.exe win-build-dir
-	@head --bytes=20 dvdisaster.exe >win-build-dir/signature
-	@cp wininst/*.bmp win-build-dir
-	@cp documentation/pubkey.asc win-build-dir/documentation
-	@for i in $(DOC_LOCALES); do \
-	  mkdir win-build-dir/documentation/$$i; \
-	  cp documentation/$$i/*.html win-build-dir/documentation/$$i; \
-	done
-	@mkdir win-build-dir/documentation/images
-	@mkdir win-build-dir/documentation/include
-	@cp documentation/include/*.css win-build-dir/documentation/include
-	@cp tools/pngpack.exe win-build-dir/documentation
-	@mv documentation/images-*.pngpack win-build-dir/documentation
-	@cp $(GTK_BINDIR)/libglib*.dll win-build-dir
-	#@cp $(GTK_BINDIR)/iconv.dll win-build-dir
-	@cp $(GTK_BINDIR)/intl.dll win-build-dir
-	@cp $(GTK_BINDIR)/libatk*.dll win-build-dir
-	@cp $(GTK_BINDIR)/libcairo*.dll win-build-dir
-	@cp $(GTK_BINDIR)/libexpat*.dll win-build-dir
-	@cp $(GTK_BINDIR)/libfontconfig*.dll win-build-dir
-	@cp $(GTK_BINDIR)/freetype6*.dll win-build-dir
-	@cp $(GTK_BINDIR)/libpango*.dll win-build-dir
-	@cp $(GTK_BINDIR)/libpng12*.dll win-build-dir
-	@cp $(GTK_BINDIR)/libgmodule*.dll win-build-dir
-	@cp $(GTK_BINDIR)/libgobject*.dll win-build-dir
-	@cp $(GTK_BINDIR)/libgthread*.dll win-build-dir
-	@cp $(GTK_BINDIR)/libgdk_pixbuf*.dll win-build-dir
-	@cp $(GTK_BINDIR)/libgio*.dll win-build-dir
-	@cp $(GTK_BINDIR)/libgdk-win*.dll win-build-dir
-	@cp $(GTK_BINDIR)/libgtk-win*.dll win-build-dir
-	@cp $(GTK_BINDIR)/zlib1*.dll win-build-dir
-	@mkdir win-build-dir/locale
-	@cp -r locale/?? win-build-dir/locale
-	@cp -r locale/??_?? win-build-dir/locale
-
-	@mkdir -p win-build-dir/etc/gtk-2.0
-	@echo "# GdkPixbuf Image Loader Modules file" >  win-build-dir/etc/gtk-2.0/gdk-pixbuf.loaders
-
-	#@mkdir -p win-build-dir/etc/pango
-	#@cp $(GTK_BINDIR)/../etc/pango/pango.aliases win-build-dir/etc/pango
-	#@echo "# Pango Modules file" > win-build-dir/etc/pango/pango.modules
-	#@echo "#" >> win-build-dir/etc/pango/pango.modules
-	#@echo "pango-basic-win32.dll BasicScriptEngineWin32 PangoEngineShape PangoRenderWin32 common:" >> win-build-dir/etc/pango/pango.modules
-	#@cp $(GTK_BINDIR)/../lib/pango/1.?.?/modules/pango-basic-win32.dll win-build-dir
-
-	@mkdir -p win-build-dir/share/locale
-	@for i in $(PO_LOCALES); do \
-	  mkdir -p win-build-dir/share/locale/$$i/LC_MESSAGES; \
-	  cp $(GTK_BINDIR)/../share/locale/$$i/LC_MESSAGES/atk*.mo win-build-dir/share/locale/$$i/LC_MESSAGES; \
-	  cp $(GTK_BINDIR)/../share/locale/$$i/LC_MESSAGES/glib*.mo win-build-dir/share/locale/$$i/LC_MESSAGES; \
-	  cp $(GTK_BINDIR)/../share/locale/$$i/LC_MESSAGES/gtk*.mo win-build-dir/share/locale/$$i/LC_MESSAGES; \
-	done
-
-windist: dvdisaster pack-images prepare-dist
-	@sed 's/dvdisaster-%version%/$(PKGNAME)/' <wininst/installer.template >wininst/installer.iss
-	@iscc wininst/installer.iss
-
-macdist: 
-	@if test $(JHBUILD_PREFIX)x == "x"; then \
-	  echo "Building the app bundle only works in a jhbuild shell."; \
-	  exit 1; \
-	fi
-	@rm -rf macinst/dvdisaster.app macinst/.dvdisaster.app
-	@sed 's!%srcdir%!$(SRCDIR)!' <macinst/dvdisaster.bundle.template >macinst/dvdisaster.bundle
-	@ige-mac-bundler macinst/dvdisaster.bundle
-	@(cd macinst; zip -r dvdisaster.app.zip dvdisaster.app) 
+static: dvdisaster
+	$(CC) $(LOPTS) $(OFILES) $(LIBS) -pthread -static -o dvdisaster-static

INSTALL

@@ -9,13 +9,10 @@ Contents
 1.2 Gtk+ and localozation support
 
 2. Operating system specific issues
-2.1 Windows
-2.1.1 Getting the GNU environment for Windows
-2.2 Mac OS X / Darwin
-2.3 FreeBSD
-2.3.1 Loading the atapicam kernel module by hand
-2.3.2 (Optionally) loading the atapicam kernel module permanently
-2.3.3 (Optionally) recompiling the kernel
+2.1 FreeBSD
+2.1.1 Required packages
+2.2 NetBSD
+2.2.1 Required packages
 
 3. Compiling the source code
 3.1 Unpacking the source code archive
@@ -26,7 +23,10 @@ Contents
 4.1 Installation of the program
 4.2 Removing an installation
 
-5. Program documentation
+5 Running the program
+5.1 Program documentation
+5.2 FreeBSD hints
+5.3 NetBSD hints
 
 =======================================================
 
@@ -38,100 +38,63 @@ Contents
 
 dvdisaster requires the usual GNU development tools for compiling 
 C programs. You must have gcc, GNU make, the bash shell and the
-GNU fileutils and textutils packages installed. Other versions
-of these tools will not work and patches for them will not be accepted.
+GNU fileutils and textutils packages installed.
+Using other compilers and tools is currently not tested,
+recommended or supported in any way. Patches for them will
+not be accepted.
 
 FreeBSD, Linux and NetBSD typically come with suitable packages on 
 their installation media. Sometimes these packages are not installed
 completely by default; you may need to install their development versions
 also. The additional packages are usually suffixed with "-devel" or "-dev".
 
+See Section 3.2 for information on configuring the build process,
+and for specifying the compiler.
+
+
 1.2 Gtk+ and localization support
 ---------------------------------
 
 Depending on your operating system you will also need:
 
 - The gettext library			http://www.gnu.org/software/gettext/
-- The iconv library (only for Windows)	http://www.gnu.org/software/libiconv/
 - The pkgconfig tool			http://www.freedesktop.org/software/pkgconfig/releases
 - The GTK+ library version 2.2 or better,    http://www.gtk.org
   including all auxiliary libraries.
 
-Again, the freeware Unices should have suitable packages on their distribution media.
+Again, the supported Unices should have suitable packages on their distribution media.
 
 
 2. Operating system specific issues
 ===================================
 
-2.1 Windows
+2.1 FreeBSD
 -----------
 
-2.1.1 Getting the GNU environment for Windows
+2.1.1 Required packages
 
-For Windows the GNU tools are available in the MingW framework: 
-See http://www.mingw.org.
-Building under Cygwin is not supported.
+For your convenience, building dvdisaster required
+the following packages under FreeBSD 10.1:
 
-The Gtk+ project offers pre-compiled Windows versions of their libraries;
-see http://www.gimp.org/~tml/gimp/win32/downloads.html for details.
-You'll need both the normal and "-devel" versions of the libraries. 
+# pkg install bash
+# pkg install gmake
+# pkg install gettext
+# pkg install gcc
+# pkg install pkgconf
+# pkg install gtk2
 
+2.2 NetBSD
+----------
 
-2.2 Mac OS X / Darwin
----------------------
+2.2.1 Required packages
 
-dvdisaster was ported by Julian Einwag to Darwin, 
-the Unix foundation of Mac OS X. 
+For your convenience, building dvdisaster required
+the following packages under NetBSD 9.0:
 
-Currently dvdisaster needs to be built and run as an X11 application under Mac OS X;
-see http://developer.apple.com/opensource/tools/runningX11.html for more information.
-
-An Aqua compatible version of the Gtk+ library is under development, but not
-yet stable. As soon as this changes, dvdisaster will be able to run under
-Mac OS X without using X11.
-
-
-2.3 FreeBSD
------------
-
-2.3.1 Loading the atapicam kernel module by hand (tested on FreeBSD 7.1)
-
-FreeBSD does not pre-install an uniform CD-ROM driver for SCSI and ATAPI drives 
-(as is the case in Linux and Windows). Therefore dvdisaster can not
-use any ATAPI drives in an out-of-the-box FreeBSD installation. 
-
-To manually load the required kernel module, do:
-
-root@freebsd# kldload atapicam
-
-Use the follwing command to see if any CD/DVD/BD drives became
-available:
-
-root@freebsd# camcontrol devlist
-<NAME OF YOUR DRIVE>                at scbus1 target 0 lun 0 (pass0,cd0)
-
-
-2.3.2 (Optionally) loading the atapicam kernel module permanently
-
-If the above step works you can load the kernel module at boot 
-time by adding the line
-
-atapicam_load="YES"
-
-at the end of /boot/loader.conf.local
-
-
-
-2.3.3 (Optionally) recompiling the kernel
-
-If the atapicam kernel module is not available (check the contents
-of /boot/kernel) you will need to recompile the kernel with the following 
-additional device line in the kernel configuration:
-
-device atapicam
-
-The devices ata, scbus, cd, and pass are also required, 
-but are included by default in FreeBSD 6.0 and later.
+# pkg_add bash
+# pkg_add gmake
+# pkg_add pkg-config
+# pkg_add gtk2+
 
 
 3. Compiling the source code
@@ -148,11 +111,11 @@ Please change into a directory which is writeable
 for you and unpack the source code archive:
 
 user@host> cd /var/tmp
-user@host> tar xjf dvdisaster-0.72.1.tar.bz2
+user@host> tar xjf dvdisaster-0.79.6.tar.bz2
 
 Then change into the newly created directory:
 
-user@host> cd /var/tmp/dvdisaster-0.72.1
+user@host> cd /var/tmp/dvdisaster-0.79.6
 
 3.2. Configuring the package
 ----------------------------
@@ -164,6 +127,11 @@ Call the configuration script in the usual way:
 
 user@host> ./configure
 
+If you want to build a CLI-only version, which doesn't depend
+on the gtk2 libraries, you can run instead:
+
+user@host> ./configure --with-cli-only
+
 The script will possibly print some errors about missing libraries.
 Type "configure --help" to learn about pointing configure 
 to the correct path of already installed libraries.
@@ -172,10 +140,21 @@ The "--help" option will also give information about some
 options which are useful if you plan to install the package
 to a certain location.
 
-Please note that the ==buildroot=DIR option is mainly useful for
+Please note that the --buildroot=DIR option is mainly useful for
 package maintainers, but will mess up things when trying a direct
 install via "make install".
 
+If your gcc compiler resides in an unusual place, specify it
+by setting the CC environment variable for the ./configure
+script. Example (may be helpful for FreeBSD):
+
+CC=/usr/local/bin/gcc48 ./configure
+
+Please note that changing CC at a later time, e.g. when doing
+the make step, has no effect.
+
+After ./configure has been run, do a "make show" to review
+the settings obtained by the configuration.
 
 3.3 Compiling the package
 -------------------------
@@ -190,23 +169,17 @@ On some systems, GNU make must be invoked as "make".
 Invoke the program for a quick test:
 
 user@linux> ./dvdisaster
-user@windows>./dvdisaster-win
 
 After a short moment the main window should open an the program
 is ready for use. Working with the program from the current 
 directory (e.g. without installation) is okay.
 
-On windows two program version are provided as it is not possible
-to have the same binary operate in command line and window mode
-there. dvdisaster.exe is the command line version, while
-dvdisaster-win.exe provides the graphical user interface.
-
 
 4. Installation
 ===============
 
 4.1 Installation of the program
-===============================
+-------------------------------
 
 To install the program and documentation permanently
 on your system, become root and do:
@@ -219,7 +192,7 @@ Enter "bash configure --help" to get information on changing the installation
 paths.
 
 4.2. Removing an installation
-=============================
+-----------------------------
 
 During the installation process a shell script is created
 which can be used to remove dvdisaster from your system:
@@ -231,17 +204,59 @@ please remove the directory you have created as described
 in section 3.1:
 
 user@host> cd /var/tmp
-user@host> rm -rf dvdisaster-0.72.1
+user@host> rm -rf dvdisaster-0.79.6
 
+5. Running the program
+======================
 
-5. Program documentation
-========================
+5.1 Program documentation
+-------------------------
 
 The online documentation is located in the
-sub directory documentation/en. 
+sub directory documentation/manual.pdf
 You can also press the respective toolbar button 
 in dvdisaster to view the online docs.
 
+5.2 FreeBSD hints
+-----------------
+
+Running as an unpriviledged user
+
+If you want to run dvdisaster as an unpriviledged
+user (which is recommended), make sure that the
+respective user is member of the "operator" group
+and that he has read _and_ write permission on the
+optical drive, e.g. /dev/pass1.
+
+Use camcontrol to find out which passthrough device
+is assigned to your drive:
+
+root@freebsd# camcontrol devlist
+<NAME OF YOUR DRIVE>  at scbus1 target 0 lun 0 (pass0,cd0)
+
+
+Avoid copy-on-write filesystems
+
+dvdisaster assumes that ISO images are laid out
+sequentially on the hard disk, and that it can
+rewrite sectors in place. Therefore avoid
+processing images on ZFS volumes, as reading and
+recovering defective images may lead to serious
+fragmentation and performance hits.
+
+
+5.3 NetBSD hints
+----------------
+
+Running as an unpriviledged user
+
+If you want to run dvdisaster as an unpriviledged
+user (which is recommended), make sure that the
+respective user is member of the "operator" group
+and that he has read _and_ write permission on the
+optical drive, e.g. /dev/rcd0d.
+
+
 
 Enjoy using dvdisaster!
 

Makefile

@@ -4,8 +4,12 @@
 
 all:
 	@echo
-	@echo "dvdisaster requires GNU make to build."
-	@echo "Please try your command again using gmake."
+	@echo "Please run \`./configure' first."
+	@echo
+	@echo "To build a CLI-only version, run `./configure --with-cli-only'."
+	@echo
+	@echo "Note that dvdisaster requires GNU make to build."
+	@echo "Under non-Linux systems, it might be known as \`gmake'."
 	@echo
 
 show: all

README

@@ -2,9 +2,7 @@ This directory tree contains dvdisaster,
 a tool providing additional ECC protection for optical media.
 
 This version of dvdisaster supports the following platforms:
-Linux, FreeBSD, NetBSD on x86, PowerPC, Sparc;
-Mac OSX on x86 and PowerPC;
-Windows 98, ME, 2000, 2003, XP on x86 compatible hardware. 
+Linux, FreeBSD, NetBSD on x86, PowerPC, and Sparc.
 
 
 Roadmap of contained files
@@ -67,12 +65,3 @@ locale
 scripts
 	Scripts needed for configuring and building dvdisaster are 
 	located in the "scripts" directory.
-
-tools
-	Auxiliary programs for the build and packaging process reside
-	in "tools".
-
-wininst
-	Additional files needed for building the Windows distribution.
-
-

README.CVS

@@ -1,32 +0,0 @@
-Development releases of dvdisaster are made available 
-via CVS on SourceForge.
-
-You can check them out via anonymous pserver access, e.g.:
-
-cvs -z3 -d:pserver:anonymous@dvdisaster.cvs.sourceforge.net:/cvsroot/dvdisaster checkout dvdisaster
-
-WARNING: Development releases must be considered UNSTABLE.
-
-Especially, development versions may:
-
-- NOT be downward compatible with past releases
-- NOT be upward compatible with future releases
-- NOT correctly recover an image
-- DAMAGE processed images to a point beyond recoverability
-
-Do not keep image and/or error correction files created by 
-development releases for permanent storage.
-
-
-Release name scheme
--------------------
-
-Even numbers (0.70, 0.72, ...) are stable releases.
-Odd numbers  (0.71, 0.73, ...) are development releases.
-
-CVS releases are tagged using the following scheme:
-
-release-0-70	: stable releases
-patch-0-70-1	: minor upgrade, also considered stable
-devel-0-71-1	: development release, see notes above
-rc-0-71-1       : release candidate, may still be unstable

README.md

@@ -0,0 +1,82 @@
+# :cd: What is dvdisaster?
+
+**dvdisaster** provides additional [ECC](https://en.m.wikipedia.org/wiki/Error_correction_code) protection for optical media. If a medium gets damaged, dvdisaster can recover it as long as the amount of damage is smaller than the amount of ECC data you added to protect it.
+
+It can loosely be compared to [.par2](https://en.m.wikipedia.org/wiki/Parchive) files, but the protection works at the *iso* level instead of working at the file level. This way, even if metadata from the optical medium filesystem is damaged, dvdisaster can still work flawlessly.
+
+Please refer to the [PDF manual](documentation/user-manual/manual.pdf) for more information.
+
+# :wrench: Unofficial version
+
+The last upstream version by Carsten Gnörlich is dated 2017, and could be found on the [official](https://web.archive.org/web/20180428070843/http://dvdisaster.net/en/index.html) [website](https://web.archive.org/web/20180509154525/http://dvdisaster.org/en/index.html) which is [now](http://www.dvdisaster.net) [down](http://www.dvdisaster.org). The original source code [repository](https://sourceforge.net/projects/dvdisaster/files/dvdisaster) doesn't have it, but [Debian sources](https://sources.debian.org/src/dvdisaster/) does, thanks to the maintainer there.
+The original [README](README) has been left untouched in this repository.
+This version is built on top of the latest upstream version, with the following notable enhancements:
+
+- Added pre-defined sizes for BD-R Triple Layer (100GB), BD-R Quadruple Layer (128GB)
+- Added an option to use more space for ECC on BD-R
+- Windows build supported again (it was dropped upstream a few versions back)
+- A new CLI-only version, not depending on gtk (`./configure --with-cli-only && make clean && make -j4`)
+- Non-regression tests on each code change, for Linux64 and Windows32/64, CLI and GUI versions
+- Prebuilt binaries for Windows32, Windows64, Linux64 (static builds and AppImage builds), CLI and GUI versions
+- Fixed a bunch of (minor) quirks, a few (minor) bugs, added a couple (minor) features
+
+Please refer to the [CHANGELOG](CHANGELOG) for all the details.
+
+:loudspeaker: This version will never break compatibility with upstream versions, the goal is to ensure an optical media protected by upstream dvdisaster will still be able to be repaired with this version 10+ years from now. Regression tests are here to ensure this is the case.
+
+## :twisted_rightwards_arrows: Choose between 3 protection modes ("codecs")
+
+:one: **RS01** creates error correction files which are stored separately from the image they belong to.
+The artefact is an **ecc** file, which must be stored on another media than the one we're protecting.
+
+:two: **RS02** creates error correction data which is added to the medium to protect, we call this *augmenting* the image we're protecting. Damaged sectors in the error correction information reduce the data recovering capacity, but do not make recovery impossible - a second medium for keeping or protecting the error correction
+information is not required.
+
+:three: **RS03** is a further development of RS01 and RS02. It can create both error correction files and
+augmented images, with the following added features:
+
+- RS03 can use multiple CPU cores and is therefore **much** faster than RS01/RS02 on modern hardware.
+- RS03 error correction files are - contrary to RS01, and to a lesser extent RS02 - robust against damage.
+- RS03 is more robust, but also more restrictive: The augmented image must completely fill the medium now while the size of augmented images can be freely chosen in RS02.
+  The changes for parallel computation and higher robustness make RS03 a bit less space efficient,
+  e.g. RS03 error correction data has slighly less (around -3%) error correction capacity than its RS01/RS02 counterparts on images with equal size.
+
+Rough comparison table:
+
+| Codecs           |              RS01              |              RS02              |              RS03              |
+|------------------|--------------------------------|--------------------------------|--------------------------------|
+| Robustness\*     | :star:                         | :star::star::star:             | :star::star::star::star::star: |
+| Speed            | :star::star:                   | :star:                         | :star::star::star::star::star: |
+| Space efficiency | :star::star::star::star::star: | :star::star::star::star::star: | :star::star::star::star:       |
+| Augmented images | :x:                            | :heavy_check_mark:             | :heavy_check_mark:             |
+| Separate files   | :heavy_check_mark:             | :x:                            | :heavy_check_mark:             |
+
+\*Robustness against corruption of the dvdisaster-added ECC parts themselves
+
+# :bulb: Rationale
+
+Even if the optical media era is sunsetting now, and has been for a few years, it's still of some value for off-site backups. In any case, we still have media in our hands that we want to be able to repair, should it be damaged, during the next years/decades. Repairing is actually pretty much the very reason of dvdisaster existence (as long as parity data has been added, of course).
+The idea of this unofficial version is to ensure dvdisaster doesn't get hard to find, use or compile, should upstream development never resume (we hope it does!).
+This is also why precompiled Windows binaries and a precompiled static CLI-only Linux version are available here.
+
+# :hammer: Compiling
+
+See the [INSTALL](INSTALL) file. The [workflow file](.github/workflows/release.yml) that is used to automatically build binaries for each release can also help.
+
+# :camera: Screenshots
+
+### Scanning a damaged CD under Windows
+
+![dvdisaster_damaged_cd](https://user-images.githubusercontent.com/218502/91434313-edaaf880-e864-11ea-8e41-7b58a1e97a70.PNG)
+
+### Scanning a healthy BD-R (single layer) with Linux GUI
+
+![dvdisaster_bdr_read](https://user-images.githubusercontent.com/218502/91436728-fbfb1380-e868-11ea-8444-04ebc60809d8.PNG)
+
+### Creating an RS03 error correction file with Linux GUI
+
+![dvdisaster_bdr_create](https://user-images.githubusercontent.com/218502/91436740-00273100-e869-11ea-837a-af0d0733fe87.PNG)
+
+### Verifying a BD-R image with Linux GUI
+
+![dvdisaster_bdr_verify](https://user-images.githubusercontent.com/218502/91436731-fc93aa00-e868-11ea-93e6-b8c277620df7.PNG)

TODO

@@ -1,30 +1,63 @@
 
-To do/ Release schedule
+Tentative to do/ release schedule
 
-Version 0.73/0.74: 
-- update tool chain for Windows version
-- find workarounds for the GTK+/Mac OS glitches
-- clean up source code in some places
-- add pause/resume button
-- optionally pause after n read errors for drives which
-  need to cool down 
-- add function for stripping RS02 data from image
-- don't create unusable images when RS02 encoding is aborted
-- add quiet option for command line mode
-- display estimated finishing time for encoding/decoding
-- catch up with many other queued up suggestions
-
-Version 0.79/0.80: new RS03 codec
+Version 0.79: new RS03 codec (encoding part)
  - lots of speed optimizations in error correction data encoding
  - multithreaded / multicore processor support
+ - add missing functionality, e.g. adaptive reading
+ 0.79.5: project re-launch
+ 0.79.6: re-introduce CRC and MD5 caching between reading
+         and ecc creation; cosmetical changes
+ 0.79.7: re-introduce adaptive reading [partly done in pl4]
 
-Unspecified / later releases
+Version 0.80: milestone release
+ - RS03 encoding considered feature complete
 
-- provide a function for searching directories for suitable .ecc files 
-  for the current image
+Version 0.81:
+ - multithreaded decoding (error correction/repair) 
+   for RS01/RS02/RS03
+ - RS01 encoding (not decoding of course) will be
+   removed as RS03 fully replaces it
 
-- add real UDF parsing to udf.c 
-  (currently only the backward compatibility ISO structures are used)
+Version 0.82: milestone release
+ - RS03 decoding considered feature complete
 
-- provide a command line only version (without linkage against GTK+);
-  this is non-trivial.
+Version 0.84:
+ - compile option to create a CLI-only binary [done in pl1]
+   (without GTK+ linkage)
+
+Version 0.86:
+ - maybe upgrade from GTK+ 2 to version 3
+   (not decided yet)
+   
+Version 0.90:
+ - Grand finale: add a new feature which isn't jaw dropping 
+   but very convenient to have (sorry - has nothing to do 
+   with ripping). Since I'm not sure whether there
+   is prior art to this feature, I won't get into
+   details about it until the first release to fence
+   off IP trolls.
+
+Version 1.00: maintenance releases
+   The project is considered finished. By the time we reach
+   1.00, optical media should be as extinct as floppy discs
+   are now. That won't obsolete dvdisaster (quite to the
+   contrary!), but we're probably feature complete in this
+   revision and won't need to introduce new features. 
+   From time to time maintenance releases will be made
+   to adapt for new operating system and toolkit versions.
+
+Unspecified schedule / later releases
+
+ - native Windows fork
+ - add pause/resume button
+ - optionally pause after n read errors for drives which
+   need to cool down 
+ - add function for stripping RS02 data from image [done in pl7]
+ - add quiet option for command line mode
+ - display estimated finishing time for encoding/decoding
+ - catch up with many other queued up suggestions
+ - provide a function for searching directories for suitable .ecc files 
+   for the current image
+ - add real UDF parsing to udf.c 
+   (currently only the backward compatibility ISO structures are used)

TRANSLATION.HOWTO

@@ -9,7 +9,7 @@ dvdisaster uses GNU gettext for internationalization.
 
 The following languages are currently maintained:
 
-Czech		- Luboš Staněk (lubek@users.sourceforge.net)
+Czech		- Jindřich Šesták (khagaroth@users.sourceforge.net)
 English 	- Carsten Gnörlich (program author)
 German 		- Carsten Gnörlich (program author)
 Italian		- Andrea Polverini (polve@polve.com)

build.c

@@ -1,27 +0,0 @@
-/*  dvdisaster: Additional error correction for optical media.
- *  Copyright (C) 2004-2011 Carsten Gnoerlich.
- *  Project home page: http://www.dvdisaster.com
- *  Email: carsten@dvdisaster.com  -or-  cgnoerlich@fsfe.org
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA,
- *  or direct your browser at http://www.gnu.org.
- */
-
-#include "build.h"
-
-/* build is incremented at each make;
-   make recompile of dependent file as fast as possible */
-
-int  buildCount = BUILD;

build.h

@@ -1,2 +0,0 @@
-#define BUILD 4
-#define BDATE "27.09.11 (Dienstag, 19:37)"

configure

@@ -3,14 +3,15 @@
 # Load the shell functions needed for the rest of this script.
 
 BASH_BASED_CONFIGURE=./scripts/bash-based-configure
-REQUIRED_CFLAGS="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -I." 
-RECOMMENDED_CFLAGS="-O2 -fomit-frame-pointer -Wall"
+BASH_BASED_CONFIGURE_OPTS="--buildtmp=$(pwd)/build $@"
+REQUIRED_CFLAGS="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -I. -pipe"
+RECOMMENDED_CFLAGS="-O2 -fomit-frame-pointer -Wall -Wno-unknown-warning-option -Wno-deprecated-declarations -Wno-stringop-truncation -Wno-format-zero-length"
 DEBUG_CFLAGS="-ggdb -Wall"
 
 CFG_USE_CYGWIN="no"   # do not change
 
 if test -e $BASH_BASED_CONFIGURE; then
-   source $BASH_BASED_CONFIGURE
+   source $BASH_BASED_CONFIGURE $BASH_BASED_CONFIGURE_OPTS
 else
    echo "Could not find $BASH_BASED_CONFIGURE"
    echo "You're probably not in the right directory."
@@ -19,24 +20,9 @@ fi
 
 # Set the package name and version
 
-PACKAGE dvdisaster 0.72
-
-REL_MICRO=3
-REL_STATUS=patch
-#REL_STATUS=devel
-#REL_STATUS=rc
-
-#REL_MICRO=0
-#REL_STATUS="-"  # requires MICRO=0
-
-DEFINE_STRING RELEASE_MICRO $REL_MICRO
-DEFINE_STRING RELEASE_STATUS $REL_STATUS
-
-case "$REL_STATUS" in
-  -) DEFINE_VAR FULL_VERSION "$VERSION" ;;
-  patch) DEFINE_VAR FULL_VERSION "\"$VERSION (pl${REL_MICRO})\"" ;;
-  *) DEFINE_VAR FULL_VERSION "\"$VERSION (${REL_STATUS}-${REL_MICRO})\"" ;;
-esac
+PACKAGE dvdisaster 0.79.6
+DEFINE_INT PATCHLEVEL 9
+DEFINE_STRING HAVE_UNSTABLE_RELEASE 1
 
 # Check for some essential tools.
 
@@ -51,20 +37,36 @@ GET_PKGNAME
 GET_PREFIX /usr/local
 GET_BINDIR
 GET_MANDIR
-GET_DOCDIR /usr/share/doc
+GET_DOCDIR
 GET_DIR "$PKGNAME" docsub "Documentation sub"\
         "       put documentation into this subdirectory\n                        under \$DOCDIR "
-GET_LOCALEDIR /usr/share/locale
-GET_DIR "/var/www/dvdisaster" phpmount "PHP bind mount"\
-        "     place to bind mount our PHP based documentation so that\n                        a local web server can access it\n                        "
-
+GET_LOCALEDIR
 GET_BUILDROOT
+GET_BUILDTMP
+
+PRINT_MESSAGE "\nDetermining build flavor:"
+
+# old way of specifying --with-cli-only
+if [ "$CLI_ONLY" = 1 ]; then
+  cfg_with_cli_only=yes
+  unset CLI_ONLY
+fi
+
+WITH_OPTION cli-only no "[yes | no]"
+
+# Remove the useless CLI console under windows
+if [[ $(uname) =~ MINGW ]] && [ "$cfg_with_cli_only" != "yes" ]; then
+  CFG_LDFLAGS="$CFG_LDFLAGS -mwindows"
+fi
 
 # Look for required libraries
 
 PRINT_MESSAGE "\nLooking for includes and libraries:"
 
-REQUIRE_GTK2 2 6 0 WITH_THREADS
+REQUIRE_GLIB2 2 32 0
+if test "$cfg_with_cli_only" != "yes"; then
+  REQUIRE_GTK2 2 6 0 WITH_THREADS
+fi
 echo
 
 if ! CHECK_INCLUDE locale.h locale || ! CHECK_INCLUDE libintl.h intl ; then
@@ -82,11 +84,13 @@ CHECK_LIBRARY cam cam_open_device cam
 
 PRINT_MESSAGE "\nChecking for functions and symbols..."
 
+CHECK_FUNCTION mmap
+
 if ! CHECK_FUNCTION getopt_long ; then
-  if ! test -e getopt.h || ! test -e getopt.c ; then
+  if ! test -e src/getopt.h || ! test -e src/getopt.c ; then
     echo " * getopt_long is missing. You can provide one by simply"
     echo " * copying getopt.c, getopt1.c and getopt.h from the GNU"
-    echo " * C library into this directory."
+    echo " * C library into the src/ directory."
     exit 1
   fi
 fi
@@ -107,7 +111,9 @@ CFG_CFLAGS=$SAVE_CFLAGS
 
 echo
 CHECK_ENDIAN
+CHECK_BITNESS
 CHECK_SSE2
+CHECK_ALTIVEC
 
 # Look for required tools
 
@@ -122,16 +128,11 @@ if ! EXECUTE_PROGRAM "xgettext --help" xgettext \
   cfg_force_with_nls=no
 fi
 
-if ! EXECUTE_PROGRAM "gdk-pixbuf-csource --help" gdk_pixbuf_csource ; then
-  echo "* gdk-pixbuf not installed"
-  echo "* or path to gdk-pixbuf-csource is missing."
-  exit 1
-fi
-
-if test $CFG_SYS_OPTIONS == -DSYS_MINGW; then
-  if ! EXECUTE_PROGRAM "dllwrap -version" dllwrap ; then
-    echo "* dllwrap not installed or path to it is missing."
-    echo "* You can build dvdisaster, but not the windows installer."
+if test "$cfg_with_cli_only" != "yes"; then
+  if ! EXECUTE_PROGRAM "gdk-pixbuf-csource --help" gdk_pixbuf_csource ; then
+    echo "* gdk-pixbuf not installed"
+    echo "* or path to gdk-pixbuf-csource is missing."
+    exit 1
   fi
 fi
 
@@ -140,10 +141,30 @@ fi
 PRINT_MESSAGE "\nAdditional configuration options:"
 
 WITH_OPTION nls yes "[yes | no]"
-WITH_OPTION memdebug no "[no | yes]"
-WITH_OPTION efence no "[no | yes]"
 WITH_OPTION embedded-src-path yes "[yes | no]"
 
+PRINT_MESSAGE "\nDebugging options (do not use in production system):"
+
+WITH_OPTION memdebug no "[no | yes]"
+WITH_OPTION debug-printf-format no "[no | yes]"
+WITH_OPTION werror no "[no | yes]"
+
+if test "$cfg_with_debug_printf_format" == "yes"; then
+  # don't use the binary compiled with this,
+  # it's only useful to properly get all the build-time
+  # warnings around printf-errors, that are otherwise
+  # not catched by the compiler because of the _() macro
+  DEFINE_STRING DEBUG_PRINTF_FORMAT 1
+else
+  # warnings given by -Wformat-security are bogus because of _(),
+  # see above comment if you actually want to check for format errors
+  CFG_CFLAGS="$CFG_CFLAGS -Wno-format-security"
+fi
+
+if test "$cfg_with_werror" == "yes"; then
+  CFG_CFLAGS="$CFG_CFLAGS -Werror"
+fi
+
 if test "$cfg_with_efence" == "yes"; then
   if ! CHECK_LIBRARY efence malloc efence; then
     exit 1;
@@ -163,80 +184,62 @@ fi
 
 PRINT_MESSAGE "\nCollecting source files:"
 
-rm -f conftest.c method-link.c
-cfiles="method-link.c"
-ofiles="method-link.o"
+rm -f src/conftest.c src/method-link.c
+cfiles="src/method-link.c"
+ofiles="$BUILDTMP/method-link.o"
 
-for cfile in *.c; do
+for cfile in src/*.c; do
+  if test "$cfg_with_cli_only" == "yes"; then
+    grep -q 'DVDISASTER_GUI_FILE' "$cfile" && continue
+  fi
   cfile_prefix=`echo $cfile | sed -e 's/\.c//'`
   cfiles="$cfiles $cfile"
-  ofiles="$ofiles $cfile_prefix.o"
+  ofiles="$ofiles $BUILDTMP/$(basename $cfile_prefix.o)"
   echo -n " $cfile_prefix"
 done
 
 echo
 echo -e "\nCFG_CFILES = $cfiles" >> Makefile.config
 echo "CFG_OFILES = $ofiles" >> Makefile.config
+if test "$cfg_with_cli_only" != "yes"; then
+  echo "ICONS = src/inlined-icons.h" >> Makefile.config
+fi
 
 # Create the method wrapper
 
 PRINT_MESSAGE "\nCollecting methods:"
 
-cat >> method-link.c <<EOF
+cat >> src/method-link.c <<EOF
 /* Automatically generated wrapper for registering the methods */
  
 void BindMethods(void)
 {
 EOF
 
-for method in ecc-*.c; do
-  method_name=`echo $method | sed -e 's/\.c//' -e 's/ecc-//'`
+for method in src/ecc-*.c; do
+  method_name=`echo $(basename $method) | sed -e 's/\.c//' -e 's/ecc-//'`
   method_prefix="$method_prefix $method_name"
   echo -n " $method_name"
 done
 
 for method in $method_prefix; do
-  echo "   void register_${method}(void);" >> method-link.c
+  echo "   void register_${method}(void);" >> src/method-link.c
 done
 
-echo >> method-link.c
+echo >> src/method-link.c
 
 for method in $method_prefix; do
-  echo "   register_${method}();" >> method-link.c
+  echo "   register_${method}();" >> src/method-link.c
 done
 
-echo "}" >> method-link.c
+echo "}" >> src/method-link.c
 echo 
 
-# Temporary fix for missing rs03 sources
-
-if test -e rs03-includes.h; then
-  CFG_HAVE_OPTIONS="$CFG_HAVE_OPTIONS -DHAVE_RS03"
-fi
-
 # Okay, hopefully we've got everything together now.
 
 (cd locale; bash create-makefile)
 CREATE_MAKEFILES GNUmakefile 
 
-# Now configure the tools directory
-
-echo
-echo -n "Configuring the tools ... "
-if (cd tools; bash configure $@ >tools-configure); then
-  echo "OK"
-else
-  echo "Failed"
-  echo "Problem encountered configuring the tools:"
-  cat tools/tools-configure
-  echo
-  echo "The above output describes a problem doing ./configure"
-  echo "in the tools directory. Please cd into that directory"
-  echo "and ./configure it manually."
-  exit 1
-fi
-rm tools/tools-configure
-
 # Okay, tell the user we're done and how to proceed.
 
 echo
@@ -270,12 +273,7 @@ if test -n "$BUILDROOT"; then
   echo
 fi
 
-if test $cfg_system == "solaris"; then
-  id_binary="/usr/xpg4/bin/id"
-else
-  id_binary="id"
-fi
-
+id_binary="id"
 if test `$id_binary -u` -eq 0; then
   echo "* WARNING: Compiling the project as ROOT USER is not recommended"
   echo "*          and may cause unexpected problems. If compilation fails"

contrib/AppRun.sh

@@ -0,0 +1,5 @@
+#!/bin/sh
+DIR="$(readlink -f "$(dirname "$0")")"
+export GTK_PATH="$DIR/usr/lib/gtk-2.0"
+export DVDISASTER_DOCDIR="$DIR/usr/share/doc/dvdisaster"
+exec "$DIR/usr/bin/dvdisaster" "$@"

contrib/dvdisaster.desktop

@@ -6,8 +6,8 @@ Comment=Additional error protection for CD/DVD media
 Comment[cs]=Přídavná ochrana pro média CD/DVD
 Comment[de]=Zusätzliche Fehlerkorrektur für CD/DVD
 Exec=dvdisaster
-Icon=dvdisaster48.png
+Icon=dvdisaster
 Terminal=false
 Type=Application
 Categories=Application;System;
-Encoding=UTF-8
+Keywords=CD;DVD;media;data loss;scratch;aging;error;protection;recovery;

crcbuf.c

@@ -1,185 +0,0 @@
-/*  dvdisaster: Additional error correction for optical media.
- *  Copyright (C) 2004-2011 Carsten Gnoerlich.
- *  Project home page: http://www.dvdisaster.com
- *  Email: carsten@dvdisaster.com  -or-  cgnoerlich@fsfe.org
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA,
- *  or direct your browser at http://www.gnu.org.
- */
-
-#include "dvdisaster.h"
-
-#include "scsi-layer.h"
-#include "rs02-includes.h"
-
-/***
- *** Load crc buffer from RS01 error correction file
- ***/
-
-CrcBuf *GetCRCFromRS01(EccInfo *ei)
-{  CrcBuf *cb = g_malloc(sizeof(CrcBuf));
-   guint32 *buf;
-   gint64 crc_sectors,crc_remainder;
-   gint64 i,j,sec_idx;
-
-   cb->crcbuf = g_malloc(ei->sectors * sizeof(guint32));
-   cb->size   = ei->sectors;
-   cb->valid  = CreateBitmap0(ei->sectors);
-   buf = cb->crcbuf;
-
-   /* Seek to beginning of CRC sums */
-
-   if(!LargeSeek(ei->file, (gint64)sizeof(EccHeader)))
-      Stop(_("Failed skipping the ecc header: %s"),strerror(errno));
-
-   /* Read crc sums. A sector of 2048 bytes contains 512 CRC sums. */
-
-   crc_sectors = ei->sectors / 512;
-   sec_idx = 0;
-
-   for(i=0; i<crc_sectors; i++)
-   {  if(LargeRead(ei->file, buf, 2048) != 2048)
-	 Stop(_("Error reading CRC information: %s"),strerror(errno));
-      buf += 512;
-
-      for(j=0; j<512; j++, sec_idx++)
-	 SetBit(cb->valid, sec_idx);
-   }
-
-   crc_remainder = sizeof(guint32)*(ei->sectors % 512);
-   if(crc_remainder)
-   {  if(LargeRead(ei->file, buf, crc_remainder) != crc_remainder)
-	 Stop(_("Error reading CRC information: %s"),strerror(errno));
-
-      for( ; sec_idx<ei->sectors; sec_idx++)
-	 SetBit(cb->valid, sec_idx);
-   }
-
-   return cb;
-}
-
-/***
- *** Load crc buffer from RS02 error correction data
- ***
- * Lots of casts from (void*) since we're transporting
- * nonpublic structs.
- */
-
-CrcBuf *GetCRCFromRS02(void *layv, void *dhv, LargeFile *image)
-{  RS02Layout *lay = (RS02Layout*)layv;
-   DeviceHandle *dh = (DeviceHandle*)dhv;
-   AlignedBuffer *ab = CreateAlignedBuffer(2048);
-   CrcBuf *cb = g_malloc(sizeof(CrcBuf));
-   gint64 block_idx[256];
-   guint32 *buf;
-   gint64 image_sectors,crc_sector;
-   gint64 s,i;
-   int crc_idx, crc_valid = FALSE;
-
-   image_sectors = lay->eccSectors+lay->dataSectors;
- 
-   cb->crcbuf = g_malloc(image_sectors * sizeof(guint32));
-   cb->size   = image_sectors;
-   cb->valid  = CreateBitmap0(image_sectors);
-   buf = cb->crcbuf;
-
-   /* Initialize ecc block index pointers.
-      The first CRC set (of lay->ndata checksums) relates to
-      ecc block lay->firstCrcLayerIndex + 1. */
-
-   for(s=0, i=0; i<lay->ndata; s+=lay->sectorsPerLayer, i++)
-     block_idx[i] = s + lay->firstCrcLayerIndex + 1;
-
-   crc_idx = 512;                   /* force crc buffer reload */
-   crc_sector = lay->dataSectors+2; /* first crc data sector on medium */
-
-   /* Cycle through the ecc blocks and descramble CRC sums in
-      ascending sector numbers. */
-
-   for(s=0; s<lay->sectorsPerLayer; s++)
-   {  gint64 si = (s + lay->firstCrcLayerIndex + 1) % lay->sectorsPerLayer;
-
-      /* Wrap the block_idx[] ptrs at si == 0 */
-
-      if(!si)
-      {  gint64 bs;
-
-         for(bs=0, i=0; i<lay->ndata; bs+=lay->sectorsPerLayer, i++)
-	   block_idx[i] = bs;
-      }
-
-      /* Go through all data sectors of current ecc block */
-
-      for(i=0; i<lay->ndata; i++)
-      {  gint64 bidx = block_idx[i];
-
-	 if(bidx < lay->dataSectors)  /* only data sectors have CRCs */
-	 {  
-	    /* Refill crc cache if needed */
-	    
-	    if(crc_idx >= 512)
-	    {   crc_valid = !ReadSectorsFast(dh, ab->buf, crc_sector++, 1);
-		crc_idx = 0;
-	    }
-
-	    /* Sort crc into appropriate place */
-
-	    if(crc_valid)
-	    {  cb->crcbuf[bidx] = ((guint32*)ab->buf)[crc_idx];
-	       SetBit(cb->valid, bidx);
-	    }
-	    crc_idx++;
-	    block_idx[i]++;
-	 }
-      }
-   }
-
-   FreeAlignedBuffer(ab);
-
-   return cb;
-}
-
-/***
- *** Test a 2048 byte block against the checksum in the buffer
- ***/
-
-int CheckAgainstCrcBuffer(CrcBuf *cb, gint64 idx, unsigned char *buf)
-{  guint32 crc;
-
-   if(idx < 0 || idx >= cb->size)
-      Stop("CheckAgainstCrcBuffer: illegal index %ldd\n", idx);
-
-   crc = Crc32(buf, 2048);
-
-   if(!GetBit(cb->valid, idx))
-      return CRC_UNKNOWN;
-   
-   if(crc == cb->crcbuf[idx])
-      return CRC_GOOD;
-
-   return CRC_BAD;
-}
-
-
-/***
- *** Clean up
- ***/
-
-void FreeCrcBuf(CrcBuf *cb)
-{  
-   g_free(cb->crcbuf);
-   FreeBitmap(cb->valid);
-   g_free(cb);
-}

debian/changelog

@@ -1,3 +1,270 @@
+dvdisaster (0.79.6-6) UNRELEASED; urgency=medium
+
+  * Use secure URI in debian/watch.
+  * Update standards version, no changes needed.
+  * Set debhelper-compat version in Build-Depends.
+  * Update standards version to 4.4.1, no changes needed.
+  * Remove obsolete fields Name, Contact from debian/upstream/metadata.
+  * Fix day-of-week for changelog entries 0.71~devel23-4.
+
+ -- Debian Janitor <janitor@jelmer.uk>  Tue, 06 Aug 2019 16:08:20 +0000
+
+dvdisaster (0.79.6-5) experimental; urgency=medium
+
+  * Merge changes from 0.79.5-9.
+
+ -- Carlos Maddela <e7appew@gmail.com>  Sat, 02 Feb 2019 16:05:29 +1100
+
+dvdisaster (0.79.6-4) experimental; urgency=medium
+
+  * Merge changes from 0.79.5-8.
+
+ -- Carlos Maddela <e7appew@gmail.com>  Fri, 01 Feb 2019 23:13:16 +1100
+
+dvdisaster (0.79.6-3) experimental; urgency=medium
+
+  * Merge changes from 0.79.5-7.
+  * Update gbp.conf for debian/experimental branch.
+
+ -- Carlos Maddela <e7appew@gmail.com>  Thu, 31 Jan 2019 08:59:58 +1100
+
+dvdisaster (0.79.6-2) experimental; urgency=medium
+
+  [ TANIGUCHI Takaki ]
+  * Update Vcs-* to salsa.debian.org.
+
+  [ Carlos Maddela ]
+  * Build with DH compat level 11.
+  * Indicate compliance with Debian Policy 4.1.4.
+  * Add machine-readable upstream metadata.
+  * Update debian/copyright.
+  * Update location of PDF manual registered with doc-base (required
+    as a result of DH compat level change).
+
+ -- Carlos Maddela <e7appew@gmail.com>  Sat, 23 Jun 2018 05:41:03 +1000
+
+dvdisaster (0.79.6-1) experimental; urgency=medium
+
+  * New upstream development version [0.79.6].
+  * Rebase patches.
+
+ -- Carlos Maddela <e7appew@gmail.com>  Thu, 21 Dec 2017 05:51:54 +1100
+dvdisaster (0.79.5-9) unstable; urgency=medium
+
+  * Make sure that the upstream changelog remains uncompressed so
+    that the application can display it.
+
+ -- Carlos Maddela <e7appew@gmail.com>  Sat, 02 Feb 2019 13:32:34 +1100
+
+dvdisaster (0.79.5-9) unstable; urgency=medium
+
+  * Make sure that the upstream changelog remains uncompressed so
+    that the application can display it.
+  * Suggest to install dvdisaster-doc in error message, if the PDF manual
+    cannot be found.
+
+ -- Carlos Maddela <e7appew@gmail.com>  Sat, 02 Feb 2019 15:20:23 +1100
+
+dvdisaster (0.79.5-8) unstable; urgency=medium
+
+  * Fix parallel build of locale strings.
+
+ -- Carlos Maddela <e7appew@gmail.com>  Fri, 01 Feb 2019 23:03:13 +1100
+
+dvdisaster (0.79.5-7) unstable; urgency=medium
+
+  * Add debian/gbp.conf to conform with DEP14 conventions.
+  * Build with Debhelper compat level 12.
+  * Set "Rules-Requires-Root: no".
+  * Simplify process by which mutable files are backed up and restored.
+  * Build as verbosely as possible.
+  * Fix location of manual.
+  * Fix dh_auto_build overrides to take advantage of parallel builds.
+  * Fix format security compilation warning in GCC-8.
+  * Change homepage to one archived at web.archive.org.
+    http://dvdisaster.net has been unavailable for a while now.
+    Not certain if this is permanent though, as the domain name still
+    exists for mail.
+  * Add support for nodoc build profile.
+  * Add more details to upstream metadata.
+  * Indicate compliance with Debian Policy 4.3.0.
+
+ -- Carlos Maddela <e7appew@gmail.com>  Thu, 31 Jan 2019 07:10:46 +1100
+
+dvdisaster (0.79.5-6) unstable; urgency=medium
+
+  [ TANIGUCHI Takaki ]
+  * change Vcs-* path
+
+  [ Carlos Maddela ]
+  * Build with DH compat level 11.
+  * Indicate compliance with Debian Policy 4.1.4.
+  * Add machine-readable upstream metadata.
+  * Update debian/copyright.
+  * Update location of PDF manual registered with doc-base (required
+    as a result of DH compat level change).
+
+ -- Carlos Maddela <e7appew@gmail.com>  Sat, 23 Jun 2018 05:01:27 +1000
+
+dvdisaster (0.79.5-5) unstable; urgency=medium
+
+  * Update Vcs-* to salsa.debian.org
+  * Bump Standards-Version to 4.1.3
+
+ -- TANIGUCHI Takaki <takaki@debian.org>  Sat, 27 Jan 2018 23:34:08 +0900
+
+dvdisaster (0.79.5-4) unstable; urgency=medium
+
+  * Use complete Debian revision number as build number, instead of
+    just the numeric part.
+  * Re-implement scripts/time-stamper.bash without direct calls to
+    dpkg-parsechangelog.
+  * Call ./configure script directly, instead of relying on debhelper,
+    to resolve incompatibilities with Bash-based script.
+  * Use alternative way of installing icons to remove dependency on
+    dh-exec.
+  * Drop redundant dependency on dpkg-dev.
+  * Reproducibly generate PDF documentation from TeX sources.
+  * Remove trailing white space from debian/changelog.
+  * Remove unnecessary Testsuite header from debian/control.
+  * Indicate compliance with Debian Policy 4.1.2.
+  * Suppress debian-watch-uses-insecure-uri Lintian warning.
+  * Honour LDFLAGS set by dpkg-buildflags in building all binaries.
+
+ -- Carlos Maddela <e7appew@gmail.com>  Thu, 21 Dec 2017 03:14:14 +1100
+
+dvdisaster (0.79.5-3) unstable; urgency=medium
+
+  * Team upload.
+  * Fix another build failure on kFreeBSD.
+  * Bump Standards Version to 4.0.1.
+  * Regenerate patches with git version 2.14.0.
+  * Do not suppress the display of compilation commands,
+    so that build logs may be analysed by blhc.
+  * Update uploaders list.
+
+ -- Carlos Maddela <e7appew@gmail.com>  Mon, 14 Aug 2017 14:52:56 +1000
+
+dvdisaster (0.79.5-2) unstable; urgency=medium
+
+  [ Carlos Maddela ]
+  * Team upload.
+  * Bump Standards Version to 4.0.0.
+  * Remove unnecessary calls to dpkg-parsechangelog from debian/rules.
+  * debian/watch: Avoid repacking upstream tarballs unnecessarily.
+  * Fix more typos in error messages and docs.
+  * Fix FTBFS on Hurd and kFreeBSD.
+  * Remove incorrect use of 'Origin: vendor' from DEP-3 patch headers.
+  * Improve support for Hurd and kFreeBSD systems, although Hurd still
+    builds without SCSI.
+
+ -- TANIGUCHI Takaki <takaki@debian.org>  Mon, 07 Aug 2017 17:34:01 +0900
+
+dvdisaster (0.79.5-1) unstable; urgency=medium
+
+  [ Carlos Maddela ]
+  * Team upload.
+  * New upstream version [0.79.5]
+  * Refresh and drop patches. The following patches have been dropped:
+    + 01-libpng15.patch
+    + 06-remove-encoding-from-desktop-file.patch
+    + 07-fix-spelling-errors-in-binaries.patch
+    + 09-fix-format-security-warnings.patch
+    + 21-fix-privacy-breach-in-doco.patch
+  * Update license to GPL-3.
+  * Update clean rule as old files no longer apply.
+  * Update documentation build and install rules.
+  * debian/rules: Update mutable file list.
+  * Fix generated man pages. The generated man pages incorrectly direct
+    users to the directory of the old HTML documentation, which is no
+    longer available.
+  * Fix display of manual.pdf. The PDF file is automatically compressed
+    by Debhelper, so we need to account for this.
+  * Resurrect old code to support opening URLs in a browser.
+  * Ship upstream-generated manual.pdf for the time being, as we can't
+    generate it ourselves reproducibly.
+
+ -- TANIGUCHI Takaki <takaki@debian.org>  Thu, 02 Feb 2017 22:28:25 +0900
+
+dvdisaster (0.72.4-3) unstable; urgency=medium
+
+  [ Carlos Maddela ]
+  * Team upload.
+  * Bump compat level to 10.
+  * debian/watch: Relax upstream version restriction.
+  * Use original name for the duplicate uncompressed upstream CHANGELOG.
+  * Backup and restore mutable files to allow multiple builds.
+  * Fix FTBFS for hurd-i386.
+
+  [ Corey Wright ]
+  * Add support for BD-ROM media-type. (Closes: #849518)
+
+ -- Carlos Maddela <e7appew@gmail.com>  Sat, 07 Jan 2017 00:29:19 +1100
+
+dvdisaster (0.72.4-2) unstable; urgency=medium
+
+  * Team upload.
+  * Make builds reproducible:
+    + Use the Debian changelog details to derive a build number and date.
+    + Don't build with source path embedded in binary.
+  * debian/control:
+    + Update to Standards Version 3.9.8.
+      - Format security warnings required fixing in tools/memory.c as
+        a result.
+    + Update VCS details.
+    + Remove obsolete DM-Upload-Alllowed control field.
+    + Perform wrap and sort.
+    + Mark dvdisaster-doc as a multi-arch foreign package.
+  * debian/rules:
+    + Build with all hardening flags set.
+    + Link required libraries as needed.
+    + Fix installation of desktop file and icon images.
+    + Tidy up installation of doc files.
+    + Fix clean up.
+    + Separate binary-arch and binary-indep rules.
+    + Silence deprecated API warnings.
+  * debian/*:
+    + Update uscan rules.
+    + Drop debian/dvdisaster.menu file in favour of desktop file.
+    + Convert copyright file into proper DEP5 format and update.
+    + Drop no longer required debian/pixmaps/dvdisaster.xpm.
+    + Add debian/dvdisaster-doc.doc-base file.
+    + Add link to html docs in dvdisaster-doc package.
+    + Remove unnecessary duplication of doc files in the two packages.
+    + Link all duplicate doc files.
+    + Fix installation of thumbnails for Czech doco.
+  * debian/patches/*:
+    + Fix headers to work with git-buildpackage, retaining as much
+      meta info as possible.
+    + Fix GNU Make detection. (Closes: #848811)
+    + Fix path of GPL-2 license in 05-help-dialog.patch. (Closes: #708384)
+    + Fix all warnings except for those related to deprecated API.
+      (Closes: #748416)
+    + Use non-size-specific icon and add keywords to desktop file.
+    + Fix spelling: upto -> up to
+    + Fix missing language fields in PO files.
+    + Update help dialog to show link to the new Debian package tracker.
+    + Update copyright notice in about dialog.
+    + Allow ShowTextFile() to work with absolute path names.
+    + Fix display of changelog, credits and to-do files.
+    + Remove link to the newsfeed, to fix Lintian privacy-breach-generic
+      warning. The news feed no longer works anyway.
+
+ -- Carlos Maddela <e7appew@gmail.com>  Fri, 23 Dec 2016 15:53:13 +1100
+
+dvdisaster (0.72.4-1) unstable; urgency=low
+
+  * New upstream (Closes: #665522)
+  * debian/paches/04-manpage.patch: Removed (merged by upstream).
+
+ -- TANIGUCHI Takaki <takaki@debian.org>  Sun, 08 Apr 2012 22:02:16 +0900
+
+dvdisaster (0.72.3-2) unstable; urgency=low
+
+  * debian/patches/libpng15: Build with libpng15. (Closes: #649555)
+
+ -- TANIGUCHI Takaki <takaki@debian.org>  Mon, 19 Mar 2012 11:08:53 +0900
+
 dvdisaster (0.72.3-1) unstable; urgency=low
 
   [ Rogério Brito ]
@@ -41,7 +308,7 @@ dvdisaster (0.72.1-1) unstable; urgency=low
   * New maintainer (Closes: 543876)
   * new upstream version.
   * debian/control: update Homepage:
-  * debian/README.source: create 
+  * debian/README.source: create
   * debian/control: add Vcs-*.
 
  -- TANIGUCHI Takaki <takaki@debian.org>  Mon, 23 Nov 2009 10:29:09 +0900
@@ -144,7 +411,7 @@ dvdisaster (0.71~devel23-4) unstable; urgency=low
 
   * Fixed clean target in rules (Closes: #442559).
 
- -- Daniel Baumann <daniel@debian.org>  Sun, 17 Sep 2007 00:37:00 +0200
+ -- Daniel Baumann <daniel@debian.org>  Mon, 17 Sep 2007 00:37:00 +0200
 
 dvdisaster (0.71~devel23-3) unstable; urgency=medium
 

debian/compat

@@ -1 +0,0 @@
-7

debian/control

@@ -3,22 +3,28 @@ Section: otherosfs
 Priority: optional
 Maintainer: Optical Media Tools Team <pkg-opt-media-team@lists.alioth.debian.org>
 Uploaders: TANIGUCHI Takaki <takaki@debian.org>,
-        Rogério Brito <rbrito@ime.usp.br>
-DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7.0.50~),
-	       gettext,
-	       libbz2-dev,
-	       libgtk2.0-dev,
-	       libpng-dev,
-	       pkg-config
-Standards-Version: 3.9.3
-Vcs-Browser: http://git.debian.org/?p=pkg-opt-media/dvdisaster.git 
-Vcs-Git: git://git.debian.org/pkg-opt-media/dvdisaster.git
-Homepage: http://dvdisaster.net/
+           Rogério Brito <rbrito@ime.usp.br>,
+           Carlos Maddela <e7appew@gmail.com>
+Build-Depends: debhelper (>= 12),
+               gettext,
+               libbz2-dev,
+               libcam-dev [kfreebsd-any],
+               libgtk2.0-dev,
+               libpng-dev,
+               pkg-config,
+               debhelper-compat (= 12)
+Build-Depends-Indep: texlive-fonts-recommended <!nodoc>,
+                     texlive-latex-base <!nodoc>,
+                     texlive-latex-extra  <!nodoc>
+Standards-Version: 4.4.1
+Vcs-Browser: https://salsa.debian.org/optical-media-team/dvdisaster
+Vcs-Git: https://salsa.debian.org/optical-media-team/dvdisaster.git
+Homepage: https://web.archive.org/web/20180428070843/http://dvdisaster.net/
+Rules-Requires-Root: no
 
 Package: dvdisaster
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, xdg-utils
+Depends: xdg-utils, ${misc:Depends}, ${shlibs:Depends}
 Recommends: dvdisaster-doc
 Description: data loss/scratch/aging protection for CD/DVD media
  dvdisaster provides a margin of safety against data loss on CD and DVD media
@@ -26,8 +32,10 @@ Description: data loss/scratch/aging protection for CD/DVD media
  used to recover unreadable sectors if the disc becomes damaged at a later time.
 
 Package: dvdisaster-doc
+Build-Profiles: <!nodoc>
 Section: doc
 Architecture: all
+Multi-Arch: foreign
 Depends: ${misc:Depends}
 Suggests: dvdisaster
 Description: data loss/scratch/aging protection for CD/DVD media (documentation)

debian/copyright

@@ -1,42 +1,49 @@
-Author: Carsten Gnoerlich <cgnoerlich@fsfe.org>
-Download: http://www.dvdisaster.com/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Contact: Carsten Gnörlich <carsten@dvdisaster.org>
+Upstream-Name: dvdisaster
+Source: https://web.archive.org/web/20180428070843/http://dvdisaster.net/
 
 Files: *
-Copyright: Copyright (C) 2004-2009 Carsten Gnoerlich <cgnoerlich@fsfe.org>
-License: GPL-2+
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; either version 2
- of the License, or (at your option) any later version.
- .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- .
- On Debian systems, the complete text of the GNU General Public License
- can be found in /usr/share/common-licenses/GPL-2 file.
+Copyright: 2004–2015, Carsten Gnörlich <carsten@dvdisaster.org>
+License: GPL-3+
 
 Files: debian/*
-Copyright (C) 2005-2009 Daniel Baumann <daniel@debian.org>
+Copyright: 2005–2009, Daniel Baumann <daniel@debian.org>
+           2009–2018, TANIGUCHI Takaki <takaki@debian.org>
+           2009–2010, Rogério Brito <rbrito@ime.usp.br>
+           2016–2018, Carlos Maddela <e7appew@gmail.com>
 License: GPL-2+
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; either version 2
- of the License, or (at your option) any later version.
+
+License: GPL-2+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
  .
- This program is distributed in the hope that it will be useful,
+ This package is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  GNU General Public License for more details.
  .
  You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ along with this program. If not, see <https://www.gnu.org/licenses/>.
  .
- On Debian systems, the complete text of the GNU General Public License
- can be found in /usr/share/common-licenses/GPL-2 file.
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+
+License: GPL-3+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <https://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".

debian/dvdisaster-doc.doc-base

@@ -0,0 +1,10 @@
+Document: dvdisaster
+Title: The dvdisaster User's Manual
+Author: Carsten Gnörlich
+Abstract: This manual describes what dvdisaster is and how it can be used
+ to protect optical media (CD/DVD/BD) from data loss, due to scratches
+ and aging.
+Section: File Management
+
+Format: PDF
+Files: /usr/share/doc/dvdisaster/manual.pdf.gz

debian/dvdisaster-doc.docs

@@ -1,6 +1 @@
-CREDITS.cs
-CREDITS.de
-CREDITS.en
-README.MODIFYING
-TODO
-TRANSLATION.HOWTO
+documentation/user-manual/manual.pdf

debian/dvdisaster-doc.install

@@ -1 +0,0 @@
-/usr/share/doc/dvdisaster-doc

debian/dvdisaster.docs

@@ -1,6 +1,4 @@
-CREDITS.cs
-CREDITS.de
-CREDITS.en
+CREDITS.*
 README.MODIFYING
 TODO
 TRANSLATION.HOWTO

debian/dvdisaster.install

@@ -1,3 +1,5 @@
+contrib/dvdisaster.desktop usr/share/applications
 usr/bin
+usr/share/icons
 usr/share/locale
 usr/share/man

debian/dvdisaster.lintian-overrides

@@ -0,0 +1 @@
+dvdisaster: changelog-file-not-compressed changelog

debian/dvdisaster.menu

@@ -1,4 +0,0 @@
-?package(dvdisaster):needs="X11" section="Applications/File Management"\
-  title="Dvdisaster" longtitle="data loss/scratch/aging protection for CD/DVD media"\
-  description="dvdisaster provides a margin of safety against data loss on CD and DVD media caused by scratches or aging media. It creates error correction data which is used to recover unreadable sectors if the disc becomes damaged at a later time."\
-  command="/usr/bin/dvdisaster" icon="/usr/share/pixmaps/dvdisaster.xpm"

debian/gbp.conf

@@ -0,0 +1,5 @@
+[DEFAULT]
+debian-branch = debian/master
+upstream-branch = upstream/latest
+sign-tags = True
+pristine-tar = True

debian/patches/02-encryption.patch

@@ -1,19 +1,30 @@
-Author: n/a
-Description: Disables to skip on encrypted disks (e.g. DVD with CSS-Encryption).
+From: Optical Media Tools Team <pkg-opt-media-team@lists.alioth.debian.org>
+Date: Sun, 8 Apr 2012 21:51:29 +0900
+Subject: Disables to skip on encrypted disks (e.g. DVD with CSS-Encryption).
 
-Index: dvdisaster/scsi-layer.c
-===================================================================
---- dvdisaster.orig/scsi-layer.c	2012-03-06 11:10:13.371044799 +0900
-+++ dvdisaster/scsi-layer.c	2012-03-06 11:10:17.147044691 +0900
-@@ -2690,11 +2690,12 @@
+Description: Disables to skip on encrypted disks (e.g. DVD with CSS-Encryption).
+Author: n/a
+Last-Update: 2012-04-08
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+---
+ scsi-layer.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/scsi-layer.c b/scsi-layer.c
+index cad13d4..866b7ac 100644
+--- a/scsi-layer.c
++++ b/scsi-layer.c
+@@ -2695,12 +2695,13 @@ Image* OpenImageFromDevice(char *device)
         	 return NULL;
        }
     }
 -
 +/*
     if(dh->mainType == DVD && query_copyright(dh))
-    {  CloseDevice(dh);
+    {  CloseImage(image);
        Stop(_("This software does not support encrypted media.\n"));
+       return NULL;
     }
 +*/
  

debian/patches/03-dvdrom.patch

@@ -1,11 +1,21 @@
-Author: Corey Wright <undefined@pobox.com>
-Description: Adds support for DVD-ROM medium-type.
+From: Corey Wright <undefined@pobox.com>
+Date: Tue, 6 Mar 2012 11:10:30 +0900
+Subject: Adds support for DVD-ROM medium-type.
 
-Index: dvdisaster/scsi-layer.c
-===================================================================
---- dvdisaster.orig/scsi-layer.c	2012-03-06 11:10:17.147044691 +0900
-+++ dvdisaster/scsi-layer.c	2012-03-06 11:10:30.927044292 +0900
-@@ -913,6 +913,11 @@
+Description: Adds support for DVD-ROM medium-type.
+Author: Corey Wright <undefined@pobox.com>
+Last-Update: 2012-03-06
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+---
+ scsi-layer.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/scsi-layer.c b/scsi-layer.c
+index 866b7ac..b3a9d0e 100644
+--- a/scsi-layer.c
++++ b/scsi-layer.c
+@@ -908,6 +908,11 @@ static int query_dvd(DeviceHandle *dh, int probe_only)
  	    break;
  	 }
  

debian/patches/04-manpage.patch

@@ -1,151 +0,0 @@
-Authors: Daniel Baumann <daniel@debian.org>
-	 Rogério Theodoro de Brito <rbrito@ime.usp.br>
-Description: Fixes typo in manpages.
- The patch also deals with hyphens used as minus signs.
-
-Index: dvdisaster/documentation/dvdisaster.cs.1
-===================================================================
---- dvdisaster.orig/documentation/dvdisaster.cs.1	2012-03-06 11:06:06.000000000 +0900
-+++ dvdisaster/documentation/dvdisaster.cs.1	2012-03-06 11:12:03.263041664 +0900
-@@ -49,8 +49,8 @@
- Obecné příklady použití:
- .TP
- .B \-r, \-\-read
--Načte obraz média na pevný disk. Použijte -rn-m k načtení určitého rozsahu sektorů,
--t.j. -r100-200.
-+Načte obraz média na pevný disk. Použijte \-rn-m k načtení určitého rozsahu sektorů,
-+t.j. \-r100-200.
- .TP
- .B \-c, \-\-create
- Vytvoří informaci .ecc pro obraz média.
-@@ -98,7 +98,7 @@
- automaticky přidá souborové přípony .img a .ecc.
- .TP
- .B \-\-cache-size n
--velikost varovnávací paměti v MB v průběhu akce -c (výchozí: 32 MB).
-+velikost varovnávací paměti v MB v průběhu akce \-c (výchozí: 32 MB).
- .TP
- .B \-\-dao
- předpokládá disk DAO; neořezávat konec obrazu.
-Index: dvdisaster/documentation/dvdisaster.en.1
-===================================================================
---- dvdisaster.orig/documentation/dvdisaster.en.1	2012-03-06 11:08:20.000000000 +0900
-+++ dvdisaster/documentation/dvdisaster.en.1	2012-03-06 11:12:03.263041664 +0900
-@@ -104,8 +104,8 @@
- Action selection (at least one action must be specified):
- .TP
- .B \-r, \-\-read
--Read the medium image to hard disc. Use -rn-m to read a certain sector range,
--e.g. -r100-200.
-+Read the medium image to hard disc. Use \-rn-m to read a certain sector range,
-+e.g. \-r100-200.
- .TP
- .B \-c, \-\-create
- Create .ecc information for the medium image.
-@@ -213,7 +213,7 @@
- automatically add .iso and .ecc file suffixes.
- .TP
- .B \-\-cache-size n
--image cache size in MB during -c mode (default: 32MB).
-+image cache size in MB during \-c mode (default: 32MB).
- .TP
- .B \-\-dao
- assume DAO disc; do not trim image end.
-@@ -235,12 +235,12 @@
- continue reading after potentially fatal error condition.
- .TP
- .B \-\-internal-rereads n
--internal read attempts for defective CD media sectors (default: -1)
-+internal read attempts for defective CD media sectors (default: \-1)
- .RS
- The drive firmware usually retries unreadable sectors a few times before
- giving up and returning a read error. It is more efficient to set this to 0 or 1
--and manage read attempts through the --read-attempts parameter. Most drives ignore
--this setting anyways. Use -1 to leave the drive at its default setting.
-+and manage read attempts through the \-\-read-attempts parameter. Most drives ignore
-+this setting anyways. Use \-1 to leave the drive at its default setting.
- .RE
- .TP
- .B \-\-query-size n
-@@ -253,7 +253,7 @@
- selects raw reading mode for CD media (default: 20)
- .RS
- The recommended mode is 20, which makes the drive apply its built-in error 
--correction to the best possible extent before transfering a defective sector.
-+correction to the best possible extent before transferring a defective sector.
- However some drives can only read defective sectors using mode 21, skipping
- the last stage of the internal error correction and returning 
- the uncorrected sector instead.
-Index: dvdisaster/documentation/dvdisaster.de.1
-===================================================================
---- dvdisaster.orig/documentation/dvdisaster.de.1	2012-03-06 11:08:20.000000000 +0900
-+++ dvdisaster/documentation/dvdisaster.de.1	2012-03-06 11:12:03.263041664 +0900
-@@ -112,8 +112,8 @@
- Aktions-Auswahl (mindestens eine Aktion muss gew\[:a]hlt werden):
- .TP
- .B \-r, \-\-read
--Datentr\[:a]ger-Abbild auf Festplatte einlesen. -rn-m liest einen Bereich von
--Sektoren, z.B. -r100-200.
-+Datentr\[:a]ger-Abbild auf Festplatte einlesen. \-rn-m liest einen Bereich von
-+Sektoren, z.B. \-r100-200.
- .TP
- .B \-c, \-\-create
- Erzeugt Fehlerkorrektur-Daten f\[:u]r das Abbild.
-@@ -243,12 +243,12 @@
- Lesen nach m\[:o]glicherweise schwerwiegenden Fehlern fortsetzen.
- .TP
- .B \-\-internal-rereads n
--Leseversuche innerhalb des Laufwerks f\[:u]r besch\[:a]digte CD-Sektoren (Standard: -1)
-+Leseversuche innerhalb des Laufwerks f\[:u]r besch\[:a]digte CD-Sektoren (Standard: \-1)
- .RS
- Laufwerke unternehmen normalerweise mehrere Versuche um einen besch\[:a]digten Sektor 
- zu lesen. Es ist typischerweise g\[:u]nstiger diesen Wert auf 0 oder 1 zu setzen
--und die Anzahl der Leseversuche \[:u]ber den Parameter --read-attempts zu steuern.
--Viele Laufwerke ignorieren diese Einstellung ohnehin. Benutzen Sie den Wert -1 um 
-+und die Anzahl der Leseversuche \[:u]ber den Parameter \-\-read-attempts zu steuern.
-+Viele Laufwerke ignorieren diese Einstellung ohnehin. Benutzen Sie den Wert \-1 um
- die Standardeinstellungen des Laufwerks zu verwenden.
- .RE
- .TP
-@@ -260,7 +260,7 @@
- .RE
- .TP
- .B \-\-raw-mode n
--"Raw"-Lese-Verfahren f\[:u]r besch\[:a]digte CD-Sektoren (default: 20)
-+"Raw"\-Lese-Verfahren f\[:u]r besch\[:a]digte CD-Sektoren (default: 20)
- .RS
- Das empfohlene Verfahren ist 20, bei dem das Laufwerk die eingebaute Fehlerkorrektur
- so weit wie m\[:o]glich anwendet, bevor es einen besch\[:a]digten Sektor 
-@@ -277,7 +277,7 @@
- liest den gesamten Datentr\[:a]ger bis zu n-mal.
- .TP
- .B \-\-read-raw
--liest in der "raw"-Betriebsart sofern m\[:o]glich.
-+liest in der "raw"\-Betriebsart sofern m\[:o]glich.
- .TP
- .B \-\-speed-warning n
- warnt bei Geschwindigkeits\[:a]nderung um mehr als n Prozent.
-Index: dvdisaster/documentation/dvdisaster.it.1
-===================================================================
---- dvdisaster.orig/documentation/dvdisaster.it.1	2012-03-06 11:06:06.000000000 +0900
-+++ dvdisaster/documentation/dvdisaster.it.1	2012-03-06 11:12:03.267041662 +0900
-@@ -43,8 +43,8 @@
- Tipici esempi di utilizzo:
- .TP
- .B \-r, \-\-read
--Estrae l'immagine del supporto sull'hard disc. Usare -rn-m per leggere un
--determinato intervallo di settori, ad es. -r100-200.
-+Estrae l'immagine del supporto sull'hard disc. Usare \-rn-m per leggere un
-+determinato intervallo di settori, ad es. \-r100-200.
- .TP
- .B \-c, \-\-create
- Crea l'informazione .ecc per l'immagine del supporto.
-@@ -92,7 +92,7 @@
- aggiungi automaticamente i suffissi .img e .ecc.
- .TP
- .B \-\-cache-size n
--Dimensione della cache in MB con la modalit\[`a] -c (Standard: 32MB).
-+Dimensione della cache in MB con la modalit\[`a] \-c (Standard: 32MB).
- .TP
- .B \-\-dao
- Utilizza la modalit\[`a] DAO; Il disco non sar\[`a] finalizzato.

debian/patches/05-help-dialog.patch

@@ -1,20 +1,34 @@
-Author: Daniel Baumann <daniel@debian.org>
-Description: Customizes the help-dialog according to README.MODIFYING.
+From: Daniel Baumann <daniel@debian.org>
+Date: Sun, 8 Apr 2012 21:53:29 +0900
+Subject: Customizes the help-dialog according to README.MODIFYING.
 
-Index: dvdisaster/help-dialogs.c
-===================================================================
---- dvdisaster.orig/help-dialogs.c	2012-03-06 11:08:21.000000000 +0900
-+++ dvdisaster/help-dialogs.c	2012-03-06 11:15:39.039035508 +0900
-@@ -402,7 +402,7 @@
+Description: Customizes the help-dialog according to README.MODIFYING.
+ .
+ * 2016-12-19 - Fixed path:
+   /usr/share/common/licenses/GPL-2 -> /usr/share/common-licenses/GPL-2
+   and restored use of "GPL" label.
+Author: Daniel Baumann <daniel@debian.org>
+Last-Update: 2016-12-19
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+---
+ help-dialogs.c | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/help-dialogs.c b/help-dialogs.c
+index c486613..758ac19 100644
+--- a/help-dialogs.c
++++ b/help-dialogs.c
+@@ -403,7 +403,7 @@ void ShowGPL()
    ShowTextfile(_("windowtitle|GNU General Public License"), 
  	       _("<big>GNU General Public License</big>\n"
  		 "<i>The license terms of dvdisaster.</i>"),
 -	       "COPYING", NULL, NULL);
-+	       "/usr/share/common/licenses/GPL-2", NULL, NULL);
++	       "/usr/share/common-licenses/GPL-2", NULL, NULL);
  }
  
  /*
-@@ -566,7 +566,7 @@
+@@ -567,7 +567,7 @@ static void show_modifying(void)
  {  ShowTextfile(_("windowtitle|Modifying dvdisaster"), 
  	       _("<big>Modifying dvdisaster</big>\n"
  		 "<i>Your changes are not ours.</i>"),
@@ -23,25 +37,8 @@ Index: dvdisaster/help-dialogs.c
  }
  
  static gint about_cb(GtkWidget *widget, GdkEvent *event, gpointer data)
-@@ -723,9 +723,9 @@
- 
- #ifdef MODIFIED_SOURCE
-    AboutTextWithLink(vbox, 
--		     _("Modified version Copyright 2011 (please fill in - [directions])\n"
--		       "Copyright 2004-2011 Carsten Gnoerlich"),
--		     "MODIFYING");
-+                    _("Modified version for [Debian GNU/Linux]\n"
-+                      "Original Copyright 2004-2011 Carsten Gnoerlich"),
-+                    "http://www.debian.org/");
- #else
-    AboutText(vbox, _("Copyright 2004-2011 Carsten Gnoerlich"));
- #endif
-@@ -742,14 +742,14 @@
-    AboutTextWithLink(vbox, _("This software comes with  <b>absolutely no warranty</b>.\n"
- 				"This is free software and you are welcome to redistribute it\n"
- 				"under the conditions of the [GNU General Public License].\n"), 
--			"GPL");
-+			"/usr/share/common-licenses/GPL-2");
+@@ -746,11 +746,11 @@ void AboutDialog()
+ 			"GPL");
  
  #ifdef MODIFIED_SOURCE
 -   AboutTextWithLink(vbox, _("\nThis program is <b>not the original</b>. It is based on the\n"

debian/patches/06-remove-encoding-from-desktop-file.patch

@@ -1,10 +0,0 @@
-Author: Rogério Theodoro de Brito <rbrito@ime.usp.br>
-Description: Remove unneeded Encoding-key from desktop file
-
---- a/contrib/dvdisaster.desktop
-+++ b/contrib/dvdisaster.desktop
-@@ -10,4 +10,3 @@
- Terminal=false
- Type=Application
- Categories=Application;System;
--Encoding=UTF-8

debian/patches/07-fix-spelling-errors-in-binaries.patch

@@ -1,38 +0,0 @@
-Author: Rogério Theodoro de Brito <rbrito@ime.usp.br>
-Description: Fix spelling errors in binaries
-
-Index: dvdisaster/preferences.c
-===================================================================
---- dvdisaster.orig/preferences.c	2012-03-06 11:16:16.451034441 +0900
-+++ dvdisaster/preferences.c	2012-03-06 11:18:09.563031210 +0900
-@@ -1627,7 +1627,7 @@
- 			 "The values include the borders: 0-100 will read 101 sectors.\n\n"
- 
- 			 "<b>Note:</b> Limiting the reading range is not recommended for <i>adaptive reading</i> since it might "
--			 "prevent sectors from being read which are required for a succesful error correction.\n\n"
-+			 "prevent sectors from being read which are required for a successful error correction.\n\n"
- 			 "These settings are only effective for the current session and will not be saved."));
- 
-       /** Image properties */
-@@ -1911,7 +1911,7 @@
- 			 "<b>0x20</b> This is the <i>recommended</i> mode. "
- 			 "The drive tries to apply "
- 			 "the built-in error correction to the best possible extent "
--			 "before transfering a defective sector.\n\n"
-+			 "before transferring a defective sector.\n\n"
- 			 "<b>0x21</b> In this mode the drive skips the last stage "
- 			 "of its internal error correction and returns the "
- 			 "uncorrected sector instead. This may result in sectors "
-Index: dvdisaster/rs01-fix.c
-===================================================================
---- dvdisaster.orig/rs01-fix.c	2012-03-06 11:16:16.451034441 +0900
-+++ dvdisaster/rs01-fix.c	2012-03-06 11:18:09.563031210 +0900
-@@ -246,7 +246,7 @@
-       if(Closure->guiMode)
-       {  int answer = ModalDialog(GTK_MESSAGE_QUESTION, GTK_BUTTONS_OK_CANCEL, NULL,
- 				  _("The image file is %d bytes longer than noted\n"
--				    "in the ecc file. Shall the superflous bytes\n"
-+				    "in the ecc file. Shall the superfluous bytes\n"
- 				    "be removed from the image file?\n"),
- 				    difference);
- 

debian/patches/08-fix-gnu-make-detection.patch

@@ -0,0 +1,41 @@
+From: Carlos Maddela <e7appew@gmail.com>
+Date: Sun, 18 Dec 2016 23:05:03 +1100
+Subject: Fix GNU Make detection.
+
+Description: Fix GNU Make detection.
+ While the previous code works with earlier versions of bash, it doesn't
+ seem to work with bash 4.4.5. The redirection to /dev/null somehow causes
+ grep to return an error code of 2.
+ .
+ This change allows for more predictable behaviour: grep returns an
+ error code of 0 or 1.
+Author: Carlos Maddela <e7appew@gmail.com>
+Bug-Debian: https://bugs.debian.org/848811
+Forwarded: no
+Last-Update: 2016-12-18
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+---
+ scripts/bash-based-configure | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/scripts/bash-based-configure b/scripts/bash-based-configure
+index 6baffde..f1a8bd1 100644
+--- a/scripts/bash-based-configure
++++ b/scripts/bash-based-configure
+@@ -313,13 +313,13 @@ function REQUIRE_GMAKE()
+ 
+    echo -n "Checking for gmake: "
+ 
+-   if (gmake -v | grep "GNU Make") > /dev/null 2>&1 ;
++   if (gmake -v 2>&1 | grep "GNU Make") > /dev/null 2>&1 ;
+      then echo "yes"
+ 	  echo "MAKE = `which gmake`" >>Makefile.config
+ 	  return 0
+    fi;
+ 
+-   if (make -v | grep "GNU Make") > /dev/null 2>&1 ;
++   if (make -v 2>&1 | grep "GNU Make") > /dev/null 2>&1 ;
+      then echo "yes"
+ 	  echo "MAKE = `which make`" >>Makefile.config
+ 	  return 0

debian/patches/10-use-non-size-specific-icon-and-add-keywords-to-desktop-file.patch

@@ -0,0 +1,28 @@
+From: Carlos Maddela <e7appew@gmail.com>
+Date: Mon, 19 Dec 2016 03:40:41 +1100
+Subject: Use non-size-specific icon and add keywords to desktop file.
+
+Description: Use non-size-specific icon and add keywords to desktop file.
+Author: Carlos Maddela <e7appew@gmail.com>
+Forwarded: no
+Last-Update: 2016-12-19
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+---
+ contrib/dvdisaster.desktop | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/contrib/dvdisaster.desktop b/contrib/dvdisaster.desktop
+index c7661ec..1f9926b 100644
+--- a/contrib/dvdisaster.desktop
++++ b/contrib/dvdisaster.desktop
+@@ -6,7 +6,8 @@ Comment=Additional error protection for CD/DVD media
+ Comment[cs]=Přídavná ochrana pro média CD/DVD
+ Comment[de]=Zusätzliche Fehlerkorrektur für CD/DVD
+ Exec=dvdisaster
+-Icon=dvdisaster48.png
++Icon=dvdisaster
+ Terminal=false
+ Type=Application
+ Categories=Application;System;
++Keywords=CD;DVD;media;data loss;scratch;aging;error;protection;recovery;

debian/patches/11-no-cruft.patch

@@ -0,0 +1,51 @@
+From: Carlos Maddela <e7appew@gmail.com>
+Date: Mon, 19 Dec 2016 05:06:30 +1100
+Subject: Do not install cruft.
+
+Description: Do not install cruft.
+Author: Carlos Maddela <e7appew@gmail.com>
+Forwarded: not-needed
+Last-Update: 2017-12-21
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+---
+ GNUmakefile.template | 19 -------------------
+ 1 file changed, 19 deletions(-)
+
+diff --git a/GNUmakefile.template b/GNUmakefile.template
+index 77a57bf..6fda92b 100644
+--- a/GNUmakefile.template
++++ b/GNUmakefile.template
+@@ -228,12 +228,6 @@ install: dvdisaster manual
+ 	install -d $(BUILDROOT)$(BINDIR)
+ 	install dvdisaster $(BUILDROOT)$(BINDIR)
+ 	install -d $(BUILDROOT)$(DOCSUBDIR)
+-	install -m 644 CHANGELOG $(BUILDROOT)$(DOCSUBDIR)
+-	install -m 644 COPYING $(BUILDROOT)$(DOCSUBDIR)
+-	install -m 644 CREDITS* $(BUILDROOT)$(DOCSUBDIR)
+-	install -m 644 README.MODIFYING $(BUILDROOT)$(DOCSUBDIR)
+-	install -m 644 TODO $(BUILDROOT)$(DOCSUBDIR)
+-	install -d $(BUILDROOT)$(DOCSUBDIR)
+ 	(cd documentation/user-manual; install -m 644 manual.pdf $(BUILDROOT)$(DOCSUBDIR))
+ 	install -d $(BUILDROOT)$(MANDIR)/man1
+ 	install -d $(BUILDROOT)$(MANDIR)/de/man1
+@@ -251,19 +245,6 @@ install: dvdisaster manual
+ 	    install -m 644 $$i/LC_MESSAGES/dvdisaster.mo $(BUILDROOT)$(LOCALEDIR)/$$i/LC_MESSAGES; \
+ 	  done \
+ 	fi
+-	@echo "# dvdisaster uninstaller script" > $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
+-	@echo "# Usage: sh dvdisaster-uninstall.sh" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
+-	@echo >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
+-	@echo "rm -f $(BINDIR)/dvdisaster $(BINDIR)/dvdisaster-uninstall.sh" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
+-	@echo "rm -rf $(DOCSUBDIR)" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
+-	@for i in $(PO_LOCALES); do \
+-	  echo "rm $(LOCALEDIR)/$$i/LC_MESSAGES/dvdisaster.mo" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh ; \
+-	done
+-	@echo "rm -f $(MANDIR)/man1/dvdisaster.1" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
+-	@for i in $(MAN_LOCALES); do \
+-	  echo "rm $(MANDIR)/$$i/man1/dvdisaster.1" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh ; \
+-	done
+-	@echo "echo \"dvdisaster has been uninstalled.\"" >> $(BUILDROOT)$(BINDIR)/dvdisaster-uninstall.sh
+ 
+ uninstall:
+ 	@echo "Uninstalling package..."

debian/patches/12-fix-spelling-of-up-to.patch

@@ -0,0 +1,397 @@
+From: Carlos Maddela <e7appew@gmail.com>
+Date: Mon, 19 Dec 2016 06:03:48 +1100
+Subject: Fix spelling: upto -> up to
+
+Description: Fix spelling: upto -> up to
+Author: Carlos Maddela <e7appew@gmail.com>
+Forwarded: no
+Last-Update: 2017-12-21
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+---
+ debug.c                            |  2 +-
+ documentation/codec-specs/rs01.tex |  2 +-
+ documentation/codec-specs/rs02.tex |  2 +-
+ documentation/dvdisaster.en.1      |  4 ++--
+ documentation/user-manual/qa.tex   |  2 +-
+ dvdisaster.c                       |  2 +-
+ dvdisaster.h                       |  4 ++--
+ locale/cs.po                       |  6 +++---
+ locale/de.po                       |  6 +++---
+ locale/it.po                       |  8 ++++----
+ locale/pt_BR.po                    | 10 +++++-----
+ locale/ru.po                       | 12 ++++++------
+ locale/sv.po                       |  6 +++---
+ preferences.c                      |  4 ++--
+ 14 files changed, 35 insertions(+), 35 deletions(-)
+
+diff --git a/debug.c b/debug.c
+index b4a96d1..bd725d6 100644
+--- a/debug.c
++++ b/debug.c
+@@ -1023,7 +1023,7 @@ void RawSector(char *arg)
+  *
+  * ./dvdisaster --debug --send-cdb 12,00,00,00,24,00:24
+  *
+- * The first six bytes make up the cdb; cdbs with upto 12 bytes are possible.
++ * The first six bytes make up the cdb; cdbs with up to 12 bytes are possible.
+  * The :24 arg is the allocation length. 
+  * Note that the allocation length must match those specified in the cdb;
+  * differing values may crash the system.
+diff --git a/documentation/codec-specs/rs01.tex b/documentation/codec-specs/rs01.tex
+index ebb1ee5..a8c0d90 100644
+--- a/documentation/codec-specs/rs01.tex
++++ b/documentation/codec-specs/rs01.tex
+@@ -172,7 +172,7 @@ The $d_{i,j}$ denote the $i-th$ byte in the $j-th$ layer.
+ In order to create the first ecc block, bytes $d_{1,1}$ to  $d_{1,n}$ are taken from the
+ $n$ layers. Then the RS(255,k) code is calculated (see appendix \ref{rs} for its parameters)
+ and the 
+-resulting $k$ parity bytes $e_{1,1}$ upto $e_{k,1}$ are stored
++resulting $k$ parity bytes $e_{1,1}$ up to $e_{k,1}$ are stored
+ in the ecc file. The resulting ecc block is marked grey in the
+ figure. The next ecc blocks are calculated and stored accordingly.
+ In total, the ecc section contains $k*ls$ bytes of parity information,
+diff --git a/documentation/codec-specs/rs02.tex b/documentation/codec-specs/rs02.tex
+index 69195a0..fb88384 100644
+--- a/documentation/codec-specs/rs02.tex
++++ b/documentation/codec-specs/rs02.tex
+@@ -133,7 +133,7 @@ Its format is described in appendix \ref{eh}. For RS02, only the data fields
+ marked with ``all'' or ``RS02'' are relevant; all other fields should be set to zero.
+ 
+ Data layer $n$ does also contain the CRC32 checksums of each data sector
+-upto the ecc header. If the .iso image contains $s$ sectors, 
++up to the ecc header. If the .iso image contains $s$ sectors,
+ then the CRC field contains $4s$ bytes, rounded up
+ to the nearest multiple of 2048. 
+ CRC32 checksums are calculated over a whole CD sector comprising 2048 bytes.
+diff --git a/documentation/dvdisaster.en.1 b/documentation/dvdisaster.en.1
+index 3472012..d71abec 100644
+--- a/documentation/dvdisaster.en.1
++++ b/documentation/dvdisaster.en.1
+@@ -279,7 +279,7 @@ Selects between the sg (SG_IO) driver (default setting) and the
+ older cdrom (CDROM_SEND_PACKET) driver for accessing the optical drives.
+ Both drivers should work equally well; however the cdrom driver is known
+ to cause system failures on some ancient SCSI controllers. 
+-The older cdrom driver was the default upto and including dvdisaster 0.72.x;
++The older cdrom driver was the default up to and including dvdisaster 0.72.x;
+ if the now pre-selected sg driver changes something to the worse for you
+ please switch back to the older driver using \-\-driver=cdrom.
+ .TP
+@@ -384,7 +384,7 @@ the uncorrected sector instead.
+ .RE
+ .TP
+ .B \-\-read-attempts n-m
+-attempts n upto m reads of a defective sector.
++attempts n up to m reads of a defective sector.
+ .TP
+ .B \-\-read-medium n
+ read the whole medium up to n times.
+diff --git a/documentation/user-manual/qa.tex b/documentation/user-manual/qa.tex
+index a3465a8..d79ca4d 100644
+--- a/documentation/user-manual/qa.tex
++++ b/documentation/user-manual/qa.tex
+@@ -465,6 +465,6 @@ drive for reading images in these cases.}
+ 
+ \qa{``Ecc file has been created with version 0.40.7.''}
+       {Some developer versions of dvdisaster mark their ecc files with a special bit.
+-        This causes dvdisaster versions upto 0.65 to falsely display the above error
++        This causes dvdisaster versions up to 0.65 to falsely display the above error
+         message. Please use the developer versions only together with dvdisaster
+         0.66 or newer versions. }
+diff --git a/dvdisaster.c b/dvdisaster.c
+index 6742d99..6840fd5 100644
+--- a/dvdisaster.c
++++ b/dvdisaster.c
+@@ -930,7 +930,7 @@ int main(int argc, char *argv[])
+       PrintCLI(_("  --old-ds-marker        - mark missing sectors compatible with dvdisaster <= 0.70\n"));
+       PrintCLI(_("  --prefetch-sectors n   - prefetch n sectors for RS03 encoding (uses ~nMiB)\n"));
+       PrintCLI(_("  --raw-mode n           - mode for raw reading CD media (20 or 21)\n"));
+-      PrintCLI(_("  --read-attempts n-m    - attempts n upto m reads of a defective sector\n"));
++      PrintCLI(_("  --read-attempts n-m    - attempts n up to m reads of a defective sector\n"));
+       PrintCLI(_("  --read-medium n        - read the whole medium up to n times\n"));
+       PrintCLI(_("  --read-raw             - performs read in raw mode if possible\n"));
+       PrintCLI(_("  --regtest              - tweaks output for compatibility with regtests\n"));
+diff --git a/dvdisaster.h b/dvdisaster.h
+index 7fb980b..a466450 100644
+--- a/dvdisaster.h
++++ b/dvdisaster.h
+@@ -112,7 +112,7 @@
+ 
+ #define MAX_CODEC_THREADS 1024           /* not including IO and GUI */
+ #define MAX_OLD_CACHE_SIZE  8096         /* old cache for RS01/RS02  */
+-#define MAX_PREFETCH_CACHE_SIZE (512*1024)   /* upto 0.5TB RS03  */
++#define MAX_PREFETCH_CACHE_SIZE (512*1024)   /* up to 0.5TB RS03  */
+ 
+ /* Choices for I/O strategy */
+ 
+@@ -376,7 +376,7 @@ typedef struct _LargeFile
+ #define FINGERPRINT_SECTOR 16 /* Sector currently used to calculate the fingerprint. */
+                               /* This is the ISO filesystem root sector which contains */
+                               /* the volume label and creation time stamps. */
+-                              /* Versions upto 0.64 used sector 257, */
++                              /* Versions up to 0.64 used sector 257, */
+                               /* but that was not a wise choice for CD media.*/
+ 
+ #define MFLAG_DEVEL (1<<0)    /* for methodFlags[3] */
+diff --git a/locale/cs.po b/locale/cs.po
+index 3274de9..4f766a3 100644
+--- a/locale/cs.po
++++ b/locale/cs.po
+@@ -662,7 +662,7 @@ msgid "  --raw-mode n           - mode for raw reading CD media (20 or 21)\n"
+ msgstr "  --raw-mode n           - režim přímého čtení pro CD disky (20 nebo 21)\n"
+ 
+ #: dvdisaster.c:933
+-msgid "  --read-attempts n-m    - attempts n upto m reads of a defective sector\n"
++msgid "  --read-attempts n-m    - attempts n up to m reads of a defective sector\n"
+ msgstr "  --read-attempts n-m    - zkusit n až m opakovaných čtení poškozeného sektoru\n"
+ 
+ #: dvdisaster.c:934
+@@ -2014,7 +2014,7 @@ msgstr "Přečtení sektoru nezkoušet více než %d krát"
+ msgid ""
+ "<b>Maximum number of reading attempts</b>\n"
+ "\n"
+-"When the minimum number of reading attempts is reached without success, dvdisaster might choose to perform additional reading attempts upto this number.\n"
++"When the minimum number of reading attempts is reached without success, dvdisaster might choose to perform additional reading attempts up to this number.\n"
+ "\n"
+ "The decision to do more attempts depends on the quality of data gathered so far, which in turn is influenced by the capabilities of your optical drive and the operating system. So depending on your configuration, you may or may not see dvdisaster using the maximum value."
+ msgstr ""
+@@ -2086,7 +2086,7 @@ msgstr " krát"
+ msgid ""
+ "<b>Media read attempts</b> for the linear reading strategy\n"
+ "\n"
+-"If unreadable sectors remain after reading the medium from start to end, the medium is read again upto he given number of times.\n"
++"If unreadable sectors remain after reading the medium from start to end, the medium is read again up to he given number of times.\n"
+ "\n"
+ "Only the missing sectors will be tried in the additional reading passes."
+ msgstr ""
+diff --git a/locale/de.po b/locale/de.po
+index b252c19..5b47778 100644
+--- a/locale/de.po
++++ b/locale/de.po
+@@ -704,7 +704,7 @@ msgid "  --raw-mode n           - mode for raw reading CD media (20 or 21)\n"
+ msgstr "  --raw-mode n           - \"raw-modus\" zum Lesen von CD (20 or 21)\n"
+ 
+ #: dvdisaster.c:933
+-msgid "  --read-attempts n-m    - attempts n upto m reads of a defective sector\n"
++msgid "  --read-attempts n-m    - attempts n up to m reads of a defective sector\n"
+ msgstr "  --read-attempts n-m    - versucht beschädigten Sektor n bis m-mal zu lesen\n"
+ 
+ #: dvdisaster.c:934
+@@ -2073,7 +2073,7 @@ msgstr "Höchstens %d Leseversuche pro Sektor"
+ msgid ""
+ "<b>Maximum number of reading attempts</b>\n"
+ "\n"
+-"When the minimum number of reading attempts is reached without success, dvdisaster might choose to perform additional reading attempts upto this number.\n"
++"When the minimum number of reading attempts is reached without success, dvdisaster might choose to perform additional reading attempts up to this number.\n"
+ "\n"
+ "The decision to do more attempts depends on the quality of data gathered so far, which in turn is influenced by the capabilities of your optical drive and the operating system. So depending on your configuration, you may or may not see dvdisaster using the maximum value."
+ msgstr ""
+@@ -2145,7 +2145,7 @@ msgstr " mal lesen"
+ msgid ""
+ "<b>Media read attempts</b> for the linear reading strategy\n"
+ "\n"
+-"If unreadable sectors remain after reading the medium from start to end, the medium is read again upto he given number of times.\n"
++"If unreadable sectors remain after reading the medium from start to end, the medium is read again up to he given number of times.\n"
+ "\n"
+ "Only the missing sectors will be tried in the additional reading passes."
+ msgstr ""
+diff --git a/locale/it.po b/locale/it.po
+index efd3d27..f6e9dfd 100644
+--- a/locale/it.po
++++ b/locale/it.po
+@@ -629,7 +629,7 @@ msgid "  --raw-mode n           - mode for raw reading CD media (20 or 21)\n"
+ msgstr ""
+ 
+ #: dvdisaster.c:933
+-msgid "  --read-attempts n-m    - attempts n upto m reads of a defective sector\n"
++msgid "  --read-attempts n-m    - attempts n up to m reads of a defective sector\n"
+ msgstr ""
+ 
+ #: dvdisaster.c:934
+@@ -1838,7 +1838,7 @@ msgstr ""
+ msgid ""
+ "<b>Maximum number of reading attempts</b>\n"
+ "\n"
+-"When the minimum number of reading attempts is reached without success, dvdisaster might choose to perform additional reading attempts upto this number.\n"
++"When the minimum number of reading attempts is reached without success, dvdisaster might choose to perform additional reading attempts up to this number.\n"
+ "\n"
+ "The decision to do more attempts depends on the quality of data gathered so far, which in turn is influenced by the capabilities of your optical drive and the operating system. So depending on your configuration, you may or may not see dvdisaster using the maximum value."
+ msgstr ""
+@@ -1897,7 +1897,7 @@ msgstr ""
+ msgid ""
+ "<b>Media read attempts</b> for the linear reading strategy\n"
+ "\n"
+-"If unreadable sectors remain after reading the medium from start to end, the medium is read again upto he given number of times.\n"
++"If unreadable sectors remain after reading the medium from start to end, the medium is read again up to he given number of times.\n"
+ "\n"
+ "Only the missing sectors will be tried in the additional reading passes."
+ msgstr ""
+@@ -6086,7 +6086,7 @@ msgstr ""
+ #~ msgstr "Se potete verificate se la dimensione dell'immagine è corretta,\n"
+ 
+ #~ msgid ""
+-#~ "please send in the whole dvdisaster output upto this line\n"
++#~ "please send in the whole dvdisaster output up to this line\n"
+ #~ "to have your drive included in the internal data base.\n"
+ #~ msgstr ""
+ #~ "Prego inviare l'intero output di dvdisaster fino a questa linea\n"
+diff --git a/locale/pt_BR.po b/locale/pt_BR.po
+index 21ea77b..86eda03 100644
+--- a/locale/pt_BR.po
++++ b/locale/pt_BR.po
+@@ -645,7 +645,7 @@ msgid "  --raw-mode n           - mode for raw reading CD media (20 or 21)\n"
+ msgstr "  --raw-mode n            - modo para leitura de mídia CD em modo raw (20 ou 21)\n"
+ 
+ #: dvdisaster.c:933
+-msgid "  --read-attempts n-m    - attempts n upto m reads of a defective sector\n"
++msgid "  --read-attempts n-m    - attempts n up to m reads of a defective sector\n"
+ msgstr "  --read-attempts n-m     - tenta de n a m leituras em um setor defeituoso\n"
+ 
+ #: dvdisaster.c:934
+@@ -1949,7 +1949,7 @@ msgstr "Máx. de %d tentativas de leitura por setor"
+ msgid ""
+ "<b>Maximum number of reading attempts</b>\n"
+ "\n"
+-"When the minimum number of reading attempts is reached without success, dvdisaster might choose to perform additional reading attempts upto this number.\n"
++"When the minimum number of reading attempts is reached without success, dvdisaster might choose to perform additional reading attempts up to this number.\n"
+ "\n"
+ "The decision to do more attempts depends on the quality of data gathered so far, which in turn is influenced by the capabilities of your optical drive and the operating system. So depending on your configuration, you may or may not see dvdisaster using the maximum value."
+ msgstr ""
+@@ -2021,7 +2021,7 @@ msgstr " vezes"
+ msgid ""
+ "<b>Media read attempts</b> for the linear reading strategy\n"
+ "\n"
+-"If unreadable sectors remain after reading the medium from start to end, the medium is read again upto he given number of times.\n"
++"If unreadable sectors remain after reading the medium from start to end, the medium is read again up to he given number of times.\n"
+ "\n"
+ "Only the missing sectors will be tried in the additional reading passes."
+ msgstr ""
+@@ -6482,7 +6482,7 @@ msgstr "<i>Novidades dessa versão:</i>"
+ #~ "  --internal-rereads n   - drive may attempt n rereads before reporting an error\n"
+ #~ "  --query-size n         - query drive/udf/ecc for image size (default: ecc)\n"
+ #~ "  --raw-mode n           - mode for raw reading CD media (20 or 21)\n"
+-#~ "  --read-attempts n-m    - attempts n upto m reads of a defective sector\n"
++#~ "  --read-attempts n-m    - attempts n up to m reads of a defective sector\n"
+ #~ "  --read-medium n        - read the whole medium up to n times\n"
+ #~ "  --read-raw             - performs read in raw mode if possible\n"
+ #~ "  --speed-warning n      - print warning if speed changes by more than n percent\n"
+@@ -6501,7 +6501,7 @@ msgstr "<i>Novidades dessa versão:</i>"
+ #~ msgid ""
+ #~ "<b>File splitting</b>\n"
+ #~ "\n"
+-#~ "Allows working with file systems which are limited to 2GB per file, e.g. FAT from Windows. Created files are spread over upto 100 segments called \"medium00.iso\", \"medium01.iso\" etc. at the cost of a small performance hit."
++#~ "Allows working with file systems which are limited to 2GB per file, e.g. FAT from Windows. Created files are spread over up to 100 segments called \"medium00.iso\", \"medium01.iso\" etc. at the cost of a small performance hit."
+ #~ msgstr ""
+ #~ "<b>Separação de arquivos</b>\n"
+ #~ "\n"
+diff --git a/locale/ru.po b/locale/ru.po
+index 767f906..7984c59 100644
+--- a/locale/ru.po
++++ b/locale/ru.po
+@@ -644,7 +644,7 @@ msgid "  --raw-mode n           - mode for raw reading CD media (20 or 21)\n"
+ msgstr "  --raw-mode n           - режим для низкоуровневого чтения CD-носителей (20 или 21)\n"
+ 
+ #: dvdisaster.c:933
+-msgid "  --read-attempts n-m    - attempts n upto m reads of a defective sector\n"
++msgid "  --read-attempts n-m    - attempts n up to m reads of a defective sector\n"
+ msgstr "  --read-attempts n-m    - делается от n до m попыток чтения поврежденного сектора\n"
+ 
+ #: dvdisaster.c:934
+@@ -1952,7 +1952,7 @@ msgstr "Макс. %d попыток чтения на сектор"
+ msgid ""
+ "<b>Maximum number of reading attempts</b>\n"
+ "\n"
+-"When the minimum number of reading attempts is reached without success, dvdisaster might choose to perform additional reading attempts upto this number.\n"
++"When the minimum number of reading attempts is reached without success, dvdisaster might choose to perform additional reading attempts up to this number.\n"
+ "\n"
+ "The decision to do more attempts depends on the quality of data gathered so far, which in turn is influenced by the capabilities of your optical drive and the operating system. So depending on your configuration, you may or may not see dvdisaster using the maximum value."
+ msgstr ""
+@@ -2024,7 +2024,7 @@ msgstr " раз"
+ msgid ""
+ "<b>Media read attempts</b> for the linear reading strategy\n"
+ "\n"
+-"If unreadable sectors remain after reading the medium from start to end, the medium is read again upto he given number of times.\n"
++"If unreadable sectors remain after reading the medium from start to end, the medium is read again up to he given number of times.\n"
+ "\n"
+ "Only the missing sectors will be tried in the additional reading passes."
+ msgstr ""
+@@ -6543,7 +6543,7 @@ msgstr "<i>Новое в этой версии:</i>"
+ #~ "  --internal-rereads n   - drive may attempt n rereads before reporting an error\n"
+ #~ "  --query-size n         - query drive/udf/ecc for image size (default: ecc)\n"
+ #~ "  --raw-mode n           - mode for raw reading CD media (20 or 21)\n"
+-#~ "  --read-attempts n-m    - attempts n upto m reads of a defective sector\n"
++#~ "  --read-attempts n-m    - attempts n up to m reads of a defective sector\n"
+ #~ "  --read-medium n        - read the whole medium up to n times\n"
+ #~ "  --read-raw             - performs read in raw mode if possible\n"
+ #~ "  --speed-warning n      - print warning if speed changes by more than n percent\n"
+@@ -6560,7 +6560,7 @@ msgstr "<i>Новое в этой версии:</i>"
+ #~ msgid ""
+ #~ "<b>File splitting</b>\n"
+ #~ "\n"
+-#~ "Allows working with file systems which are limited to 2GB per file, e.g. FAT from Windows. Created files are spread over upto 100 segments called \"medium00.iso\", \"medium01.iso\" etc. at the cost of a small performance hit."
++#~ "Allows working with file systems which are limited to 2GB per file, e.g. FAT from Windows. Created files are spread over up to 100 segments called \"medium00.iso\", \"medium01.iso\" etc. at the cost of a small performance hit."
+ #~ msgstr ""
+ #~ "<b>Разбиение файлов</b>\n"
+ #~ "\n"
+@@ -6606,7 +6606,7 @@ msgstr "<i>Новое в этой версии:</i>"
+ #~ "  --internal-rereads n   - drive may attempt n rereads before reporting an error\n"
+ #~ "  --query-size n         - query drive/udf/ecc for image size (default: ecc)\n"
+ #~ "  --raw-mode n           - mode for raw reading CD media (20 or 21)\n"
+-#~ "  --read-attempts n-m    - attempts n upto m reads of a defective sector\n"
++#~ "  --read-attempts n-m    - attempts n up to m reads of a defective sector\n"
+ #~ "  --read-medium n        - read the whole medium up to n times\n"
+ #~ "  --read-raw             - performs read in raw mode if possible\n"
+ #~ "  --speed-warning n      - print warning if speed changes by more than n percent\n"
+diff --git a/locale/sv.po b/locale/sv.po
+index 548e2e5..c74a942 100644
+--- a/locale/sv.po
++++ b/locale/sv.po
+@@ -630,7 +630,7 @@ msgid "  --raw-mode n           - mode for raw reading CD media (20 or 21)\n"
+ msgstr ""
+ 
+ #: dvdisaster.c:933
+-msgid "  --read-attempts n-m    - attempts n upto m reads of a defective sector\n"
++msgid "  --read-attempts n-m    - attempts n up to m reads of a defective sector\n"
+ msgstr ""
+ 
+ #: dvdisaster.c:934
+@@ -1844,7 +1844,7 @@ msgstr ""
+ msgid ""
+ "<b>Maximum number of reading attempts</b>\n"
+ "\n"
+-"When the minimum number of reading attempts is reached without success, dvdisaster might choose to perform additional reading attempts upto this number.\n"
++"When the minimum number of reading attempts is reached without success, dvdisaster might choose to perform additional reading attempts up to this number.\n"
+ "\n"
+ "The decision to do more attempts depends on the quality of data gathered so far, which in turn is influenced by the capabilities of your optical drive and the operating system. So depending on your configuration, you may or may not see dvdisaster using the maximum value."
+ msgstr ""
+@@ -1903,7 +1903,7 @@ msgstr ""
+ msgid ""
+ "<b>Media read attempts</b> for the linear reading strategy\n"
+ "\n"
+-"If unreadable sectors remain after reading the medium from start to end, the medium is read again upto he given number of times.\n"
++"If unreadable sectors remain after reading the medium from start to end, the medium is read again up to he given number of times.\n"
+ "\n"
+ "Only the missing sectors will be tried in the additional reading passes."
+ msgstr ""
+diff --git a/preferences.c b/preferences.c
+index 70afa02..4899317 100644
+--- a/preferences.c
++++ b/preferences.c
+@@ -2221,7 +2221,7 @@ void CreatePreferencesWindow(void)
+ 		       _("<b>Maximum number of reading attempts</b>\n\n"
+ 			 "When the minimum number of reading attempts is reached "
+ 			 "without success, dvdisaster might choose to perform additional "
+-			 "reading attempts upto this number.\n\n"
++			 "reading attempts up to this number.\n\n"
+ 
+ 			 "The decision to do more attempts depends on the quality of "
+ 			 "data gathered so far, which in turn is influenced by the "
+@@ -2336,7 +2336,7 @@ void CreatePreferencesWindow(void)
+       AddHelpParagraph(lwoh, 
+ 		       _("<b>Media read attempts</b> for the linear reading strategy\n\n"
+ 			 "If unreadable sectors remain after reading the medium from start to end, "
+-			 "the medium is read again upto he given number of times.\n\n"
++			 "the medium is read again up to he given number of times.\n\n"
+ 			 "Only the missing sectors will be tried in the additional reading passes."));
+ 
+       /** Defective sector caching */

debian/patches/13-fix-missing-language-field-in-po-files.patch

@@ -0,0 +1,41 @@
+From: Carlos Maddela <e7appew@gmail.com>
+Date: Mon, 19 Dec 2016 07:04:02 +1100
+Subject: Fix missing language fields in PO files.
+
+Description: Fix missing language fields in PO files.
+Author: Carlos Maddela <e7appew@gmail.com>
+Forwarded: no
+Last-Update: 2017-01-05
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+---
+ locale/pt_BR.po | 2 +-
+ locale/ru.po    | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/locale/pt_BR.po b/locale/pt_BR.po
+index 86eda03..f3437f3 100644
+--- a/locale/pt_BR.po
++++ b/locale/pt_BR.po
+@@ -11,7 +11,7 @@ msgstr ""
+ "PO-Revision-Date: 2010-06-09 11:13+0200\n"
+ "Last-Translator: cg <cg@dvdisaster.org>\n"
+ "Language-Team: Portuguese\n"
+-"Language: \n"
++"Language: pt_BR\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+diff --git a/locale/ru.po b/locale/ru.po
+index 7984c59..1bc7324 100644
+--- a/locale/ru.po
++++ b/locale/ru.po
+@@ -13,7 +13,7 @@ msgstr ""
+ "PO-Revision-Date: 2009-07-23 08:11+0300\n"
+ "Last-Translator: Igor Gorbounov <igor.gorbounov@gmail.com>\n"
+ "Language-Team: Russian\n"
+-"Language: \n"
++"Language: ru\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"

debian/patches/14-make-builds-reproducible.patch

@@ -0,0 +1,128 @@
+From: Carlos Maddela <e7appew@gmail.com>
+Date: Mon, 19 Dec 2016 09:39:49 +1100
+Subject: Make builds reproducible.
+
+Description: Make builds reproducible.
+ Use the Debian changelog details to derive a build number and date,
+ so that we can make reproducible binaries.
+Author: Carlos Maddela <e7appew@gmail.com>
+Forwarded: not-needed
+Last-Update: 2017-08-14
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+---
+ build.c                   | 2 +-
+ closure.c                 | 2 +-
+ dvdisaster.h              | 2 +-
+ locale/cs.po              | 4 ++--
+ locale/pt_BR.po           | 4 ++--
+ locale/ru.po              | 4 ++--
+ scripts/time-stamper.bash | 8 ++++----
+ 7 files changed, 13 insertions(+), 13 deletions(-)
+
+diff --git a/build.c b/build.c
+index 0e99b22..65b17cd 100644
+--- a/build.c
++++ b/build.c
+@@ -25,4 +25,4 @@
+ /* build is incremented at each make;
+    make recompile of dependent file as fast as possible */
+ 
+-int  buildCount = BUILD;
++const char *const buildCount = BUILD;
+diff --git a/closure.c b/closure.c
+index 58ba86f..d633d53 100644
+--- a/closure.c
++++ b/closure.c
+@@ -442,7 +442,7 @@ void InitClosure()
+   #define BITNESS_STRING ""
+ #endif
+ 
+-   Closure->versionString = g_strdup_printf("dvdisaster %s build %d, %s%s",
++   Closure->versionString = g_strdup_printf("dvdisaster %s build %s, %s%s",
+ 					    Closure->cookedVersion, buildCount, SYS_NAME, BITNESS_STRING);
+ 
+    /* Replace the dot with a locale-resistant separator */
+diff --git a/dvdisaster.h b/dvdisaster.h
+index a466450..9acd094 100644
+--- a/dvdisaster.h
++++ b/dvdisaster.h
+@@ -463,7 +463,7 @@ void FreeBitmap(Bitmap*);
+  *** build.h
+  ***/
+ 
+-int buildCount;
++extern const char *const buildCount;
+ 
+ /***
+  *** cacheprobe.h
+diff --git a/locale/cs.po b/locale/cs.po
+index 4f766a3..453ec07 100644
+--- a/locale/cs.po
++++ b/locale/cs.po
+@@ -6511,11 +6511,11 @@ msgstr "<i>Novinky v této verzi:</i>"
+ 
+ #~ msgid ""
+ #~ "\n"
+-#~ "dvdisaster version %s build %d\n"
++#~ "dvdisaster version %s build %s\n"
+ #~ "\n"
+ #~ msgstr ""
+ #~ "\n"
+-#~ "dvdisaster verze %s sestavení %d\n"
++#~ "dvdisaster verze %s sestavení %s\n"
+ #~ "\n"
+ 
+ #~ msgid "--prefetch-sectors must be in range 32...8096"
+diff --git a/locale/pt_BR.po b/locale/pt_BR.po
+index f3437f3..f7f6af0 100644
+--- a/locale/pt_BR.po
++++ b/locale/pt_BR.po
+@@ -6232,11 +6232,11 @@ msgstr "<i>Novidades dessa versão:</i>"
+ 
+ #~ msgid ""
+ #~ "\n"
+-#~ "dvdisaster version %s build %d\n"
++#~ "dvdisaster version %s build %s\n"
+ #~ "\n"
+ #~ msgstr ""
+ #~ "\n"
+-#~ "dvdisaster, versão %s build %d\n"
++#~ "dvdisaster, versão %s build %s\n"
+ 
+ #~ msgid "--cache-size maximum is 8192MiB."
+ #~ msgstr "--cache-size máximo é 8192MiB."
+diff --git a/locale/ru.po b/locale/ru.po
+index 1bc7324..9625a1f 100644
+--- a/locale/ru.po
++++ b/locale/ru.po
+@@ -6247,11 +6247,11 @@ msgstr "<i>Новое в этой версии:</i>"
+ 
+ #~ msgid ""
+ #~ "\n"
+-#~ "dvdisaster version %s build %d\n"
++#~ "dvdisaster version %s build %s\n"
+ #~ "\n"
+ #~ msgstr ""
+ #~ "\n"
+-#~ "dvdisaster версия %s сборка %d\n"
++#~ "dvdisaster версия %s сборка %s\n"
+ #~ "\n"
+ 
+ #~ msgid "--cache-size maximum is 8192MiB."
+diff --git a/scripts/time-stamper.bash b/scripts/time-stamper.bash
+index fd28794..4ec3e60 100755
+--- a/scripts/time-stamper.bash
++++ b/scripts/time-stamper.bash
+@@ -1,7 +1,7 @@
+ #!/usr/bin/env bash
+ 
+-build=$(grep BUILD $1  | cut -d\  -f3)
+-build=$((build+1))
+-echo "#define BUILD $build" >$1
+-date=$(date +"%d.%m.%y (%A, %H:%M)")
++# Use Debian changelog details to derive build number and date.
++build=$(echo "${DEB_VERSION}" | cut -f2 -d-)
++echo "#define BUILD \"$build\"" >$1
++date=$(date --date="@${SOURCE_DATE_EPOCH}" --utc +"%d.%m.%y (%A, %H:%M)")
+ echo "#define BDATE \"$date\"" >>$1

debian/patches/15-show-new-pkg-tracker.patch

@@ -0,0 +1,28 @@
+From: Carlos Maddela <e7appew@gmail.com>
+Date: Mon, 19 Dec 2016 12:02:51 +1100
+Subject: Update help dialog to show link to the new Debian package tracker.
+
+Description: Update help dialog to show link to the new Debian
+ package tracker.
+Author: Carlos Maddela <e7appew@gmail.com>
+Forwarded: not-needed
+Last-Update: 2016-12-19
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+---
+ help-dialogs.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/help-dialogs.c b/help-dialogs.c
+index 758ac19..47551f7 100644
+--- a/help-dialogs.c
++++ b/help-dialogs.c
+@@ -750,7 +750,7 @@ void AboutDialog()
+ 			     "for Debian to support DVD-ROMs (with and without encryption).\n\n"
+ 			     "Please do not bother the original authors of dvdisaster\n"
+ 			     "but submit bugreports against the [debian package] instead.\n"),
+-			     "http://packages.qa.debian.org/dvdisaster");
++			     "https://tracker.debian.org/pkg/dvdisaster");
+ 
+ #else
+    lang = g_getenv("LANG");

debian/patches/16-remove-auto-build-of-doco-from-install-rule.patch

@@ -0,0 +1,33 @@
+From: Carlos Maddela <e7appew@gmail.com>
+Date: Thu, 22 Dec 2016 02:20:30 +1100
+Subject: Don't build and install documentation automatically.
+
+Description: Don't build and install documentation automatically.
+ This allows for better control over binary-arch and binary-indep builds.
+Author: Carlos Maddela <e7appew@gmail.com>
+Forwarded: not-needed
+Last-Update: 2017-01-05
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+---
+ GNUmakefile.template | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/GNUmakefile.template b/GNUmakefile.template
+index 6fda92b..d9bef11 100644
+--- a/GNUmakefile.template
++++ b/GNUmakefile.template
+@@ -223,12 +223,11 @@ show:
+ .PHONY : install uninstall clean distclean arch
+ .PHONY : srcdist
+ 
+-install: dvdisaster manual
++install: dvdisaster
+ 	@echo "Installing package..."
+ 	install -d $(BUILDROOT)$(BINDIR)
+ 	install dvdisaster $(BUILDROOT)$(BINDIR)
+ 	install -d $(BUILDROOT)$(DOCSUBDIR)
+-	(cd documentation/user-manual; install -m 644 manual.pdf $(BUILDROOT)$(DOCSUBDIR))
+ 	install -d $(BUILDROOT)$(MANDIR)/man1
+ 	install -d $(BUILDROOT)$(MANDIR)/de/man1
+ 	cd documentation; \

debian/patches/17-fix-all-but-deprecated-api-warnings.patch

@@ -0,0 +1,244 @@
+From: Carlos Maddela <e7appew@gmail.com>
+Date: Thu, 22 Dec 2016 11:19:20 +1100
+Subject: Fix all warnings except for those related to deprecated API.
+
+Description: Fix all warnings except for those related to deprecated API.
+Author: Carlos Maddela <e7appew@gmail.com>
+Bug-Debian: https://bugs.debian.org/748416
+Forwarded: no
+Last-Update: 2017-12-21
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+---
+ closure.c     |  2 +-
+ menubar.c     |  2 +-
+ rs03-create.c | 24 ++++++++++++------------
+ rs03-fix.c    |  8 ++++----
+ scsi-layer.c  |  4 ++++
+ smart-lec.c   | 10 +++++-----
+ 6 files changed, 27 insertions(+), 23 deletions(-)
+
+diff --git a/closure.c b/closure.c
+index d633d53..fa52f09 100644
+--- a/closure.c
++++ b/closure.c
+@@ -196,7 +196,7 @@ void ReadDotfile()
+       /* Get first MAX_LINE_LEN bytes of line, discard the rest */
+      
+       line[MAX_LINE_LEN-1] = 1;
+-      fgets(line, MAX_LINE_LEN, dotfile);
++      if(!fgets(line, MAX_LINE_LEN, dotfile)) break;
+       if(!line[MAX_LINE_LEN-1])  /* line longer than buffer */
+ 	while(!feof(dotfile) && fgetc(dotfile) != '\n')
+ 	  ;
+diff --git a/menubar.c b/menubar.c
+index 94d462b..ee24ebe 100644
+--- a/menubar.c
++++ b/menubar.c
+@@ -414,7 +414,7 @@ void set_path(GtkWidget *entry, char *path)
+    else
+    {  char buf[PATH_MAX + strlen(path) + 2];
+ 
+-      getcwd(buf, PATH_MAX);
++      if(!getcwd(buf, PATH_MAX)) return;
+       strcat(buf,"/");
+ 
+       strcat(buf,path);
+diff --git a/rs03-create.c b/rs03-create.c
+index 71460ef..9c7265d 100644
+--- a/rs03-create.c
++++ b/rs03-create.c
+@@ -31,9 +31,9 @@
+ 
+ //#define VERBOSE 1
+ #ifdef VERBOSE
+-  #define verbose(format,args...) printf(format, ## args)
++  #define verbose(format,...) printf(format, __VA_ARGS__)
+ #else
+-  #define verbose(format,args...)
++  #define verbose(format,...)
+ #endif
+ 
+ #ifdef HAVE_MMAP
+@@ -714,7 +714,7 @@ static void flush_crc(ecc_closure *ec, LargeFile *file_out)
+ 
+    /* Write out the CRC layer */
+       
+-   verbose("IO: writing CRC layer\n");
++   verbose("%s", "IO: writing CRC layer\n");
+    crc_sect = 2048*(ec->encoderChunk+lay->firstCrcPos);
+    if(!LargeSeek(file_out, crc_sect))
+    {  ec->abortImmediately = TRUE;
+@@ -735,7 +735,7 @@ static void flush_parity(ecc_closure *ec, LargeFile *file_out)
+ 
+    /* Write out the created parity. */
+ 
+-   verbose("IO: writing parity...\n");
++   verbose("%s", "IO: writing parity...\n");
+    for(k=0; k<lay->nroots; k++)
+    {  gint64 idx=0;
+ 
+@@ -752,7 +752,7 @@ static void flush_parity(ecc_closure *ec, LargeFile *file_out)
+ 	 }
+       }
+    }
+-   verbose("IO: parity written.\n");
++   verbose("%s", "IO: parity written.\n");
+ }
+ 
+ static gpointer io_thread(ecc_closure *ec)
+@@ -767,7 +767,7 @@ static gpointer io_thread(ecc_closure *ec)
+    int parity_available = 0;
+    int i;
+ 
+-   verbose("Reader thread initializing\n");
++   verbose("%s", "Reader thread initializing\n");
+ 
+    /*** Allocate local parity buffer aligned at 128bit boundary */
+ 
+@@ -835,7 +835,7 @@ static gpointer io_thread(ecc_closure *ec)
+       {  read_next_chunk(ec, chunk);
+ 	 //	 flush_crc(ec, file_out);  // FIXME
+ 	 needs_preload = 0;
+-	 verbose("IO: first chunk loaded\n");
++	 verbose("%s", "IO: first chunk loaded\n");
+ 	 continue;
+       }
+ 
+@@ -882,7 +882,7 @@ static gpointer io_thread(ecc_closure *ec)
+       g_mutex_lock(ec->lock);
+       cpu_bound = ec->buffersToEncode;
+       while(ec->buffersToEncode)
+-      {  verbose("IO: Waiting for encoders to finish\n");
++      {  verbose("%s", "IO: Waiting for encoders to finish\n");
+ 	 g_cond_wait(ec->ioCond, ec->lock);
+       }
+       g_mutex_unlock(ec->lock);
+@@ -924,7 +924,7 @@ static gpointer io_thread(ecc_closure *ec)
+    ec->slicesFree = TRUE;  /* we have saved the slices; go ahead */
+    g_cond_broadcast(ec->ioCond);
+    while(ec->buffersToEncode)
+-   {  verbose("IO: Waiting for encoders to finish last chunk\n");
++   {  verbose("%s", "IO: Waiting for encoders to finish last chunk\n");
+       g_cond_wait(ec->ioCond, ec->lock);
+    }
+    g_mutex_unlock(ec->lock);
+@@ -937,7 +937,7 @@ static gpointer io_thread(ecc_closure *ec)
+    flush_crc(ec, file_out);
+    flush_parity(ec, file_out);
+ 
+-   verbose("IO: finished\n"); fflush(stdout);
++   verbose("%s", "IO: finished\n"); fflush(stdout);
+    return NULL;
+ }
+ 
+@@ -1123,7 +1123,7 @@ static gpointer encoder_thread(ecc_closure *ec)
+       ec->buffersToEncode-=enc_size;
+       if(!ec->buffersToEncode)
+       {  g_cond_broadcast(ec->ioCond);
+-	 verbose("ENC: processed last buffer; telling IO process.\n");
++	 verbose("%s", "ENC: processed last buffer; telling IO process.\n");
+ 	 fflush(stdout);
+       }
+       g_mutex_unlock(ec->lock);
+@@ -1223,7 +1223,7 @@ static void create_reed_solomon(ecc_closure *ec)
+       verbose("SCHED: joined with worker %d\n", i);
+       fflush(stdout);
+    }
+-   verbose("SCHED: scheduler finished.\n");
++   verbose("%s", "SCHED: scheduler finished.\n");
+ }
+ 
+ /***
+diff --git a/rs03-fix.c b/rs03-fix.c
+index 7afb6d6..19b9322 100644
+--- a/rs03-fix.c
++++ b/rs03-fix.c
+@@ -829,10 +829,10 @@ void RS03Fix(Image *image)
+ 	      if we were processing an augmented image. */
+ 
+ 	   if(lay->target == ECC_FILE && i >= ndata-1)
+-	   {  
+-              if(!LargeSeek(image->eccFile, (gint64)(2048*sec)))
+-		 Stop(_("Failed seeking to sector %lld in ecc file [%s]: %s"),
+-		      sec, "FW", strerror(errno));
++	   {
++		 if(!LargeSeek(image->eccFile, (gint64)(2048*sec)))
++		    Stop(_("Failed seeking to sector %lld in ecc file [%s]: %s"),
++			 sec, "FW", strerror(errno));
+ 
+ 	      n = LargeWrite(image->eccFile, cache_offset+fc->imgBlock[i], 2048);
+ 	      if(n != 2048)
+diff --git a/scsi-layer.c b/scsi-layer.c
+index b3a9d0e..f8d2112 100644
+--- a/scsi-layer.c
++++ b/scsi-layer.c
+@@ -31,7 +31,9 @@
+ 
+ static int query_type(DeviceHandle*, int);
+ static gint64 query_size(Image*);
++#if 0
+ static int query_copyright(DeviceHandle*);
++#endif
+ 
+ static int read_dvd_sector(DeviceHandle*, unsigned char*, int, int);
+ static int read_cd_sector(DeviceHandle*, unsigned char*, int, int);
+@@ -1649,6 +1651,7 @@ reset_mode_page:
+  * Find out whether we are allowed to create an image from the DVD.
+  */
+ 
++#if 0
+ static int query_copyright(DeviceHandle *dh)
+ {  Sense sense;
+    AlignedBuffer *ab = CreateAlignedBuffer(2048);
+@@ -1709,6 +1712,7 @@ static int query_copyright(DeviceHandle *dh)
+ 
+    return result;
+ }
++#endif
+ 
+ /*
+  * See whether a sector lies within the user area.
+diff --git a/smart-lec.c b/smart-lec.c
+index 02b9c49..944b70d 100644
+--- a/smart-lec.c
++++ b/smart-lec.c
+@@ -27,9 +27,9 @@
+ 
+ #define VERBOSE 1
+ #ifdef VERBOSE
+-  #define verbose(format,args...) printf(format, ## args)
++  #define verbose(format,...) printf(format, __VA_ARGS__)
+ #else
+-  #define verbose(format,args...)
++  #define verbose(format,...)
+ #endif
+ 
+ /***
+@@ -432,7 +432,7 @@ static void update_pq_state(sh_context *shc)
+ static void print_pq_state(sh_context *shc)
+ {  int i;
+ 
+-   verbose("PQ states: \n");
++   verbose("%s", "PQ states: \n");
+ 
+    for(i=0; i<N_P_VECTORS; i++)
+    {  if(shc->pState[i] == 1)
+@@ -1354,7 +1354,7 @@ static void swap_p_for_new_improvement(sh_context *shc)
+ 		  count++;
+ 
+ 	    if(count < 2)
+-	    {  verbose(" pruned");
++	    {  verbose("%s", " pruned");
+ 	       goto decrement;
+ 	    }
+ 
+@@ -1417,7 +1417,7 @@ decrement:
+ 	    if(index >= n_q) break;
+ 	    selection[index]=0;
+ 
+-	    verbose("\n");
++	    verbose("%s", "\n");
+ 	 }
+       }
+    }

debian/patches/18-update-copyright-in-about-dialog.patch

@@ -0,0 +1,30 @@
+From: Carlos Maddela <e7appew@gmail.com>
+Date: Wed, 21 Dec 2016 07:25:17 +1100
+Subject: Update copyright notice in about dialog.
+
+Description: Update copyright notice in about dialog.
+Author: Carlos Maddela <e7appew@gmail.com>
+Forwarded: not-needed
+Last-Update: 2017-12-21
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+---
+ help-dialogs.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/help-dialogs.c b/help-dialogs.c
+index 47551f7..3f94920 100644
+--- a/help-dialogs.c
++++ b/help-dialogs.c
+@@ -723,8 +723,9 @@ void AboutDialog()
+    g_free(text);
+ 
+ #ifdef MODIFIED_SOURCE
+-   AboutTextWithLink(vbox, 
+-		     _("Modified version Copyright 2017 (please fill in - [directions])\n"
++   AboutTextWithLink(vbox,
++		     _("[Modified version]\n"
++		       "Copyright 2005-2017 Debian Optical Media Tools Team\n"
+ 		       "Copyright 2004-2017 Carsten Gnoerlich"),
+ 		     "MODIFYING");
+ #else

debian/patches/19-show-text-files-with-abs-path.patch

@@ -0,0 +1,43 @@
+From: Carlos Maddela <e7appew@gmail.com>
+Date: Wed, 21 Dec 2016 09:08:05 +1100
+Subject: Allow ShowTextFile() to work with absolute path names.
+
+Description: Allow ShowTextFile() to work with absolute path names.
+Author: Carlos Maddela <e7appew@gmail.com>
+Forwarded: no
+Last-Update: 2016-12-21
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+---
+ help-dialogs.c | 18 ++++++++++++++++++
+ 1 file changed, 18 insertions(+)
+
+diff --git a/help-dialogs.c b/help-dialogs.c
+index 3f94920..d893d33 100644
+--- a/help-dialogs.c
++++ b/help-dialogs.c
+@@ -423,6 +423,24 @@ char *find_file(char *file, size_t *size, char *lang)
+       lang_suffix[1] = lang[1];
+    }
+ 
++   /* Test for absolute path first. */
++   if(*file == '/')
++   {
++      if(lang)
++	 path = g_strdup_printf("%s.%s", file, lang_suffix);
++      else
++	 path = g_strdup(file);
++
++      if(LargeStat(path, &stat_size))
++      {
++	 *size = stat_size;
++	 return path;
++      }
++
++      g_free(path);
++      return NULL;
++   }
++
+    /* Try file in bin dir */
+ 
+    if(Closure->binDir) 

debian/patches/20-display-changelog-credits-and-todo.patch

@@ -0,0 +1,46 @@
+From: Carlos Maddela <e7appew@gmail.com>
+Date: Wed, 21 Dec 2016 09:59:58 +1100
+Subject: Fix display of changelog, credits and to-do files.
+
+Description: Fix display of changelog, credits and to-do files.
+ Use absolute paths to compensate for the fact that we don't install
+ duplicates in /usr/share/doc/dvdisaster-doc or build with source
+ path embedded anymore.
+Author: Carlos Maddela <e7appew@gmail.com>
+Forwarded: not-needed
+Last-Update: 2017-01-05
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+---
+ menubar.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/menubar.c b/menubar.c
+index ee24ebe..4a9f470 100644
+--- a/menubar.c
++++ b/menubar.c
+@@ -126,21 +126,21 @@ static void menu_cb(GtkWidget *widget, gpointer data)
+         ShowTextfile(_("windowtitle|Change log"), 
+ 		     _("<big>Change log</big>\n"
+ 		       "<i>Major differences from earlier program versions.</i>"),
+-		     "CHANGELOG", NULL, NULL);
++		     "/usr/share/doc/dvdisaster/CHANGELOG", NULL, NULL);
+ 	break;
+ 
+       case MENU_HELP_CREDITS:
+         ShowTextfile(_("windowtitle|Credits"), 
+ 		     _("<big>Credits</big>\n"
+ 		       "<i>Thanks go out to...</i>"),
+-		     "CREDITS", NULL, NULL);
++		     "/usr/share/doc/dvdisaster/CREDITS", NULL, NULL);
+ 	break;
+ 
+       case MENU_HELP_TODO:
+ 	ShowTextfile(_("windowtitle|To do list"), 
+ 		     _("<big>To do list</big>\n"
+ 		       "<i>A sneak preview of coming features ... perhaps ;-)</i>"),
+-		     "TODO", NULL, NULL);
++		     "/usr/share/doc/dvdisaster/TODO", NULL, NULL);
+ 	break;
+ 
+       default:

debian/patches/22-fix-hurd-i386-ftbfs.patch

@@ -0,0 +1,31 @@
+From: Carlos Maddela <e7appew@gmail.com>
+Date: Wed, 4 Jan 2017 03:55:58 +1100
+Subject: Fix FTBFS for hurd-i386.
+
+Description: Fix FTBFS for hurd-i386.
+ Hurd does not have path length restrictions, so doesn't define
+ PATH_MAX. Assuming a PATH_MAX of 4096 as a quick workaround.
+Author: Carlos Maddela <e7appew@gmail.com>
+Forwarded: no
+Last-Update: 2017-01-04
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+---
+ menubar.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/menubar.c b/menubar.c
+index 4a9f470..8330edb 100644
+--- a/menubar.c
++++ b/menubar.c
+@@ -24,6 +24,10 @@
+ 
+ #include <limits.h>
+ 
++#ifndef PATH_MAX
++  #define PATH_MAX 4096
++#endif
++
+ /***
+  *** Forward declarations
+  ***/

debian/patches/23-add-bdrom-support.patch

@@ -0,0 +1,32 @@
+From: Corey Wright <undefined@pobox.com>
+Date: Sat, 24 Sep 2016 14:16:10 -0500
+Subject: Add support for BD-ROM media-type.
+
+Description: Add support for BD-ROM media-type.
+ The attached patch adds support to dvdisaster for the BD-ROM
+ media-type.  This allows dvdisaster to scan and read (ie create ISO
+ images of) BD-ROM media.
+Author: Corey Write <undefined@pobox.com>
+Origin: other, https://bugs.debian.org/cgi-bin/bugreport.cgi?att=1;bug=849518;filename=dvdisaster-add_bdrom_support.patch;msg=5
+Bug-Debian: https://bugs.debian.org/849518
+Forwarded: no
+Last-Update: 2016-12-27
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+---
+ scsi-layer.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/scsi-layer.c b/scsi-layer.c
+index f8d2112..50f6c4c 100644
+--- a/scsi-layer.c
++++ b/scsi-layer.c
+@@ -1029,7 +1029,7 @@ static int query_bd(DeviceHandle *dh, int probe_only)
+ 
+    if(!strncmp((char*)&buf[4+8], "BDO", 3))
+    {  dh->typeDescr = g_strdup("BD-ROM");
+-      dh->subType = UNSUPPORTED;
++      dh->subType = BD;
+    }
+ 
+    if(!strncmp((char*)&buf[4+8], "BDW", 3))

debian/patches/24-show-gpl3-license.patch

@@ -0,0 +1,27 @@
+From: Carlos Maddela <e7appew@gmail.com>
+Date: Thu, 5 Jan 2017 14:36:27 +1100
+Subject: Update help dialog to show GPL-3 license.
+
+Description: Update help dialog to show GPL-3 license.
+Author: Carlos Maddela <e7appew@gmail.com>
+Forwarded: not-needed
+Last-Update: 2017-01-05
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+---
+ help-dialogs.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/help-dialogs.c b/help-dialogs.c
+index d893d33..75a615e 100644
+--- a/help-dialogs.c
++++ b/help-dialogs.c
+@@ -403,7 +403,7 @@ void ShowGPL()
+   ShowTextfile(_("windowtitle|GNU General Public License"), 
+ 	       _("<big>GNU General Public License</big>\n"
+ 		 "<i>The license terms of dvdisaster.</i>"),
+-	       "/usr/share/common-licenses/GPL-2", NULL, NULL);
++	       "/usr/share/common-licenses/GPL-3", NULL, NULL);
+ }
+ 
+ /*

debian/patches/25-fix-man-pages.patch

@@ -0,0 +1,32 @@
+From: Carlos Maddela <e7appew@gmail.com>
+Date: Thu, 5 Jan 2017 18:51:49 +1100
+Subject: Fix generated man pages.
+
+Description: Fix generated man pages.
+ The generated man pages incorrectly direct users to the directory of
+ the old HTML documentation, which is no longer available.
+Author: Carlos Maddela <e7appew@gmail.com>
+Forwarded: no
+Last-Update: 2016-12-21
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+---
+ GNUmakefile.template | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/GNUmakefile.template b/GNUmakefile.template
+index d9bef11..d80932d 100644
+--- a/GNUmakefile.template
++++ b/GNUmakefile.template
+@@ -232,9 +232,9 @@ install: dvdisaster
+ 	install -d $(BUILDROOT)$(MANDIR)/de/man1
+ 	cd documentation; \
+ 	  ESCAPED_DOCSUBDIR=`echo $(DOCSUBDIR) | sed -e 's/\//\\\\\//g'`; \
+-	  sed "s/%docdir%/$$ESCAPED_DOCSUBDIR\/html/" <dvdisaster.en.1 >dvdisaster.updated; \
++	  sed "s/%docdir%/$$ESCAPED_DOCSUBDIR/" <dvdisaster.en.1 >dvdisaster.updated; \
+ 	  install -m 644 dvdisaster.updated $(BUILDROOT)$(MANDIR)/man1/dvdisaster.1; \
+-	  sed "s/%docdir%/$$ESCAPED_DOCSUBDIR\/html/" <dvdisaster.de.1 >dvdisaster.updated; \
++	  sed "s/%docdir%/$$ESCAPED_DOCSUBDIR/" <dvdisaster.de.1 >dvdisaster.updated; \
+ 	  install -m 644 dvdisaster.updated $(BUILDROOT)$(MANDIR)/de/man1/dvdisaster.1; \
+ 	  rm dvdisaster.updated
+ 	if echo $(WITH_OPTIONS) | grep "NLS_YES" >/dev/null; then \

debian/patches/26-fix-display-of-manual.pdf.patch

@@ -0,0 +1,47 @@
+From: Carlos Maddela <e7appew@gmail.com>
+Date: Thu, 5 Jan 2017 18:59:30 +1100
+Subject: Fix display of manual.pdf.
+
+Description: Fix display of manual.pdf.
+ The PDF file is automatically compressed by Debhelper, so we need to
+ account for this.
+Author: Carlos Maddela <e7appew@gmail.com>
+Forwarded: not-needed
+Last-Update: 2017-01-05
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+---
+ show-manual.c    | 4 ++--
+ welcome-window.c | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/show-manual.c b/show-manual.c
+index c25342b..4abbe97 100644
+--- a/show-manual.c
++++ b/show-manual.c
+@@ -287,8 +287,8 @@ void ShowPDF(char *target)
+ 
+    /* If no target is given, show the manual. */
+ 
+-   if(!target) 
+-   {    bi->path = g_strdup_printf("%s/manual.pdf",Closure->docDir); 
++   if(!target)
++   {    bi->path = g_strdup_printf("%s/manual.pdf.gz",Closure->docDir);
+    }
+    else 
+       if(*target != '/') bi->path = g_strdup_printf("%s/%s",Closure->docDir, target); 
+diff --git a/welcome-window.c b/welcome-window.c
+index d30ebd9..63ac3df 100644
+--- a/welcome-window.c
++++ b/welcome-window.c
+@@ -139,8 +139,8 @@ void CreateWelcomePage(GtkNotebook *notebook)
+    AboutText(box, _("\ndvdisaster creates error correction data to protect\n"
+ 		    "optical media (CD,DVD,BD) against data loss.\n"));
+ 
+-   AboutTextWithLink(box, _("Please see the [manual] for typical uses of dvdisaster.\n\n"), 
+-		     "manual.pdf");
++   AboutTextWithLink(box, _("Please see the [manual] for typical uses of dvdisaster.\n\n"),
++		     "manual.pdf.gz");
+ 
+    AboutText(box, _("<i>New in this Version:</i>"));
+ 

debian/patches/27-allow-opening-in-browser-again.patch

@@ -0,0 +1,485 @@
+From: Carlos Maddela <e7appew@gmail.com>
+Date: Thu, 5 Jan 2017 19:11:38 +1100
+Subject: Resurrect old code to support opening URLs in a browser.
+
+Description: Resurrect old code to support opening URLs in a browser.
+Author: Carlos Maddela <e7appew@gmail.com>
+Forwarded: not-needed
+Last-Update: 2016-12-21
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+---
+ closure.c      |   2 +
+ dvdisaster.h   |   7 +
+ help-dialogs.c |   3 +-
+ show-html.c    | 402 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 4 files changed, 413 insertions(+), 1 deletion(-)
+ create mode 100644 show-html.c
+
+diff --git a/closure.c b/closure.c
+index fa52f09..24c1e8c 100644
+--- a/closure.c
++++ b/closure.c
+@@ -474,6 +474,7 @@ void InitClosure()
+    Closure->deviceNames = g_ptr_array_new();
+    Closure->deviceNodes = g_ptr_array_new();
+    Closure->viewer      = g_strdup("xdg-open");
++   Closure->browser      = g_strdup("xdg-open");
+    Closure->methodList  = g_ptr_array_new();
+    Closure->methodName  = g_strdup("RS01");
+    Closure->dDumpDir    = g_strdup(Closure->homeDir);
+@@ -589,6 +590,7 @@ void FreeClosure()
+    cond_free(Closure->binDir);
+    cond_free(Closure->docDir);
+    cond_free(Closure->viewer);
++   cond_free(Closure->browser);
+    cond_free(Closure->errorTitle);
+    cond_free(Closure->simulateCD);
+    cond_free(Closure->dDumpDir);
+diff --git a/dvdisaster.h b/dvdisaster.h
+index 9acd094..f536040 100644
+--- a/dvdisaster.h
++++ b/dvdisaster.h
+@@ -229,6 +229,7 @@ typedef struct _GlobalClosure
+    char *binDir;        /* place where the binary resides */
+    char *docDir;        /* place where our documentation resides */
+    char *viewer;        /* Name of preferred PDF viewer */
++   char *browser;       /* Name of preferred browser */
+ 
+    GMutex progressLock; /* A mutex protected the stuff below */
+    char bs[256];        /* A string of 255 backspace characters */
+@@ -1348,6 +1349,12 @@ int ProbeAltiVec(void);
+ 
+ void ShowPDF(char*);
+ 
++/***
++ *** show-html.c
++ ***/
++
++void ShowHTML(char*);
++
+ /***
+  *** smart-lec.c
+  ***/
+diff --git a/help-dialogs.c b/help-dialogs.c
+index 75a615e..dc5b440 100644
+--- a/help-dialogs.c
++++ b/help-dialogs.c
+@@ -599,7 +599,8 @@ static gint about_cb(GtkWidget *widget, GdkEvent *event, gpointer data)
+    {  case GDK_BUTTON_PRESS: 
+         if(!inside) return FALSE; /* Defect in certain Gtk versions? */
+         if(!strcmp(label,"GPL")) ShowGPL(); 
+-        else if(!strcmp(label,"MODIFYING")) show_modifying(); 
++        else if(!strcmp(label,"MODIFYING")) show_modifying();
++        else if(strlen(label) > 4 && !strncmp(label, "http", 4)) ShowHTML(g_strdup(label));
+         else ShowPDF(g_strdup(label));
+ 	break; 
+       case GDK_ENTER_NOTIFY: 
+diff --git a/show-html.c b/show-html.c
+new file mode 100644
+index 0000000..608e8ec
+--- /dev/null
++++ b/show-html.c
+@@ -0,0 +1,402 @@
++/*  dvdisaster: Additional error correction for optical media.
++ *  Copyright (C) 2004-2012 Carsten Gnoerlich.
++ *  Project home page: http://www.dvdisaster.com
++ *  Email: carsten@dvdisaster.com  -or-  cgnoerlich@fsfe.org
++ *
++ *  This program is free software; you can redistribute it and/or modify
++ *  it under the terms of the GNU General Public License as published by
++ *  the Free Software Foundation; either version 2 of the License, or
++ *  (at your option) any later version.
++ *
++ *  This program is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *  GNU General Public License for more details.
++ *
++ *  You should have received a copy of the GNU General Public License
++ *  along with this program; if not, write to the Free Software
++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA,
++ *  or direct your browser at http://www.gnu.org.
++ */
++
++#include "dvdisaster.h"
++
++#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_NETBSD)
++#include <sys/wait.h>
++#endif
++
++#ifdef SYS_MINGW
++#include "windows.h"
++#include "shellapi.h"
++#endif
++
++/***
++ *** Ask user to specify his browser
++ ***/
++
++#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_NETBSD)
++
++#define SEARCH_BUTTON 1
++
++typedef struct
++{  GtkWidget *dialog;
++   GtkWidget *entry;
++   GtkWidget *search;
++   GtkWidget *filesel;
++   GtkWidget *fileok;
++   GtkWidget *filecancel;
++   char *url;
++} browser_dialog_info;
++
++static void response_cb(GtkWidget *widget, int response, gpointer data)
++{  browser_dialog_info *bdi = (browser_dialog_info*)data; 
++
++   switch(response)
++   {  case GTK_RESPONSE_ACCEPT:
++	if(Closure->browser) g_free(Closure->browser);
++	Closure->browser = g_strdup(gtk_entry_get_text(GTK_ENTRY(bdi->entry)));
++	ShowHTML(bdi->url);
++	break;
++
++      case GTK_RESPONSE_REJECT:
++	if(bdi->url) g_free(bdi->url);
++        break;
++   }
++   gtk_widget_destroy(widget);
++   if(bdi->filesel)
++     gtk_widget_destroy(bdi->filesel);
++   g_free(bdi);
++}
++
++static void search_cb(GtkWidget *widget, gpointer data)
++{  browser_dialog_info *bdi = (browser_dialog_info*)data; 
++
++   if(widget == bdi->search) 
++   {  bdi->filesel = gtk_file_selection_new(_utf("windowtitle|Choose a browser"));
++      bdi->fileok = GTK_FILE_SELECTION(bdi->filesel)->ok_button;
++      bdi->filecancel = GTK_FILE_SELECTION(bdi->filesel)->cancel_button;
++      ReverseCancelOK(GTK_DIALOG(bdi->filesel));
++      gtk_file_selection_hide_fileop_buttons(GTK_FILE_SELECTION(bdi->filesel));
++      g_signal_connect(G_OBJECT(GTK_FILE_SELECTION(bdi->filesel)->ok_button), "clicked", 
++		       G_CALLBACK(search_cb), bdi);
++    
++      g_signal_connect(G_OBJECT(GTK_FILE_SELECTION(bdi->filesel)->cancel_button), "clicked", 
++		       G_CALLBACK(search_cb), bdi);
++      
++      gtk_widget_show(bdi->filesel);
++   }
++
++   if(widget == bdi->fileok)
++   {
++      if(Closure->browser) g_free(Closure->browser);
++      Closure->browser = g_strdup(gtk_file_selection_get_filename(GTK_FILE_SELECTION(bdi->filesel)));
++      ShowHTML(bdi->url);
++      gtk_widget_destroy(bdi->filesel);
++      gtk_widget_destroy(bdi->dialog);
++      g_free(bdi);
++      return;
++   }
++
++   if(widget == bdi->filecancel)
++   {  gtk_widget_destroy(bdi->filesel);
++      bdi->filesel = NULL;
++   }
++}
++
++static void browser_dialog(char *url)
++{  GtkWidget *dialog, *vbox, *hbox, *label, *entry, *button;
++   browser_dialog_info *bdi = g_malloc0(sizeof(browser_dialog_info));
++
++   /* Create the dialog */
++
++   dialog = gtk_dialog_new_with_buttons(_utf("windowtitle|Browser required"), 
++				       Closure->window, GTK_DIALOG_DESTROY_WITH_PARENT,
++				       GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, 
++				       GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, NULL);
++   bdi->dialog = dialog;
++   if(url)
++   {  bdi->url = g_strdup(url);
++   }
++
++   vbox = gtk_vbox_new(FALSE, 0);
++   gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), vbox, FALSE, FALSE, 0);
++   gtk_container_set_border_width(GTK_CONTAINER(vbox), 10);
++
++   /* Insert the contents */
++
++   label = gtk_label_new(NULL);
++   gtk_label_set_markup(GTK_LABEL(label), _utf("<b>Could not find a suitable browser.</b>\n\n"
++                                               "Which browser would you like to use\n"
++                                               "for reading the online documentation?\n\n"
++			                       "Please enter its name (e.g. mozilla) or\n"
++			                       "use the \"Search\" button for a file dialog.\n")),
++			      gtk_box_pack_start(GTK_BOX(vbox), label, TRUE, TRUE, 10);
++
++   hbox = gtk_hbox_new(FALSE, 0);
++   gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 10);
++
++   bdi->entry = entry = gtk_entry_new();
++   gtk_box_pack_start(GTK_BOX(hbox), entry, FALSE, FALSE, 10);
++
++   bdi->search = button = gtk_button_new_with_label(_utf("Search"));
++   g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(search_cb), bdi);
++   gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 10);
++
++   /* Show it */
++
++   g_signal_connect(dialog, "response", G_CALLBACK(response_cb), bdi);
++
++   gtk_widget_show_all(dialog);
++}
++#endif /* SYS_ unix-like */
++
++/***
++ *** Show the manual in an external browser
++ ***/
++
++/*
++ * Check the child processes exit status
++ * to find whether the browser could be invoked.
++ */
++
++typedef struct
++{  pid_t pid;
++   char *url;
++   GtkWidget *msg;
++   int seconds;
++} browser_info;
++
++
++static void msg_destroy_cb(GtkWidget *widget, gpointer data)
++{  browser_info *bi = (browser_info*)data;
++
++   bi->msg = NULL; 
++}
++
++#if defined(SYS_LINUX) || defined(SYS_FREEBSD) ||  defined(SYS_NETBSD)
++
++/* 
++ * The following list of browsers and html wrappers
++ * will be tried one at a time until one entry succeeds by:
++ * - returning zero
++ * - not returning within 60 seconds
++ */
++
++static int browser_index;
++static void try_browser(browser_info*);
++
++static char *browsers[] = 
++{  "user-selection",
++   "xdg-open",
++   "gnome-open",
++   "htmlview",
++   "firefox",
++   "mozilla",
++   "konqueror",
++   "epiphany",
++   "opera",
++   "/Applications/Safari.app/Contents/MacOS/Safari",  /* better way to do this? */
++   NULL
++};
++
++static gboolean browser_timeout_func(gpointer data)
++{  browser_info *bi = (browser_info*)data;
++   int status;
++
++   waitpid(bi->pid, &status, WNOHANG);
++
++   /* At least mozilla returns random values under FreeBSD on success,
++      so we can't rely on the return value exept our own 110 one. */
++
++   if(WIFEXITED(status))
++   {
++      switch(WEXITSTATUS(status))
++      {  case 110: /* browser did not execute */
++	   browser_index++;
++	   if(!browsers[browser_index]) /* all browsers from the list failed */
++	   {  browser_dialog(bi->url);
++
++	      if(bi->msg) 
++		gtk_widget_destroy(bi->msg);
++	      if(bi->url) 
++		g_free(bi->url);
++	      g_free(bi);
++	   }
++	   else                        /* try next browser from list */
++	   {  bi->seconds = 0;  
++	      try_browser(bi);
++	   }
++	   return FALSE;
++
++         case 0:  /* browser assumed to be successful */
++         default:
++	   if(bi->msg) 
++	     gtk_widget_destroy(bi->msg);
++	   if(bi->url) 
++	     g_free(bi->url);
++	   g_free(bi);
++	   return FALSE;
++      }
++   }
++
++   bi->seconds++;
++   if(bi->seconds == 10 && bi->msg)
++   {  gtk_widget_destroy(bi->msg);
++      bi->msg = NULL;
++   }
++
++   return bi->seconds > 60 ? FALSE : TRUE;
++}
++#endif /* SYS_ unix-like */
++
++#ifdef SYS_MINGW
++static gboolean browser_timeout_func(gpointer data)
++{  browser_info *bi = (browser_info*)data;
++   
++   bi->seconds++;
++
++   if(bi->seconds >= 10)
++   {  if(bi->msg)
++      {  gtk_widget_destroy(bi->msg);
++         bi->msg = NULL;
++      }
++      if(bi->url) g_free(bi->url);
++      g_free(bi);
++      return FALSE;
++   }
++
++   return TRUE;
++}
++#endif /* SYS_MINGW */
++
++/*
++ * Invoke the browser
++ */
++
++#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_NETBSD)
++static void try_browser(browser_info *bi)
++{  pid_t pid;
++
++   bi->pid = pid = fork();
++
++   if(pid == -1)
++   {  printf("fork failed\n");
++      return;
++   }
++
++   /* make the parent remember and wait() for the browser */
++
++   if(pid > 0)  
++   {  g_timeout_add(1000, browser_timeout_func, (gpointer)bi);
++
++      if(browser_index)
++      {  g_free(Closure->browser);
++	 Closure->browser = g_strdup(browsers[browser_index]);
++      }
++   }
++
++   /* try calling the browser */
++
++   if(pid == 0)
++   {  char *argv[10];
++      int argc = 0;
++
++      argv[argc++] = browser_index ? browsers[browser_index] : Closure->browser;
++      argv[argc++] = bi->url;
++      argv[argc++] = NULL;
++      execvp(argv[0], argv);
++
++      _exit(110); /* couldn't execute */
++   }
++}
++#endif /* SYS_ unix-like */
++
++
++void ShowHTML(char *target)
++{  browser_info *bi = g_malloc0(sizeof(browser_info));
++   guint64 ignore;
++   const char *lang;
++   char *path = NULL;
++   int http_url;
++
++   /* If no target is given, select between translations of the manual. */
++
++   if(!target) target = g_strdup("index.html");
++
++   http_url = strlen(target) > 4 && !strncmp(target, "http", 4);
++
++   if(!http_url && !strchr(target, '/'))  /* create full path */
++   { 
++      if(!Closure->docDir)
++      {  
++	 CreateMessage(_("Documentation not installed."), GTK_MESSAGE_ERROR);
++         g_free(bi);
++         return;
++      }
++
++      lang = g_getenv("LANG");
++
++      if(lang)
++      {  if(!strncmp(lang, "ru", 2)) 
++#ifdef SYS_MINGW
++	     path = g_strdup_printf("%s\\ru\\%s",Closure->docDir,target); 
++#else
++	     path = g_strdup_printf("%s/ru/%s",Closure->docDir,target); 
++#endif
++         else if(!strncmp(lang, "de", 2)) 
++#ifdef SYS_MINGW
++	     path = g_strdup_printf("%s\\de\\%s",Closure->docDir,target); 
++#else
++	     path = g_strdup_printf("%s/de/%s",Closure->docDir,target); 
++#endif
++      }
++
++      if(!path)
++      {
++#ifdef SYS_MINGW
++         path = g_strdup_printf("%s\\en\\%s",Closure->docDir,target); 
++#else
++         path = g_strdup_printf("%s/en/%s",Closure->docDir,target); 
++#endif
++      }
++
++#ifdef SYS_MINGW      
++      if(!LargeStat(path, &ignore))
++      {  
++	 g_free(path);  /* the local dir is Windows specific */
++	 path = g_strdup_printf("%s\\local\\%s",Closure->docDir,target);
++      }
++#endif
++      g_free(target);
++      bi->url = path;
++   }
++   else bi->url = target;
++
++   if(!http_url && !LargeStat(bi->url, &ignore))
++   {  
++      CreateMessage(_("Documentation file\n%s\nnot found.\n"), GTK_MESSAGE_ERROR, bi->url);
++      g_free(bi);
++      g_free(bi->url);
++      return;
++   }
++
++   /* Lock the help button and show a message for 10 seconds. */
++
++   TimedInsensitive(Closure->helpButton, 10000);
++   bi->msg = CreateMessage(_("Please hang on until the browser comes up!"), GTK_MESSAGE_INFO);
++   g_signal_connect(G_OBJECT(bi->msg), "destroy", G_CALLBACK(msg_destroy_cb), bi);
++
++#ifdef SYS_MINGW
++   /* Okay, Billy wins big time here ;-) */
++
++   ShellExecute(NULL, "open", bi->url, NULL, NULL, SW_SHOWNORMAL);
++   g_timeout_add(1000, browser_timeout_func, (gpointer)bi);
++#endif
++
++#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_NETBSD)
++   /* Try the first browser */
++
++   browser_index = 0;
++   try_browser(bi);
++#endif
++}

debian/patches/28-pdftex-reproducibility.patch

@@ -0,0 +1,29 @@
+From: Carlos Maddela <e7appew@gmail.com>
+Date: Thu, 5 Jan 2017 19:14:35 +1100
+Subject: Apply pdftex workarounds for build reproducibility.
+
+Description: Apply pdftex workarounds for build reproducibility.
+ * Generate the same PDF IDs.
+ * Suppress additional metadata for included images.
+Author: Carlos Maddela <e7appew@gmail.com>
+Forwarded: not-needed
+Last-Update: 2017-08-15
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+---
+ documentation/user-manual/manual.tex | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/documentation/user-manual/manual.tex b/documentation/user-manual/manual.tex
+index 3024f3a..d943232 100644
+--- a/documentation/user-manual/manual.tex
++++ b/documentation/user-manual/manual.tex
+@@ -65,6 +65,8 @@
+ \fancyfoot{}
+ \fancyfoot[LE,RO]{page \thepage\ of \pageref{LastPage}}
+ 
++\pdftrailerid{dvdisaster}
++\pdfsuppressptexinfo=-1
+ \begin{document}
+ 
+ \definecolor{lightorange}{RGB}{255,224,150}

debian/patches/29-fix-more-typos.patch

@@ -0,0 +1,173 @@
+From: Carlos Maddela <e7appew@gmail.com>
+Date: Sun, 6 Aug 2017 02:16:17 +1000
+Subject: Fix more typos in error messages and docs.
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+Description: Fix more typos in error messages and docs.
+ 'sucessful' → 'successful'
+ 'improvment' → 'improvement'
+Author: Carlos Maddela <e7appew@gmail.com>
+Last-Update: 2017-12-21
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+---
+ documentation/user-manual/howtos.tex | 2 +-
+ locale/cs.po                         | 2 +-
+ locale/de.po                         | 2 +-
+ locale/it.po                         | 2 +-
+ locale/pt_BR.po                      | 2 +-
+ locale/ru.po                         | 2 +-
+ locale/sv.po                         | 2 +-
+ preferences.c                        | 4 ++--
+ regtest/rs01.bash                    | 2 +-
+ scsi-layer.c                         | 2 +-
+ smart-lec.c                          | 2 +-
+ 11 files changed, 12 insertions(+), 12 deletions(-)
+
+diff --git a/documentation/user-manual/howtos.tex b/documentation/user-manual/howtos.tex
+index 51ff827..80fe9d3 100644
+--- a/documentation/user-manual/howtos.tex
++++ b/documentation/user-manual/howtos.tex
+@@ -1822,7 +1822,7 @@ process of creating error correction files using these options. The
+ first option marked green lets dvdisaster create the error correction
+ file immediately after the medium has been (completely) read.
+ The second option marked green deletes the image when the error correction
+-file has been sucessfully created.
++file has been successfully created.
+ 
+ \bigskip
+ 
+diff --git a/locale/cs.po b/locale/cs.po
+index 453ec07..d89ff4a 100644
+--- a/locale/cs.po
++++ b/locale/cs.po
+@@ -1917,7 +1917,7 @@ msgid "Media ejection"
+ msgstr "Vysunutí disku"
+ 
+ #: preferences.c:2064 preferences.c:2065
+-msgid "Eject medium after sucessful read"
++msgid "Eject medium after successful read"
+ msgstr "Po úspěšném načtení vysunout disk"
+ 
+ #: preferences.c:2091
+diff --git a/locale/de.po b/locale/de.po
+index 5b47778..8112b13 100644
+--- a/locale/de.po
++++ b/locale/de.po
+@@ -1975,7 +1975,7 @@ msgid "Media ejection"
+ msgstr "Datenträger auswerfen"
+ 
+ #: preferences.c:2064 preferences.c:2065
+-msgid "Eject medium after sucessful read"
++msgid "Eject medium after successful read"
+ msgstr "Datenträger nach erfolgreichem Lesen auswerfen"
+ 
+ #: preferences.c:2091
+diff --git a/locale/it.po b/locale/it.po
+index f6e9dfd..b98f8d3 100644
+--- a/locale/it.po
++++ b/locale/it.po
+@@ -1763,7 +1763,7 @@ msgid "Media ejection"
+ msgstr ""
+ 
+ #: preferences.c:2064 preferences.c:2065
+-msgid "Eject medium after sucessful read"
++msgid "Eject medium after successful read"
+ msgstr ""
+ 
+ #: preferences.c:2091
+diff --git a/locale/pt_BR.po b/locale/pt_BR.po
+index f7f6af0..81ee14d 100644
+--- a/locale/pt_BR.po
++++ b/locale/pt_BR.po
+@@ -1853,7 +1853,7 @@ msgid "Media ejection"
+ msgstr "Ejeção da mídia"
+ 
+ #: preferences.c:2064 preferences.c:2065
+-msgid "Eject medium after sucessful read"
++msgid "Eject medium after successful read"
+ msgstr "Ejetar mídia após uma leitura completa"
+ 
+ #: preferences.c:2091
+diff --git a/locale/ru.po b/locale/ru.po
+index 9625a1f..6e980b9 100644
+--- a/locale/ru.po
++++ b/locale/ru.po
+@@ -1855,7 +1855,7 @@ msgid "Media ejection"
+ msgstr "Извлечь носитель"
+ 
+ #: preferences.c:2064 preferences.c:2065
+-msgid "Eject medium after sucessful read"
++msgid "Eject medium after successful read"
+ msgstr "Извлечь носитель после успешного чтения"
+ 
+ #: preferences.c:2091
+diff --git a/locale/sv.po b/locale/sv.po
+index c74a942..3011969 100644
+--- a/locale/sv.po
++++ b/locale/sv.po
+@@ -1769,7 +1769,7 @@ msgid "Media ejection"
+ msgstr ""
+ 
+ #: preferences.c:2064 preferences.c:2065
+-msgid "Eject medium after sucessful read"
++msgid "Eject medium after successful read"
+ msgstr ""
+ 
+ #: preferences.c:2091
+diff --git a/preferences.c b/preferences.c
+index 4899317..4309809 100644
+--- a/preferences.c
++++ b/preferences.c
+@@ -2061,8 +2061,8 @@ void CreatePreferencesWindow(void)
+       frame = gtk_frame_new(_utf("Media ejection"));
+       gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 0);
+ 
+-      lwoh = CreateLabelWithOnlineHelp(_("Eject medium after sucessful read"), 
+-				       _("Eject medium after sucessful read"));
++      lwoh = CreateLabelWithOnlineHelp(_("Eject medium after successful read"),
++				       _("Eject medium after successful read"));
+       RegisterPreferencesHelpWindow(lwoh);
+ 
+       for(i=0; i<2; i++)
+diff --git a/regtest/rs01.bash b/regtest/rs01.bash
+index 3c03f61..cc11f6e 100755
+--- a/regtest/rs01.bash
++++ b/regtest/rs01.bash
+@@ -1323,7 +1323,7 @@ if try "reading medium w/ ecc in 3 passes; 3rd pass recovers some" read_multipas
+   run_regtest read_multipass_ecc_partial_success "--read-medium=3 --spinup-delay=0 -r" $TMPISO  $TMPECC
+ fi
+ 
+-# Do a second sucessful read attempt at an incomplete image;
++# Do a second successful read attempt at an incomplete image;
+ # see whether correct results are reported when ecc data is present
+ # since CRC caching is a bit complicated in this case.
+ 
+diff --git a/scsi-layer.c b/scsi-layer.c
+index 50f6c4c..22e825d 100644
+--- a/scsi-layer.c
++++ b/scsi-layer.c
+@@ -2458,7 +2458,7 @@ int ReadSectors(DeviceHandle *dh, unsigned char *buf, gint64 s, int nsectors)
+       if(Closure->readRaw && dh->rawBuffer)
+ 	recommended_attempts = dh->rawBuffer->recommendedAttempts;
+ 
+-      if(status)  /* current try was unsucessful */
++      if(status)  /* current try was unsuccessful */
+       {  int last_key, last_asc, last_ascq;
+ 
+ 	 if(Closure->stopActions)  /* user break */
+diff --git a/smart-lec.c b/smart-lec.c
+index 944b70d..534dd65 100644
+--- a/smart-lec.c
++++ b/smart-lec.c
+@@ -1609,7 +1609,7 @@ static int smart_lec_iteration(sh_context *shc, char *message)
+    shc->bestBonus = 0;
+    shc->bestMalus = 100000;
+    memcpy(shc->bestFrame, rb->recovered, rb->sampleSize);
+-   sprintf(shc->msg, "smart_lec: no further improvment");
++   sprintf(shc->msg, "smart_lec: no further improvement");
+ 
+    update_pq_state(shc);
+    print_pq_state(shc);

debian/patches/30-hurd-kfreebsd-ftbfs.patch

@@ -0,0 +1,46 @@
+From: Carlos Maddela <e7appew@gmail.com>
+Date: Sun, 6 Aug 2017 02:40:33 +1000
+Subject: Fix FTBFS on Hurd and kFreeBSD.
+
+Description: Fix FTBFS on Hurd and kFreeBSD.
+ Make sure MMAP_FLAGS gets defined.
+Author: Carlos Maddela <e7appew@gmail.com>
+Last-Update: 2017-08-06
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+---
+ rs03-create.c | 19 +++++++++++--------
+ 1 file changed, 11 insertions(+), 8 deletions(-)
+
+diff --git a/rs03-create.c b/rs03-create.c
+index 9c7265d..678644c 100644
+--- a/rs03-create.c
++++ b/rs03-create.c
+@@ -39,16 +39,19 @@
+ #ifdef HAVE_MMAP
+   #include <sys/mman.h>
+ 
+-#ifdef SYS_LINUX
+-  #define MMAP_FLAGS (MAP_SHARED | MAP_POPULATE | MAP_NORESERVE) 
+-#endif
++#if defined(SYS_LINUX)
+ 
+-#ifdef SYS_FREEBSD
+-  #define MMAP_FLAGS (MAP_SHARED | MAP_PREFAULT_READ) 
+-#endif
++  #define MMAP_FLAGS (MAP_SHARED | MAP_POPULATE | MAP_NORESERVE)
++
++#elif defined(SYS_FREEBSD)
++
++  #define MMAP_FLAGS (MAP_SHARED | MAP_PREFAULT_READ)
++
++#else
++
++  /* SYS_NETBSD and others. */
++  #define MMAP_FLAGS (MAP_SHARED)
+ 
+-#ifdef SYS_NETBSD
+-  #define MMAP_FLAGS (MAP_SHARED) 
+ #endif
+ 
+ #endif

debian/patches/31-improve-hurd-and-kfreebsd-support.patch

@@ -0,0 +1,308 @@
+From: Carlos Maddela <e7appew@gmail.com>
+Date: Sun, 6 Aug 2017 10:37:18 +1000
+Subject: Add better support for HURD and kFreeBSD systems.
+
+Description: Add better support for HURD and kFreeBSD systems.
+ Hurd still compiles without SCSI layer, however.
+Author: Carlos Maddela <e7appew@gmail.com>
+Last-Update: 2017-08-06
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+---
+ cacheprobe.c                 | 16 +++++++++-------
+ closure.c                    |  6 ++++--
+ scripts/bash-based-configure | 18 ++++++++++++++++++
+ scsi-freebsd.c               |  4 ++--
+ scsi-layer.c                 | 10 ++++++----
+ scsi-layer.h                 | 17 +++++++++--------
+ scsi-unknown.c               |  4 ++--
+ show-html.c                  | 15 ++++++++++-----
+ 8 files changed, 60 insertions(+), 30 deletions(-)
+
+diff --git a/cacheprobe.c b/cacheprobe.c
+index 545c690..9f754dd 100644
+--- a/cacheprobe.c
++++ b/cacheprobe.c
+@@ -22,7 +22,8 @@
+ 
+ #include "dvdisaster.h"
+ 
+-#ifdef SYS_LINUX
++#if defined(SYS_LINUX)
++
+ int ProbeCacheLineSize()
+ {  int cl_size = 0;
+ 
+@@ -36,9 +37,9 @@ int ProbeCacheLineSize()
+ 
+    return cl_size;
+ }
+-#endif
+ 
+-#ifdef SYS_FREEBSD
++#elif defined(SYS_FREEBSD) || defined(SYS_KFREEBSD)
++
+ #include <sys/param.h>
+ 
+ int ProbeCacheLineSize()
+@@ -52,9 +53,9 @@ int ProbeCacheLineSize()
+ 
+    return cl_size;
+ }
+-#endif
+ 
+-#ifdef SYS_NETBSD
++#elif defined(SYS_NETBSD)
++
+ #include <sys/param.h>
+ 
+ int ProbeCacheLineSize()
+@@ -68,13 +69,14 @@ int ProbeCacheLineSize()
+ 
+    return cl_size;
+ }
+-#endif
+ 
+-#ifdef SYS_UNKNOWN
++#else /* SYS_UNKNOWN and others. */
++
+ int ProbeCacheLineSize()
+ {
+   return 64;
+ }
++
+ #endif
+ 
+ 
+diff --git a/closure.c b/closure.c
+index 24c1e8c..26ee13b 100644
+--- a/closure.c
++++ b/closure.c
+@@ -50,7 +50,8 @@ static void get_base_dirs()
+    /*** Otherwise try the installation directory. 
+ 	On Unices this is a hardcoded directory. */
+ 
+-#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_NETBSD) || defined(SYS_UNKNOWN)
++#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_KFREEBSD) || \
++    defined(SYS_NETBSD) || defined(SYS_HURD) || defined(SYS_UNKNOWN)
+    if(DirStat(BINDIR))
+      Closure->binDir = g_strdup(BINDIR);
+ 
+@@ -432,7 +433,8 @@ void InitClosure()
+ 
+    /* Generate a more comprehensive version string */
+ 
+-#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_NETBSD)
++#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_KFREEBSD) || \
++    defined(SYS_NETBSD) || defined(SYS_HURD)
+   #ifdef HAVE_64BIT
+     #define BITNESS_STRING " 64bit"
+   #else
+diff --git a/scripts/bash-based-configure b/scripts/bash-based-configure
+index f1a8bd1..487a50b 100644
+--- a/scripts/bash-based-configure
++++ b/scripts/bash-based-configure
+@@ -136,6 +136,15 @@ case "$cfg_uname" in
+ 	}
+ 	;;
+ 
++  GNU/kFreeBSD*) cfg_system=kfreebsd
++	CFG_SYS_OPTIONS="-DSYS_KFREEBSD"
++	CFG_SYS_NAME="-DSYS_NAME=\\\"GNU/kFreeBSD\\\""
++	CFG_EXE_SUFFIX=""
++	function add_linker_flags()
++	{  lflags_return="-L$1 -Wl,-rpath,$1 $2"
++	}
++	;;
++
+   NetBSD*) cfg_system=netbsd
+         CFG_SYS_OPTIONS="-DSYS_NETBSD"
+ 	CFG_SYS_NAME="-DSYS_NAME=\\\"NetBSD\\\""
+@@ -146,6 +155,15 @@ case "$cfg_uname" in
+ 	}
+ 	;;
+ 
++  GNU*) cfg_system=hurd
++	CFG_SYS_OPTIONS="-DSYS_HURD"
++	CFG_SYS_NAME="-DSYS_NAME=\\\"GNU/Hurd\\\""
++	CFG_EXE_SUFFIX=""
++	function add_linker_flags()
++	{  lflags_return="-L$1 -Wl,-rpath,$1 $2"
++	}
++	;;
++
+   *) cfg_system=unknown-system
+         CFG_SYS_OPTIONS="-DSYS_UNKNOWN"
+ 	CFG_SYS_NAME="-DSYS_NAME=\\\"Unknown\\\""
+diff --git a/scsi-freebsd.c b/scsi-freebsd.c
+index 0e3397a..bbfb913 100644
+--- a/scsi-freebsd.c
++++ b/scsi-freebsd.c
+@@ -25,7 +25,7 @@
+ #include "scsi-layer.h"
+ #include "udf.h"
+ 
+-#ifdef SYS_FREEBSD
++#if defined(SYS_FREEBSD) || defined(SYS_KFREEBSD)
+ 
+ /* SCSI wrappers for FreeBSD are still work in progress. */
+ 
+@@ -241,4 +241,4 @@ int SendPacket(DeviceHandle *dh, unsigned char *cmd, int cdb_size, unsigned char
+    return -1;
+ }
+ 
+-#endif /* SYS_FREEBSD */
++#endif /* defined(SYS_FREEBSD) || defined(SYS_KFREEBSD) */
+diff --git a/scsi-layer.c b/scsi-layer.c
+index 22e825d..eaecc5c 100644
+--- a/scsi-layer.c
++++ b/scsi-layer.c
+@@ -2005,12 +2005,13 @@ static gint64 query_size(Image *image)
+  */
+ 
+ gint64 CurrentMediumSize(int get_blank_size)
+-{  Image *image;
++{
++#if defined(SYS_UNKNOWN) || defined(SYS_HURD)
++   return 0;
++#else
++   Image *image;
+    gint64 size;
+ 
+-#ifdef SYS_UNKNOWN
+-   return 0;
+-#endif
+ 
+    image = OpenImageFromDevice(Closure->device);
+    if(!image) return 0;
+@@ -2051,6 +2052,7 @@ gint64 CurrentMediumSize(int get_blank_size)
+    CloseImage(image);
+ 
+    return size;
++#endif
+ }
+ 
+ /***
+diff --git a/scsi-layer.h b/scsi-layer.h
+index cb5c559..6169508 100644
+--- a/scsi-layer.h
++++ b/scsi-layer.h
+@@ -28,7 +28,7 @@
+ #include <linux/cdrom.h>
+ #endif
+ 
+-#ifdef SYS_FREEBSD
++#if defined(SYS_FREEBSD) || defined(SYS_KFREEBSD)
+ #include <camlib.h>
+ #endif
+ 
+@@ -49,19 +49,21 @@
+  * Linux already has one 
+  */
+ 
+-#ifdef SYS_LINUX
++#if defined(SYS_LINUX)
++
+ #define MAX_CDB_SIZE CDROM_PACKET_SIZE
+ 
+ /* Now globally defined for all OSes here */
+ //typedef struct request_sense Sense;
+-#endif
+ 
+-#ifdef SYS_FREEBSD
++#elif defined(SYS_FREEBSD) || defined(SYS_KFREEBSD)
++
+ #define MAX_CDB_SIZE SCSI_MAX_CDBLEN
+-#endif
+ 
+-#if defined(SYS_UNKNOWN) || defined(SYS_NETBSD)
++#else /* SYS_UNKNOWN and others. */
++
+ #define MAX_CDB_SIZE 16   /* longest possible SCSI command */
++
+ #endif
+ 
+ /* 
+@@ -101,8 +103,7 @@ typedef struct _DeviceHandle
+     */
+ #if defined(SYS_LINUX) || defined(SYS_NETBSD)
+    int fd;                    /* device file descriptor */
+-#endif
+-#ifdef SYS_FREEBSD
++#elif defined(SYS_FREEBSD) || defined(SYS_KFREEBSD)
+    struct cam_device *camdev; /* camlib device handle */
+    union ccb *ccb;
+ #endif
+diff --git a/scsi-unknown.c b/scsi-unknown.c
+index f5f1072..7b2ccdb 100644
+--- a/scsi-unknown.c
++++ b/scsi-unknown.c
+@@ -25,7 +25,7 @@
+ #include "scsi-layer.h"
+ #include "udf.h"
+ 
+-#ifdef SYS_UNKNOWN
++#if defined(SYS_UNKNOWN) || defined(SYS_HURD)
+ 
+ /* Dummy routines so that we can compile on unknown architectures
+    for which we don't have SCSI support yet. */
+@@ -51,4 +51,4 @@ int SendPacket(DeviceHandle *dh, unsigned char *cmd, int cdb_size, unsigned char
+    return -1;
+ }
+ 
+-#endif /* SYS_UNKNOWN */
++#endif /* defined(SYS_UNKNOWN) || defined(SYS_HURD) */
+diff --git a/show-html.c b/show-html.c
+index 608e8ec..20715f4 100644
+--- a/show-html.c
++++ b/show-html.c
+@@ -21,7 +21,8 @@
+ 
+ #include "dvdisaster.h"
+ 
+-#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_NETBSD)
++#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_KFREEBSD) || \
++    defined(SYS_NETBSD) || defined(SYS_HURD)
+ #include <sys/wait.h>
+ #endif
+ 
+@@ -34,7 +35,8 @@
+  *** Ask user to specify his browser
+  ***/
+ 
+-#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_NETBSD)
++#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_KFREEBSD) || \
++    defined(SYS_NETBSD) || defined(SYS_HURD)
+ 
+ #define SEARCH_BUTTON 1
+ 
+@@ -173,7 +175,8 @@ static void msg_destroy_cb(GtkWidget *widget, gpointer data)
+    bi->msg = NULL; 
+ }
+ 
+-#if defined(SYS_LINUX) || defined(SYS_FREEBSD) ||  defined(SYS_NETBSD)
++#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_KFREEBSD) || \
++    defined(SYS_NETBSD) || defined(SYS_HURD)
+ 
+ /* 
+  * The following list of browsers and html wrappers
+@@ -273,7 +276,8 @@ static gboolean browser_timeout_func(gpointer data)
+  * Invoke the browser
+  */
+ 
+-#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_NETBSD)
++#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_KFREEBSD) || \
++    defined(SYS_NETBSD) || defined(SYS_HURD)
+ static void try_browser(browser_info *bi)
+ {  pid_t pid;
+ 
+@@ -393,7 +397,8 @@ void ShowHTML(char *target)
+    g_timeout_add(1000, browser_timeout_func, (gpointer)bi);
+ #endif
+ 
+-#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_NETBSD)
++#if defined(SYS_LINUX) || defined(SYS_FREEBSD) || defined(SYS_KFREEBSD) || \
++    defined(SYS_NETBSD) || defined(SYS_HURD)
+    /* Try the first browser */
+ 
+    browser_index = 0;

debian/patches/32-display-compilation-commands.patch

@@ -0,0 +1,192 @@
+From: Carlos Maddela <e7appew@gmail.com>
+Date: Wed, 9 Aug 2017 20:49:31 +1000
+Subject: Do not suppress the display of compilation commands
+
+Description: Do not suppress the display of compilation commands,
+ so that build logs may be analysed by blhc.
+Author: Carlos Maddela <e7appew@gmail.com>
+Forwarded: not-needed
+Last-Update: 2017-08-9
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+---
+ GNUmakefile.template | 93 +++++++++++++++++++++++++---------------------------
+ 1 file changed, 45 insertions(+), 48 deletions(-)
+
+diff --git a/GNUmakefile.template b/GNUmakefile.template
+index d80932d..ac1f597 100644
+--- a/GNUmakefile.template
++++ b/GNUmakefile.template
+@@ -71,41 +71,41 @@ OFILES = $(CFG_OFILES)
+ 
+ ${BUILDTMP}/%.o : %.c
+ 	@echo "Compiling:" $?
+-	@$(CC) $(COPTS) -c $? -o $@
++	$(CC) $(COPTS) -c $? -o $@
+ 
+ all: time-stamp dvdisaster
+ 
+ # Building the dvdisaster binary
+ 
+ time-stamp:
+-	@$(SRCDIR)/scripts/time-stamper.bash $(SRCDIR)/build.h
++	$(SRCDIR)/scripts/time-stamper.bash $(SRCDIR)/build.h
+ 
+ dvdisaster: inlined-icons.h $(OFILES) 
+ 	@echo "Linking  : dvdisaster"
+-	@$(CC) $(LOPTS) $(OFILES) $(LIBS) -o dvdisaster
+-	@if test -e locale/de/LC_MESSAGES/dvdisaster.mo \
++	$(CC) $(LOPTS) $(OFILES) $(LIBS) -o dvdisaster
++	if test -e locale/de/LC_MESSAGES/dvdisaster.mo \
+ 	 || echo $(WITH_OPTIONS) | grep "NLS_NO" >/dev/null; \
+ 	then echo "not touching locale"; \
+ 	else $(MAKE) --no-print-directory -C locale; \
+ 	fi
+ 
+ inlined-icons.h: icons/read.png icons/create.png icons/scan.png icons/fix.png icons/verify.png
+-	@gdk-pixbuf-csource --raw --name=dvdisaster_read     icons/read.png      >inlined-icons.h
+-	@gdk-pixbuf-csource --raw --name=dvdisaster_create   icons/create.png   >>inlined-icons.h
+-	@gdk-pixbuf-csource --raw --name=dvdisaster_scan     icons/scan.png     >>inlined-icons.h
+-	@gdk-pixbuf-csource --raw --name=dvdisaster_fix      icons/fix.png      >>inlined-icons.h
+-	@gdk-pixbuf-csource --raw --name=dvdisaster_verify   icons/verify.png   >>inlined-icons.h
+-	@gdk-pixbuf-csource --raw --name=dvdisaster_open_ecc icons/open-ecc.png >>inlined-icons.h
+-	@gdk-pixbuf-csource --raw --name=dvdisaster_open_img icons/open-img.png >>inlined-icons.h
+-	@gdk-pixbuf-csource --raw --name=dvdisaster_cd icons/cd.png >>inlined-icons.h
+-	@gdk-pixbuf-csource --raw --name=dvdisaster_gtk_help icons/gtk-help.png >>inlined-icons.h
+-	@gdk-pixbuf-csource --raw --name=dvdisaster_gtk_index icons/gtk-index.png >>inlined-icons.h
+-	@gdk-pixbuf-csource --raw --name=dvdisaster_gtk_preferences icons/gtk-preferences.png >>inlined-icons.h
+-	@gdk-pixbuf-csource --raw --name=dvdisaster_gtk_quit icons/gtk-quit.png >>inlined-icons.h
+-	@gdk-pixbuf-csource --raw --name=dvdisaster_gtk_stop icons/gtk-stop.png >>inlined-icons.h
++	gdk-pixbuf-csource --raw --name=dvdisaster_read     icons/read.png      >inlined-icons.h
++	gdk-pixbuf-csource --raw --name=dvdisaster_create   icons/create.png   >>inlined-icons.h
++	gdk-pixbuf-csource --raw --name=dvdisaster_scan     icons/scan.png     >>inlined-icons.h
++	gdk-pixbuf-csource --raw --name=dvdisaster_fix      icons/fix.png      >>inlined-icons.h
++	gdk-pixbuf-csource --raw --name=dvdisaster_verify   icons/verify.png   >>inlined-icons.h
++	gdk-pixbuf-csource --raw --name=dvdisaster_open_ecc icons/open-ecc.png >>inlined-icons.h
++	gdk-pixbuf-csource --raw --name=dvdisaster_open_img icons/open-img.png >>inlined-icons.h
++	gdk-pixbuf-csource --raw --name=dvdisaster_cd icons/cd.png >>inlined-icons.h
++	gdk-pixbuf-csource --raw --name=dvdisaster_gtk_help icons/gtk-help.png >>inlined-icons.h
++	gdk-pixbuf-csource --raw --name=dvdisaster_gtk_index icons/gtk-index.png >>inlined-icons.h
++	gdk-pixbuf-csource --raw --name=dvdisaster_gtk_preferences icons/gtk-preferences.png >>inlined-icons.h
++	gdk-pixbuf-csource --raw --name=dvdisaster_gtk_quit icons/gtk-quit.png >>inlined-icons.h
++	gdk-pixbuf-csource --raw --name=dvdisaster_gtk_stop icons/gtk-stop.png >>inlined-icons.h
+ 
+ $(BUILDTMP)/help-dialogs.o: help-dialogs.c simple-md5sum
+-	@if test -e fingerprints.md5; \
++	if test -e fingerprints.md5; \
+ 	then if test -e help-dialogs.h; then rm help-dialogs.h; fi; \
+ 	     mv inlined-icons.h inlined-icons.saved; \
+ 	     mv build.h build.saved; \
+@@ -121,35 +121,35 @@ $(BUILDTMP)/help-dialogs.o: help-dialogs.c simple-md5sum
+ 	else echo "#define MODIFIED_SOURCE 1" >> help-dialogs.h; \
+ 	fi
+ 	@echo "Compiling:" help-dialogs.c
+-	@$(CC) $(COPTS) -c help-dialogs.c -o $(BUILDTMP)/help-dialogs.o
++	$(CC) $(COPTS) -c help-dialogs.c -o $(BUILDTMP)/help-dialogs.o
+ 
+ $(BUILDTMP)/rs-encoder-sse2.o: rs-encoder-sse2.c
+ 	@echo "Compiling:" rs-encoder-sse2.c
+-	@$(CC) $(SSE2_OPTIONS) $(COPTS) -c rs-encoder-sse2.c -o $(BUILDTMP)/rs-encoder-sse2.o
++	$(CC) $(SSE2_OPTIONS) $(COPTS) -c rs-encoder-sse2.c -o $(BUILDTMP)/rs-encoder-sse2.o
+ 
+ $(BUILDTMP)/rs-encoder-altivec.o: rs-encoder-altivec.c
+ 	@echo "Compiling:" rs-encoder-altivec.c
+-	@$(CC) $(ALTIVEC_OPTIONS) $(COPTS) -c rs-encoder-altivec.c -o $(BUILDTMP)/rs-encoder-altivec.o
++	$(CC) $(ALTIVEC_OPTIONS) $(COPTS) -c rs-encoder-altivec.c -o $(BUILDTMP)/rs-encoder-altivec.o
+ 
+ locale:
+-	@$(MAKE) --no-print-directory -C locale
++	$(MAKE) --no-print-directory -C locale
+ 
+ untranslated:
+-	@$(MAKE) --no-print-directory -C locale check-untranslated
++	$(MAKE) --no-print-directory -C locale check-untranslated
+ 
+ simple-md5sum: md5.c
+-	@$(CC) $(COPTS) $(MUDFLAP_CFLAGS) -DSIMPLE_MD5SUM md5.c $(MUDFLAP_LFLAGS) $(MUDFLAP_LIBS) -o simple-md5sum
++	$(CC) $(COPTS) $(MUDFLAP_CFLAGS) -DSIMPLE_MD5SUM md5.c $(MUDFLAP_LFLAGS) $(MUDFLAP_LIBS) -o simple-md5sum
+ 
+ version.tex:
+ 	@echo "\\newcommand{\\projectversion}{$(VERSION)}" >$(SRCDIR)/documentation/config/version.tex
+ 
+ manual: version.tex
+ 	@echo "Producing user manual... "
+-	@$(MAKE) --no-print-directory -C documentation/user-manual manual.pdf
++	$(MAKE) --no-print-directory -C documentation/user-manual manual.pdf
+ 
+ manualclean:
+ 	@echo "Removing temporary user manual files... "
+-	@$(MAKE) --no-print-directory -C documentation/user-manual clean
++	$(MAKE) --no-print-directory -C documentation/user-manual clean
+ 
+ 
+ # Some usage info
+@@ -259,13 +259,13 @@ uninstall:
+ 
+ archclean: distclean
+ 	@echo "Removing rebuildable documentation parts"
+-	@$(MAKE) --no-print-directory -C $(SRCDIR)/documentation/codec-specs archclean
+-	@$(MAKE) --no-print-directory -C $(SRCDIR)/documentation/user-manual archclean
++	$(MAKE) --no-print-directory -C $(SRCDIR)/documentation/codec-specs archclean
++	$(MAKE) --no-print-directory -C $(SRCDIR)/documentation/user-manual archclean
+ 
+ distclean: clean
+ 	@echo "Removing configuration files"
+-	@rm -f configure.log Makefile.config GNUmakefile locale/Makefile
+-	@for i in locale/?? locale/??_??; do rm -rf $$i; done
++	rm -f configure.log Makefile.config GNUmakefile locale/Makefile
++	for i in locale/?? locale/??_??; do rm -rf $$i; done
+ 	@echo "all:" >>GNUmakefile
+ 	@echo -e "\t@echo" >>GNUmakefile
+ 	@echo -e "\t@echo \"Please create a Makefile by entering \\\"bash configure\\\" first\"" >>GNUmakefile
+@@ -277,14 +277,14 @@ distclean: clean
+ 
+ clean:
+ 	@echo "Removing rebuildable files"
+-	@rm -rf *.o $(BUILDTMP)/*.o medium.* abbild.* dvdisaster .dvdisaster core core.* *.core
+-	@rm -f inlined-icons.h help-dialogs.h
+-	@find . -name \*\~ -print | xargs rm -f;
+-	@find . -name \*.mo -print | xargs rm -f;
+-	@find . -name \#\*\# -print | xargs rm -f;
+-	@rm -f documentation/config/version.tex
+-	@if test -e $(PKGNAME); then rm -rf $(PKGNAME); fi
+-	@if test -e ~/.dvdisaster-original-author; then \
++	rm -rf *.o $(BUILDTMP)/*.o medium.* abbild.* dvdisaster .dvdisaster core core.* *.core
++	rm -f inlined-icons.h help-dialogs.h
++	find . -name \*\~ -print | xargs rm -f;
++	find . -name \*.mo -print | xargs rm -f;
++	find . -name \#\*\# -print | xargs rm -f;
++	rm -f documentation/config/version.tex
++	if test -e $(PKGNAME); then rm -rf $(PKGNAME); fi
++	if test -e ~/.dvdisaster-original-author; then \
+ 	  mv build.h build.saved ;\
+ 	  if ! test -x simple-md5sum || ! ./simple-md5sum >/dev/null 2>&1; then \
+ 	    rm -f simple-md5sum; \
+@@ -294,20 +294,17 @@ clean:
+ 	  ./simple-md5sum -b *.h *.c >fingerprints.md5 ;\
+ 	  mv build.saved build.h; \
+ 	fi
+-	@rm -f simple-md5sum
+-	@$(MAKE) --no-print-directory -C $(SRCDIR)/documentation/codec-specs clean;
+-	@$(MAKE) --no-print-directory -C $(SRCDIR)/documentation/user-manual clean;
++	rm -f simple-md5sum
++	$(MAKE) --no-print-directory -C $(SRCDIR)/documentation/codec-specs clean;
++	$(MAKE) --no-print-directory -C $(SRCDIR)/documentation/user-manual clean;
+ 
+ BUILD=`grep BUILD $(SRCDIR)/build.h | cut -d ' ' -f 3`
+ arch:	archclean time-stamp
+-	@cd .. ; tar -c -z -f $(TAR_PREFIX)/$(PKGNAME)-$(BUILD).tgz $(PKGNAME)
++	cd .. ; tar -c -z -f $(TAR_PREFIX)/$(PKGNAME)-$(BUILD).tgz $(PKGNAME)
+ 
+ INSTALL: documentation/install.template
+-	@sed "s/@@PKGNAME/$(PKGNAME)/" <documentation/install.template >INSTALL
++	sed "s/@@PKGNAME/$(PKGNAME)/" <documentation/install.template >INSTALL
+ 
+ srcdist: INSTALL distclean manual manualclean
+-	@cd .. ; tar -c -j -X $(PKGNAME)/NODIST -f $(TAR_PREFIX)/$(PKGNAME).tar.bz2 $(PKGNAME)
+-	@cd .. ; gpg --homedir .gnupg --default-key 758BCC23 --detach-sign --output $(TAR_PREFIX)/$(PKGNAME).tar.bz2.gpg --armor $(TAR_PREFIX)/$(PKGNAME).tar.bz2 
+-
+-
+-
++	cd .. ; tar -c -j -X $(PKGNAME)/NODIST -f $(TAR_PREFIX)/$(PKGNAME).tar.bz2 $(PKGNAME)
++	cd .. ; gpg --homedir .gnupg --default-key 758BCC23 --detach-sign --output $(TAR_PREFIX)/$(PKGNAME).tar.bz2.gpg --armor $(TAR_PREFIX)/$(PKGNAME).tar.bz2

debian/patches/33-honour-LDFLAGS.patch

@@ -0,0 +1,28 @@
+From: Carlos Maddela <e7appew@gmail.com>
+Date: Thu, 21 Dec 2017 02:44:53 +1100
+Subject: Honour LDFLAGS set by dpkg-buildflags in building all binaries.
+
+Description: Honour LDFLAGS set by dpkg-buildflags in building all binaries.
+ Unpackaged simple-md5sum utility must do so as well, to keep blhc happy.
+Author: Carlos Maddela <e7appew@gmail.com>
+Forwarded: no
+Last-Update: 2017-12-21
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+---
+ GNUmakefile.template | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/GNUmakefile.template b/GNUmakefile.template
+index ac1f597..4509c48 100644
+--- a/GNUmakefile.template
++++ b/GNUmakefile.template
+@@ -138,7 +138,7 @@ untranslated:
+ 	$(MAKE) --no-print-directory -C locale check-untranslated
+ 
+ simple-md5sum: md5.c
+-	$(CC) $(COPTS) $(MUDFLAP_CFLAGS) -DSIMPLE_MD5SUM md5.c $(MUDFLAP_LFLAGS) $(MUDFLAP_LIBS) -o simple-md5sum
++	$(CC) $(COPTS) $(MUDFLAP_CFLAGS) -DSIMPLE_MD5SUM md5.c $(LDFLAGS) $(MUDFLAP_LFLAGS) $(MUDFLAP_LIBS) -o simple-md5sum
+ 
+ version.tex:
+ 	@echo "\\newcommand{\\projectversion}{$(VERSION)}" >$(SRCDIR)/documentation/config/version.tex

debian/patches/34-gcc8-format-security.patch

@@ -0,0 +1,27 @@
+From: Carlos Maddela <e7appew@gmail.com>
+Date: Thu, 31 Jan 2019 05:10:21 +1100
+Subject: Fix format security warning in GCC-8.
+
+Description: Fix format security warning in GCC-8.
+Author: Carlos Maddela <e7appew@gmail.com>
+Forwarded: no
+Last-Update: 2019-01-31
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+---
+ udf.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/udf.c b/udf.c
+index 174fa36..9e345c2 100644
+--- a/udf.c
++++ b/udf.c
+@@ -794,7 +794,7 @@ void FreeIsoHeader(IsoHeader *ih)
+ 
+ void AddFile(IsoHeader *ih, char *name, guint64 size)
+ {  static int n;
+-   char iso[20], joliet[strlen(name)+3];
++   char iso[22], joliet[strlen(name)+3];
+ 
+    n++;
+    sprintf(iso,"RAN_%04d.DAT;1", n);

debian/patches/35-archived-homepage.patch

@@ -0,0 +1,108 @@
+From: Carlos Maddela <e7appew@gmail.com>
+Date: Thu, 31 Jan 2019 05:31:03 +1100
+Subject: Change homepage to one archived at web.archive.org.
+
+Description: Change homepage to one archived at web.archive.org.
+ http://dvdisaster.net has been unavailable for a while now.
+ Not certain if this is permanent though, as the domain name still
+ exists for mail.
+Author: Carlos Maddela <e7appew@gmail.com>
+Forwarded: not-needed
+Last-Update: 2019-01-31
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+---
+ documentation/codec-specs/rs01.tex            | 2 +-
+ documentation/codec-specs/rs02.tex            | 2 +-
+ documentation/upstream-site/de/impressum.html | 2 +-
+ documentation/upstream-site/en/imprint.html   | 2 +-
+ documentation/user-manual/background.tex      | 2 +-
+ documentation/user-manual/download.tex        | 4 ++--
+ 6 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/documentation/codec-specs/rs01.tex b/documentation/codec-specs/rs01.tex
+index a8c0d90..ca7f71f 100644
+--- a/documentation/codec-specs/rs01.tex
++++ b/documentation/codec-specs/rs01.tex
+@@ -44,7 +44,7 @@ correction files must be protected with an image level
+ error correction layer (by using RS01,RS02 or RS03 on the medium), 
+ since only image level error correction avoids meta 
+ data sectors to become a single point of failure. See the
+-discussion at \url{http://dvdisaster.net/en/qa32.html} for
++discussion at \url{https://web.archive.org/web/20180428070843/http://dvdisaster.net/en/qa32.html} for
+ more information on the advantages of image level data protection
+ over file level approaches.
+ 
+diff --git a/documentation/codec-specs/rs02.tex b/documentation/codec-specs/rs02.tex
+index fb88384..06e8126 100644
+--- a/documentation/codec-specs/rs02.tex
++++ b/documentation/codec-specs/rs02.tex
+@@ -74,7 +74,7 @@ the parity data portion of the image might not be written to the medium.
+ Most current writing programs do however measure the .iso image by examining
+ its file size, and will transfer the parity data correctly. To be sure you
+ should follow the steps described under ``Testing image compatibility''
+-at the dvdisaster site (\url{http://dvdisaster.net/en/howtos92.html}) once
++at the dvdisaster site (\url{https://web.archive.org/web/20180428070843/http://dvdisaster.net/en/howtos92.html}) once
+ before using each version of your optical media authoring software.
+ 
+ Like the other dvdisaster codecs, RS02 is based on a  RS(255,k) Reed-Solomon code
+diff --git a/documentation/upstream-site/de/impressum.html b/documentation/upstream-site/de/impressum.html
+index 7c5ded3..d8bf4f8 100644
+--- a/documentation/upstream-site/de/impressum.html
++++ b/documentation/upstream-site/de/impressum.html
+@@ -63,7 +63,7 @@ Carsten Gnörlich (Anschrift wie oben).
+ Das Impressum gilt für die Internetpräsenz unter den Domänen<br>
+ <a href="http://dvdisaster.com">dvdisaster.com</a>, &nbsp;
+ <a href="http://dvdisaster.de">dvdisaster.de</a>, &nbsp;
+-<a href="http://dvdisaster.net">dvdisaster.net</a>, &nbsp;
++<a href="https://web.archive.org/web/20180428070843/http://dvdisaster.net">dvdisaster.net</a>, &nbsp;
+ <a href="http://dvdisaster.org">dvdisaster.org</a>.
+ 
+ <!-- Page footer -->
+diff --git a/documentation/upstream-site/en/imprint.html b/documentation/upstream-site/en/imprint.html
+index d99324b..43641f2 100644
+--- a/documentation/upstream-site/en/imprint.html
++++ b/documentation/upstream-site/en/imprint.html
+@@ -63,7 +63,7 @@ Carsten Gnörlich (see above for address).
+ This notice covers the web sites under the domains<br>
+ <a href="http://dvdisaster.com">dvdisaster.com</a>, &nbsp;
+ <a href="http://dvdisaster.de">dvdisaster.de</a>, &nbsp;
+-<a href="http://dvdisaster.net">dvdisaster.net</a>, &nbsp;
++<a href="https://web.archive.org/web/20180428070843/http://dvdisaster.net">dvdisaster.net</a>, &nbsp;
+ <a href="http://dvdisaster.org">dvdisaster.org</a>.<br>
+     
+ <!-- Page footer -->
+diff --git a/documentation/user-manual/background.tex b/documentation/user-manual/background.tex
+index ba602ef..9aba84f 100644
+--- a/documentation/user-manual/background.tex
++++ b/documentation/user-manual/background.tex
+@@ -272,7 +272,7 @@ media with augmented images may not play correctly on all units \\
+ \end{tabular}
+ 
+ \paragraph{Further reading.} The specification for the dvdisaster codecs 
+-has been specified in a separate document called \href{http://dvdisaster.net/downloads/codecs.pdf}{codecs.pdf}. 
++has been specified in a separate document called \href{https://web.archive.org/web/20180428070843/http://dvdisaster.net/downloads/codecs.pdf}{codecs.pdf}. 
+ Good knowledge in coding theory and programming is required.
+ 
+ \subsection{The linear reading strategy}
+diff --git a/documentation/user-manual/download.tex b/documentation/user-manual/download.tex
+index 79df7be..a91a44a 100644
+--- a/documentation/user-manual/download.tex
++++ b/documentation/user-manual/download.tex
+@@ -15,7 +15,7 @@ the \href{http://www.gnu.org/licenses/gpl-3.0.txt}{GNU General Public License v3
+ 
+ \bigskip
+ 
+-The dvdisaster developer site (\url{http://dvdisaster.net}) contains
++The dvdisaster developer site (\url{https://web.archive.org/web/20180428070843/http://dvdisaster.net}) contains
+ the latest source code releases for the FreeBSD, GNU/Linux and NetBSD
+ operating systems. These are mostly aimed at maintainers of binary packages for
+ the beforementioned platforms. As an end user you might find it more convenient
+@@ -133,6 +133,6 @@ We cannot accept them for various reasons.
+ \smallskip
+ 
+ dvdisaster releases are always published with cryptographic signatures
+-and md5 checksums. See the \href{http://dvdisaster.net}{download site} for examples.
++and md5 checksums. See the \href{https://web.archive.org/web/20180428070843/http://dvdisaster.net}{download site} for examples.
+ Be very cautious if signatures and checksums are missing, invalid or not
+ matching those published at the sites mentioned above.

debian/patches/36-fix-parallelism.patch

@@ -0,0 +1,54 @@
+From: Carlos Maddela <e7appew@gmail.com>
+Date: Fri, 1 Feb 2019 22:28:18 +1100
+Subject: Fix parallel build of locale strings.
+
+Description: Fix parallel build of locale strings.
+Author: Carlos Maddela <e7appew@gmail.com>
+Forwarded: no
+Last-Update: 2019-02-01
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+---
+ GNUmakefile.template   |  1 +
+ locale/create-makefile | 10 +++++++---
+ 2 files changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/GNUmakefile.template b/GNUmakefile.template
+index 4509c48..3aae04e 100644
+--- a/GNUmakefile.template
++++ b/GNUmakefile.template
+@@ -297,6 +297,7 @@ clean:
+ 	rm -f simple-md5sum
+ 	$(MAKE) --no-print-directory -C $(SRCDIR)/documentation/codec-specs clean;
+ 	$(MAKE) --no-print-directory -C $(SRCDIR)/documentation/user-manual clean;
++	$(MAKE) --no-print-directory -C $(SRCDIR)/locale clean;
+ 
+ BUILD=`grep BUILD $(SRCDIR)/build.h | cut -d ' ' -f 3`
+ arch:	archclean time-stamp
+diff --git a/locale/create-makefile b/locale/create-makefile
+index 5ed31ed..83a4abf 100644
+--- a/locale/create-makefile
++++ b/locale/create-makefile
+@@ -30,15 +30,19 @@ locale: \$(LOCALEFILES)
+ 
+ # Create the locale files. 
+ 
++messages.pot: \$(CFILES)
++	@cd ..; xgettext --no-wrap -cTRANSLATORS: -o locale/messages.pot -k_ -k_utf \$(CFILES_NP)
++
++clean:
++	rm -f messages.pot
++
+ EOF
+ 
+ for i in $prefixes; do
+ cat >> Makefile <<EOF
+-$i.po: \$(CFILES)
++$i.po: messages.pot
+ 	@echo "Updating $i.po"
+-	@cd ..; xgettext --no-wrap -cTRANSLATORS: -o locale/messages.pot -k_ -k_utf \$(CFILES_NP)
+ 	@msgmerge -q -U --no-wrap --no-fuzzy-matching $i.po messages.pot
+-	@rm -f messages.pot
+ 
+ $i/LC_MESSAGES/dvdisaster.mo: $i.po
+ 	@echo "Updating $i.mo"

debian/patches/37-suggest-dvdisaster-doc.patch

@@ -0,0 +1,137 @@
+From: Carlos Maddela <e7appew@gmail.com>
+Date: Sat, 2 Feb 2019 13:56:04 +1100
+Subject: Suggest to install dvdisaster-doc in error message
+
+Description: Suggest to install dvdisaster-doc in error message
+ if the PDF manual cannot be found.
+Author: Carlos Maddela <e7appew@gmail.com>
+Forwarded: not-needed
+Last-Update: 2019-02-02
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+---
+ locale/cs.po    | 2 ++
+ locale/de.po    | 2 ++
+ locale/it.po    | 2 ++
+ locale/pt_BR.po | 2 ++
+ locale/ru.po    | 2 ++
+ locale/sv.po    | 2 ++
+ show-manual.c   | 3 ++-
+ 7 files changed, 14 insertions(+), 1 deletion(-)
+
+diff --git a/locale/cs.po b/locale/cs.po
+index d89ff4a..b55c45a 100644
+--- a/locale/cs.po
++++ b/locale/cs.po
+@@ -6077,10 +6077,12 @@ msgid ""
+ "Documentation file\n"
+ "%s\n"
+ "not found.\n"
++"Please install the dvdisaster-doc package.\n"
+ msgstr ""
+ "Soubor dokumentace\n"
+ "%s\n"
+ "nebyl nalezen.\n"
++"Nainstalujte prosím balíček dvdisaster-doc.\n"
+ 
+ #: show-manual.c:308
+ msgid "Please hang on until the viewer comes up!"
+diff --git a/locale/de.po b/locale/de.po
+index 8112b13..f54b083 100644
+--- a/locale/de.po
++++ b/locale/de.po
+@@ -6226,10 +6226,12 @@ msgid ""
+ "Documentation file\n"
+ "%s\n"
+ "not found.\n"
++"Please install the dvdisaster-doc package.\n"
+ msgstr ""
+ "Dokument-Datei\n"
+ "%s\n"
+ "nicht gefunden.\n"
++"Bitte installieren Sie das dvdisaster-doc-Paket.\n"
+ 
+ #: show-manual.c:308
+ msgid "Please hang on until the viewer comes up!"
+diff --git a/locale/it.po b/locale/it.po
+index b98f8d3..de60016 100644
+--- a/locale/it.po
++++ b/locale/it.po
+@@ -5629,10 +5629,12 @@ msgid ""
+ "Documentation file\n"
+ "%s\n"
+ "not found.\n"
++"Please install the dvdisaster-doc package.\n"
+ msgstr ""
+ "File di documentazione\n"
+ "%s\n"
+ "non trovati.\n"
++"Si prega di installare il pacchetto dvdisaster-doc.\n"
+ 
+ #: show-manual.c:308
+ msgid "Please hang on until the viewer comes up!"
+diff --git a/locale/pt_BR.po b/locale/pt_BR.po
+index 81ee14d..3659f11 100644
+--- a/locale/pt_BR.po
++++ b/locale/pt_BR.po
+@@ -5950,10 +5950,12 @@ msgid ""
+ "Documentation file\n"
+ "%s\n"
+ "not found.\n"
++"Please install the dvdisaster-doc package.\n"
+ msgstr ""
+ "Arquivo de documentação\n"
+ "%s\n"
+ "não encontrado.\n"
++"Por favor, instale o pacote dvdisaster-doc.\n"
+ 
+ #: show-manual.c:308
+ msgid "Please hang on until the viewer comes up!"
+diff --git a/locale/ru.po b/locale/ru.po
+index 6e980b9..9c45692 100644
+--- a/locale/ru.po
++++ b/locale/ru.po
+@@ -5958,10 +5958,12 @@ msgid ""
+ "Documentation file\n"
+ "%s\n"
+ "not found.\n"
++"Please install the dvdisaster-doc package.\n"
+ msgstr ""
+ "Файл документации\n"
+ "%s\n"
+ "не найден.\n"
++"Пожалуйста, установите пакет dvdisaster-doc.\n"
+ 
+ #: show-manual.c:308
+ msgid "Please hang on until the viewer comes up!"
+diff --git a/locale/sv.po b/locale/sv.po
+index 3011969..9cee323 100644
+--- a/locale/sv.po
++++ b/locale/sv.po
+@@ -5648,10 +5648,12 @@ msgid ""
+ "Documentation file\n"
+ "%s\n"
+ "not found.\n"
++"Please install the dvdisaster-doc package.\n"
+ msgstr ""
+ "Dokumentationsfilen\n"
+ "%s\n"
+ "hittades inte.\n"
++"Installera dvdisaster-doc-paketet.\n"
+ 
+ #: show-manual.c:308
+ msgid "Please hang on until the viewer comes up!"
+diff --git a/show-manual.c b/show-manual.c
+index 4abbe97..5ac8e97 100644
+--- a/show-manual.c
++++ b/show-manual.c
+@@ -296,7 +296,8 @@ void ShowPDF(char *target)
+ 
+    if(!LargeStat(bi->path, &ignore))
+    {  
+-      CreateMessage(_("Documentation file\n%s\nnot found.\n"), GTK_MESSAGE_ERROR, bi->path);
++      CreateMessage(_("Documentation file\n%s\nnot found.\n"
++	       "Please install the dvdisaster-doc package.\n"), GTK_MESSAGE_ERROR, bi->path);
+       g_free(bi->path);
+       g_free(bi);
+       return;

debian/patches/series

@@ -1,6 +1,9 @@
-02-encryption.patch
-03-dvdrom.patch
-04-manpage.patch
-05-help-dialog.patch
-06-remove-encoding-from-desktop-file.patch
-07-fix-spelling-errors-in-binaries.patch
+11-no-cruft.patch
+15-show-new-pkg-tracker.patch
+16-remove-auto-build-of-doco-from-install-rule.patch
+20-display-changelog-credits-and-todo.patch
+24-show-gpl3-license.patch
+26-fix-display-of-manual.pdf.patch
+32-display-compilation-commands.patch
+34-gcc8-format-security.patch
+37-suggest-dvdisaster-doc.patch

debian/pixmaps/dvdisaster.xpm

@@ -1,151 +0,0 @@
-/* XPM */
-static char * dvdisaster_xpm[] = {
-"32 32 116 2",
-"  	c None",
-". 	c #000000",
-"+ 	c #0F0F0F",
-"@ 	c #424242",
-"# 	c #656565",
-"$ 	c #737373",
-"% 	c #545454",
-"& 	c #111111",
-"* 	c #080808",
-"= 	c #626262",
-"- 	c #C1C1C1",
-"; 	c #FBFBFB",
-"> 	c #FFFFFF",
-", 	c #F7F7F7",
-"' 	c #8B8B8B",
-") 	c #060817",
-"! 	c #020308",
-"~ 	c #010101",
-"{ 	c #606060",
-"] 	c #E4E4E4",
-"^ 	c #CBCBCB",
-"/ 	c #131316",
-"( 	c #2C379A",
-"_ 	c #1A215C",
-": 	c #000001",
-"< 	c #121212",
-"[ 	c #B4B4B4",
-"} 	c #B9B9B9",
-"| 	c #090B1C",
-"1 	c #4354EB",
-"2 	c #323EAD",
-"3 	c #050612",
-"4 	c #1D1D1D",
-"5 	c #D8D8D8",
-"6 	c #C5C5C5",
-"7 	c #6F6F6F",
-"8 	c #575757",
-"9 	c #2A3492",
-"0 	c #4658F5",
-"a 	c #3B4BD0",
-"b 	c #080A1C",
-"c 	c #9E9E9E",
-"d 	c #263084",
-"e 	c #BABABA",
-"f 	c #12173F",
-"g 	c #131314",
-"h 	c #3B4ACE",
-"i 	c #EEEEEE",
-"j 	c #04050F",
-"k 	c #E6E6E6",
-"l 	c #070817",
-"m 	c #04050D",
-"n 	c #3F4FDB",
-"o 	c #11163C",
-"p 	c #1B225E",
-"q 	c #5C5C5C",
-"r 	c #28338D",
-"s 	c #3542B9",
-"t 	c #090A19",
-"u 	c #4254E9",
-"v 	c #4557F1",
-"w 	c #04050E",
-"x 	c #D3D3D3",
-"y 	c #171718",
-"z 	c #313EAC",
-"A 	c #989898",
-"B 	c #0F0F13",
-"C 	c #1C2361",
-"D 	c #ECECEC",
-"E 	c #A8A8A8",
-"F 	c #858585",
-"G 	c #7B7B7B",
-"H 	c #595959",
-"I 	c #141946",
-"J 	c #3948C9",
-"K 	c #20286E",
-"L 	c #DFDFDF",
-"M 	c #0A0B13",
-"N 	c #161C4E",
-"O 	c #212A74",
-"P 	c #242D7E",
-"Q 	c #3E4ED9",
-"R 	c #B5B5B5",
-"S 	c #101014",
-"T 	c #3543BB",
-"U 	c #F9F9F9",
-"V 	c #242424",
-"W 	c #303CA7",
-"X 	c #A3A3A3",
-"Y 	c #141A47",
-"Z 	c #3644BD",
-"` 	c #1E266B",
-" .	c #494949",
-"..	c #303CA8",
-"+.	c #2B3798",
-"@.	c #1B1B1D",
-"#.	c #8A8A8A",
-"$.	c #131313",
-"%.	c #4050DF",
-"&.	c #4556F1",
-"*.	c #070814",
-"=.	c #D6D6D6",
-"-.	c #3F4FDC",
-";.	c #181818",
-">.	c #4051E1",
-",.	c #9F9F9F",
-"'.	c #161C4D",
-").	c #1F1F1F",
-"!.	c #323FAF",
-"~.	c #090A14",
-"{.	c #3846C3",
-"].	c #030309",
-"^.	c #28328A",
-"/.	c #4456EF",
-"(.	c #060715",
-"_.	c #181F56",
-"                                                                ",
-"                      . + @ # $ $ % & . .                       ",
-"                . * = - ; > > > > > , ' * ) ! .                 ",
-"              ~ { ] > > > > > > > > > > ^ / ( _ :               ",
-"            < [ > > > > > > > > > > > > > } | 1 2 3             ",
-"          4 5 > > > > > > > 6 7 7 6 > > > > 8 9 0 a b           ",
-"        < 5 > > > > > > > c | d d | c > > > e f 0 0 a 3         ",
-"      ~ [ > > > > > > > ; g h 0 0 h g ; > > i j 0 0 0 2 :       ",
-"    . { > > > > > > > > k l 0 0 0 0 l k > > > . 0 0 0 0 _ .     ",
-"    * ] > > > > > > > > ; g h 0 0 h g ; > > i m 0 0 0 0 n !     ",
-"    = > > > > > > > > > > c | d d | c > > > e o 0 0 0 0 0 p     ",
-"  . - > > > > > > > > > > > 6 7 7 6 > > > > q r 0 0 0 0 0 s .   ",
-"  + ; > > > > > > > > > > > > > > > > > > - t u 0 0 0 0 0 v w   ",
-"  @ > > > > > > > > > > > > > > > > > > x y z 0 0 0 0 0 0 0 f   ",
-"  # > > > > > > > > > > > > > > > > ; A B ( 0 0 0 0 0 0 0 0 C   ",
-"  $ > > > > > > > > > > > D E F G H y I J 0 0 0 0 0 0 0 0 0 K   ",
-"  $ > > > > > > > > > L q M N O P ( Q 0 0 0 0 0 0 0 0 0 0 0 K   ",
-"  # > > > > > > > > R S P 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 C   ",
-"  @ > > > > > > > 6 M T 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 f   ",
-"  + ; > > > > > U V W 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 v w   ",
-"  . - > > > > > X Y 0 0 0 0 Z ` ` Z 0 0 0 0 0 0 0 0 0 0 0 s .   ",
-"    = > > > > >  ...0 0 0 +.@.#.#.@.+.0 0 0 0 0 0 0 0 0 0 p     ",
-"    * ] > > > > $.%.0 0 &.*.=.> > =.*.&.0 0 0 0 0 0 0 0 n !     ",
-"    . { > > > > . 0 0 0 -.;.> > > > ;.-.0 0 0 0 0 0 0 0 _ .     ",
-"      ~ [ > > > $.>.0 0 &.*.=.> > =.*.&.0 0 0 0 0 0 0 2 :       ",
-"        < 5 > >  .z 0 0 0 +.@.#.#.@.+.0 0 0 0 0 0 0 a 3         ",
-"          4 5 > ,.'.0 0 0 0 Z ` ` Z 0 0 0 0 0 0 0 a b           ",
-"            < [ , ).!.0 0 0 0 0 0 0 0 0 0 0 0 0 2 3             ",
-"              ~ { X ~.{.0 0 0 0 0 0 0 0 0 0 n _ :               ",
-"                . * ;.].^./.0 0 0 0 0 v s p ! .                 ",
-"                      . . (._.K K C f w .                       ",
-"                                                                "};

debian/rules

@@ -1,34 +1,75 @@
 #!/usr/bin/make -f
 
+export DH_VERBOSE = 1
+
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/buildflags.mk
+export DEB_CFLAGS_MAINT_APPEND = $(CPPFLAGS) -Wall -Wno-deprecated-declarations -pedantic
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
+
+include /usr/share/dpkg/pkg-info.mk
+export DEB_VERSION
+export FORCE_SOURCE_DATE = 1
+
+MUTABLE_FILES := build.h $(wildcard locale/*.po) \
+	documentation/config/version.tex \
+	documentation/user-manual/manual.pdf
+BACKUP_TAR_FILE := debian/backup.tar
+
+BUILDROOT := $(CURDIR)/debian/tmp
+ICONS := $(wildcard contrib/dvdisaster*.png)
+ICON_SIZES := $(patsubst contrib/dvdisaster%.png,%,$(ICONS))
+
 %:
 	dh $@
 
-#override_dh_autoclean:
-#	dh_autoclean
-#	find documentation -name "*.png" | xargs rm -f
+override_dh_update_autotools_config:
+	dh_update_autotools_config
+	test -f $(BACKUP_TAR_FILE) || \
+		tar cpf $(BACKUP_TAR_FILE) $(MUTABLE_FILES)
 
+override_dh_clean:
+	dh_clean
+	test ! -f $(BACKUP_TAR_FILE) || \
+		tar xpf $(BACKUP_TAR_FILE) && rm -f $(BACKUP_TAR_FILE)
 
 override_dh_auto_configure:
-	dh_auto_configure -- \
-		--localedir=\$${prefix}/share/locale \
-		--docdir=\$${prefix}share/doc \
-		--docsubdir=dvdisaster-doc/html 
+	./configure \
+		--prefix=/usr \
+		--mandir=share/man \
+		--localedir=share/locale \
+		--docdir=share/doc \
+		--docsubdir=dvdisaster \
+		--with-embedded-src-path=no
 
-override_dh_auto_install:
-	dh_auto_install -- BUILDROOT=$(CURDIR)/debian/tmp 
+override_dh_auto_build-arch:
+	dh_auto_build -a -- all
 
-	# Installing desktop file
-	install -D -m 0644 contrib/dvdisaster.desktop debian/dvdisaster/usr/share/applications/dvdisaster.desktop
-	sed -i -e 's/dvdisaster48/dvdisaster/' debian/dvdisaster/usr/share/applications/dvdisaster.desktop
+override_dh_auto_build-indep:
+	dh_auto_build -i \
+		$(if $(findstring nodoc,$(DEB_BUILD_OPTIONS)),--no-act) \
+		-- manual
 
-	# Installing icon
-	install -D -m 0644 contrib/dvdisaster32.png debian/dvdisaster/usr/share/icons/dvdisaster.png
+override_dh_auto_install-arch:
+	dh_auto_install -a -- BUILDROOT=$(BUILDROOT)
+	set -e; \
+	for S in $(ICON_SIZES); do \
+		D="$(BUILDROOT)/usr/share/icons/hicolor/$${S}x$${S}/apps"; \
+		install -d "$${D}"; \
+		install -T "contrib/dvdisaster$${S}.png" "$${D}/dvdisaster.png"; \
+	done
 
-	# Installing pixmaps
-	install -D -m 0644 debian/pixmaps/dvdisaster.xpm debian/dvdisaster/usr/share/pixmaps/dvdisaster.xpm
+override_dh_auto_install-indep:
+	true
 
-	# Removing double files
-	rm -f debian/tmp/usr/bin/dvdisaster-uninstall.sh
-	rm -f debian/tmp/usr/share/doc/dvdisaster-doc/html/CHANGELOG
-	rm -f debian/tmp/usr/share/doc/dvdisaster-doc/html/COPYING
+# Ensure that none of the text files that the application
+# tries to display directly are compressed, as it doesn't
+# automatically decompress text files.
+override_dh_compress-arch:
+	dh_compress -p dvdisaster \
+		-Xchangelog -XCREDITS -XREADME.MODIFYING -XTODO
+	gzip -9n debian/dvdisaster/usr/share/doc/dvdisaster/changelog.Debian
 
+override_dh_installchangelogs-arch:
+	dh_installchangelogs -p dvdisaster -k

debian/source/lintian-overrides

@@ -0,0 +1 @@
+dvdisaster source: debian-watch-uses-insecure-uri http://dvdisaster.net/en/index.html

debian/source/options

@@ -0,0 +1 @@
+no-unapply-patches

debian/tests/control

@@ -0,0 +1,2 @@
+Tests: unknown-system
+Depends: dvdisaster

debian/tests/unknown-system

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+set -e
+
+# Make sure we haven't built for an unknown system.
+! (dvdisaster --version | grep -qiw unknown)

debian/upstream/metadata

@@ -0,0 +1,4 @@
+# https://wiki.debian.org/UpstreamMetadata
+Documentation: https://web.archive.org/web/20180428070843/http://dvdisaster.net/en/misc.html#manual
+Homepage: https://web.archive.org/web/20180428070843/http://dvdisaster.net/
+Security-Contact: Carsten Gnörlich <carsten@dvdisaster.org>

debian/upstream/signing-key.asc

@@ -0,0 +1,73 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQGiBD9GYJcRBACXa6CzZ0WPqUvit1d7LvnSOqLDxYQiiphnzjQc+ssJvScNxv9+
+ThELKXHxaKfDpL9/C4+5qh1pfrsEEpuQ7m+RfXFqz5UPZITgza5Ko/5WPhhVRxkh
+8b8ux7DIeFlbgmd5YSFPoYIwGWCAtI5OiUC6qa149gAq7k0vtgb+hbxn2wCg0lTu
+XGNjX7qMNggbnx3aBVVd9SMD/RYWIr2c66w6Kt/EYLLgYGqgZL9MkmocuUoJVgiI
+Y2pi3SPbIvX3enk1OIRBCFbweEgXiVw+FWu6aK09eZrJcDv2Uns4ecTvzz1d83RH
+gssV7ulB6P5mU3u6NT39CHW6fJ5Xi1HPkw380+y3dbaRxh/1htmk5Ao0DmDGRohL
+vzgIA/9P/bdqh0WG0j4qY+8pcsNn0/ymiJXPZzvyr2cEc56AaHgLAVZHMUyE3Rd9
+9rSZjVS+x/oGbkzVOd8IySUSRx7f2Sxve1sxoaNlwdqcE0vq16PH1iMBQ6KJAvUA
+NAM4QZhAI7Lav9yB/tXblGrHHjll+fwFB/9t6G0hO9JoJDaEgbQmQ2Fyc3RlbiBH
+bsO2cmxpY2ggKHBrZyBzaWduaW5nIGtleSAjMSmIXgQTEQIAHgUCQCvkqQIbAwYL
+CQgHAwIDFQIDAxYCAQIeAQIXgAAKCRBaWQ7+9fbEbGfsAJ9NrkdlRobMhtWpAyeW
+wPUe8XHzsACfYbMooS0D/UmRGo7wW7rBnrVqLxy5AQ0EP0ZgmBAEAKJos9WBWgw1
+sGFFM/1eKEzZqGYMt8qk2r/djPyZYEIzqT47aR7P9gPIXDTplOmBgL43hU8MlE9K
+Q92s4RVP/x/OvMWF04vSO3vBEmeR3HncpbIk4AP17MZGuqEGtyAe1e5hcGiho1CL
+/6fSanYydC2iciKbfyyfzL9oISHedad7AAMFA/4wtrdqwTI2p05NAGxRA2r4egYI
+m7x+ixyYuHGkzZzHMdos5zDg/dzNRnarib98JgAkZR+EVT6K0Ez6ykz57oteCt6f
+jyGjOwI9bUyOFa+LyGJ+QRaeVozhqLLu/b4wgKCuBcKNt2ebpKFHi9JKiGE9hOJz
+4nanjCbtihUJaf1DLIhJBBgRAgAJBQI/RmCYAhsMAAoJEFpZDv719sRsbk4An2JZ
+q/8GBvugzgfu5AxacsuiZzfgAKCwzLAuoUTw/Sz6bYaAUfec362gFw==
+=Sidz
+-----END PGP PUBLIC KEY BLOCK-----
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBFYS0XkBEACxsIQ1dI0k1TiybBztU6BC3DeQsDGC9TeaGBgYDo+62B8U5uiJ
+AD9ofBXglj0/DOweAIoLdcVsvFzU0sxk4tUnb84plk09qG+UfU2227DWeKTP3YPv
+E8A6uWopr6Yoc8WGG9mKl9L1CCiqQmNB4L4Um2/yDPrhtN3TxzpMLBoNUo/f271Q
+yLxQZMEsUDTZq7JxbEQ9hLbBn69zIptsZHyNJwCerqXqhzQcB11BVqZyLrRC+0ZT
+eUtO1o10Y/EAEi86ivi1upLsgVi5u2LcP9ICIhTVv6MQ+turhThFOIcEvbw/15Hp
+4Vlb0yZlBx2j4Hr4tDSrWeQ1lmBNA1qhrLkPOIQv+scXhcyzY5nKIjRDKYS1v8OM
+uMhfVakK/YS+flN5nyS4Ku0x99sae75+PArMjbLNfP738Zw4ywC4i+i958SEIcky
+4Bia+kyTCPRZWZ5BJe3+GAPDdI1XntS0D1uXPiwi8u91jg1cAEChwjwe2pr0RG+h
+8ft5BTezJyAeZ9haU8OyrW5GZNddhyBH4QxdRYvMTdmQIbjxNuTYGpBXl4qgTqKn
+A7Gxbr24hgdUHKIe//AlDQ41VbBTdyBmgyORGCL+uaSpDerADPXh+bwE2vQsKs13
++HcVldLBJmL9tYeRZvpvR/vwFBvfkrgAN8+NdPnSzwvLI0JMrL50DOhapwARAQAB
+tB9kdmRpc2FzdGVyIChwa2cgc2lnbmluZyBrZXkgIzIpiQI4BBMBAgAiBQJWEtF5
+AhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRCw28p9ZPdwsivVD/4wiomj
+IFNUG0lb4sIvXHZR2sv0rVz1eN74B+Ngefp3viZvjvmXji2cbzPhTsoAq4ys5/nD
+m9fLnm+mG2TfLKTqXBNRDeEDmknK0aXlFVbdUfgeExvU9Tj1giOORTvTiNPdJpkF
+qKMrjvtB4t2sHuuL/SNwQAWlWfDUuK52yf1SAZasdFPTAvAuzo+lqfYbi5tnjIY/
+GkR9e3ZjMEaWvxc0N5CJg7ibKpuX476eo+04oKkNvSbyE7Lpcho4AHy6e4UoJ9e+
+UBL3o84MtChwrlP5HmMPan1hIL5iyswDUrxUfL36GqAEcAM8tIbZ6A6CfQT+FgnI
+e/E1dm3FWEje8F7uD2xkCGRBYTN8BG5+UMTF9MaQGU3kxBMPt8xvHmCNZHR6QrdL
++vysa+02QmSM1jZz4J37yctM69WY1x3JDC+HGHMxCX3G+BrDntLG3yQkox1nBi2l
+8JiKTdoX7LhRn1xCijIpYdbszMao0lN/XEiOgx2eygG9a3fQDOqR/yi9tTqmKQM4
+H/il88tkdsaioWXspWEhrS+8MhiUdr8yz3LA9+DawddnW8ZbTee2R4ARMlKhfXBE
+kvXO2L37Ub2sX97S9qbKkwaYIs2PHn7NFNRB6OP8Oz0scMuritvUZrNfNjaGba3e
+YNgR36NFvroM3R2a+Yr0zjbY+rqjJSdNSfcsxLkCDQRWEtF5ARAA3KvEpeB7vbCx
+olIlzxuF/RHJ770GUYSfTVbYIKSl4HbywrDak7uXlDWIJ/u1lunu5+albUEHIadu
+YolrzaTG6A/sslXHgk8RUxZonzAw2/8C0fQCBAPjs2nlwzt61g75/EPJlESocapd
+Ri97EleGmGGK5L6N2CyTX8pjj1DkXwiWX95EOcgWRoLXpf/bpThqFCsRjoJfHO7z
+cA0b5iIR7LQenMG/3AeGFRr1Oh2UzAL60MuPypu8NBv3IUXZ6mXdFTNM4bQc/Rlm
+VDoB8B8mz4M1IL0fP98LN+b9ZfUUDz1zk9W8H+OCvfdOVj1srDq+uhaSwDC6jDu7
+wTaFlaJaPBoqCXCk7xGbVxKdZot6oN5ZrAvMMnD0Jc+QX+MKSodMk5LQRFB+WGI8
+2IwgeS7kqQX2Bt0w7d4xL/3AKTNgQQAGzXRi7dzXR//diKEmESSmaRccVpLZYtR4
+PdUuY6ZXyayEvZCosV6B7P+lV842lN9Q/KgrZjH09SYKK8pzqRPoAIvPJNT4fP8F
+eTztnKu9gfS0Zs2MnkKjEK85E8OMSidpISqn0xgHeuldMPL7gGxJKj95BF4jFUs4
+fQa8nD1jnnUbKdAsGd5ujpEAjAfV+kkGZPUyVrJokhGlCLLt2dG4PrgZ4tNXdEQw
+VGNskHYjs6YU+CGYjzfopvrUPast+cUAEQEAAYkCHwQYAQIACQUCVhLReQIbDAAK
+CRCw28p9ZPdwsrmqD/sFsulD6nl5DRznofkqBJwwl6zdtNN9OKsEi8UKc10iuq+Z
+vynWFbcARqW9sgbBCoCM5KuA5zMIQ0hvrvlb+HOt8v7DA2D0d/IPU1BPnxoEuMDq
+5g+a3MYzmP+4Wmp8r6NNAW0ArWhazQsNdIhAVv4ItUCos7+S7q8srsflpEVG78/f
+C4Fw4sRjAaCd1NsP6D3vHwENtbuoQaT63kyfPK+r6EADTxmeFe7anovQo6MirRCn
+Loo3NdPVfQlgXkdL3wiBpwm7W/PYY+9Z6HIfE2AIBs+C5SdxYPR+tVz3+3QC9998
+egxTRnJMaKkDQ+nG/ROSVpCqXwhzob6HlrKhoe7H7GKVZyl/IVllpUQHKi5C03S8
+JQxpaJoB85/C5ZlcMtb0e1YUYeVhTKWIREFsx5FlxXcJh5CLVplZKxfn0oiIgnyK
+HtCOeNcXP2mOYClN8RmhW+/Z198bTmzMrB2jq7a3xbLGWKJqfgfZ6EPwCEu/jZTB
+SQgyssrrGahyyOIDadEcyfYV+r5pUm1++1YxSe0/hZ89RjGAIneWmo6sDLwPd44G
+LKAAb/E/yS/320bu031426gU8Zdw7bK1dVNVQxWOpRc/RTRjmVjrO9NIN+7DSNOF
+nvep13/48UEDSFXkNnh+VgxGpvpOouw2xUBVNZuhjPr589pvAEQFUyxCTI0uwQ==
+=mXsc
+-----END PGP PUBLIC KEY BLOCK-----

debian/watch

@@ -1,2 +1,4 @@
 version=3
-http://dvdisaster.net/downloads/dvdisaster-(.*)\.tar\.bz2
+opts="pgpsigurlmangle=s/$/.gpg/" \
+https://web.archive.org/web/20180428070843/https://dvdisaster.net/en/index.html \
+     (?:.*?/)?dvdisaster-(.*)\.tar\.bz2 debian uupdate

documentation/codec-specs/Makefile

@@ -0,0 +1,16 @@
+.PHONY : all clean
+
+all: codecs.pdf
+
+clean:
+	@rm -f *~ *.aux *.log *.bak *.out *.toc *.dvi *.ps
+
+archclean: clean
+	@rm -f *.pdf
+
+# run latex twice to get the proper number of pages, fig numbers and index table
+codecs.pdf: *.tex *.fig *.eps
+	latex codecs
+	latex codecs
+	dvips codecs.dvi
+	ps2pdf codecs.ps

documentation/codec-specs/changelog.tex

@@ -0,0 +1,37 @@
+\section{Changelog}
+
+Clarifications of specifications (without actual changes of implementations) 
+are numbered with lowercase letters, e.g. {\em V1.00a}, {\em V1.00b} etc.
+
+\smallskip
+
+Changes which affect the implementation of codecs are indicated by increasing
+version numbers, e.g. {\em V1.00}, {\em V1.01}. Version numbering is independent
+for each codec.
+
+\subsection{RS03 codec}
+
+\begin{tabular}{lp{14cm}}
+V1.00 & {\em supported since dvdisaster version V0.79.4} \\
+      & Clarified: RS03 header does not contain copy of first CRC sector (appendix \ref{eh}). \\
+      & Added $sectorsPerLayer$ field in Ecc header and CRC block format.\\
+      & Added ecc file specification.\\
+\end{tabular}
+
+\subsection{RS02 codec}
+
+\begin{tabular}{lp{14cm}}
+V1.01 & {\em supported since dvdisaster version V0.79.5} \\
+      & Added the {\em sectorsAddedByEcc} field in the {\em EccHeader}. \\
+V1.00 & {\em supported since dvdisaster version V0.66} \\
+      & First draft of specification, open for review for missing parts and errors. \\
+\end{tabular}
+
+\subsection{RS01 codec}
+
+\begin{tabular}{lp{14cm}}
+V1.00 & {\em supported since dvdisaster version V0.66} \\
+      & First release of specification. \\
+\end{tabular}
+
+\newpage

documentation/codec-specs/codecs.tex

@@ -0,0 +1,118 @@
+\documentclass[12pt,a4paper,twoside]{article}
+\usepackage{times}	% Skalierbarer und lesbarer Zeichensatz
+\usepackage{ucs}	% Benötigt für Eingabe von unicode-Zeichensätzen
+\usepackage[utf8x]{inputenc} % Aktiviert Eingabe von unicode-Zeichensätzen
+\usepackage{epsfig}	% Makros zum Einfügen von Grafiken
+\usepackage{anysize}	% Makros zum Einstellen der Seitenränder
+%\usepackage{makeidx}	% Makros zum Erstellen des Indexes
+\usepackage{url}
+\usepackage{hyperref}
+\usepackage{fancyhdr}
+\usepackage{listings}
+\usepackage{color}
+\usepackage{comment}
+
+\marginsize{30mm}{20mm}{20mm}{20mm}  % Seitenränder links, rechts, oben, unten
+\parindent0em		% Keine amerikanische Einrückung am Anfang von Paragraphen
+\renewcommand{\floatpagefraction}{.99}
+
+\pagestyle{fancy}	% Seitenstil
+%\makeindex		% wird für Erstellung von Stichwortverzeichnissen benötigt
+
+% Ende der Voreinstellungen
+
+\newcommand{\paperversion}{{\em Version 1.01}}
+
+\fancyhead{}
+\fancyhead[LE,RO]{page \thepage\ of \pageref{LastPage}}
+\fancyhead[LO,RE]{\nouppercase{\rightmark}}
+\renewcommand{\sectionmark}[1]{\markboth{#1}{#1}}
+\renewcommand{\subsectionmark}[1]{}
+
+\renewcommand{\footrulewidth}{0.4pt}
+\fancyfoot{}
+\fancyfoot[LE,RO]{dvdisaster codec specification}
+\fancyfoot[LO]{created: \today}
+\fancyfoot[RE]{\paperversion}
+
+\begin{document}
+
+\definecolor{lightblue}{RGB}{224,224,255}
+\pagecolor{lightblue}
+\title{The dvdisaster Reed-Solomon Codec specification}
+\author{Carsten Gnörlich\\carsten@dvdisaster.org}
+\date{}
+\maketitle
+\thispagestyle{empty}
+
+\centerline{\includegraphics[width=32mm]{title.eps}}
+  
+\begin{center}
+\paperversion
+\end{center}
+
+\bigskip
+
+\begin{abstract}
+This is the {\em blue manual}, describing the data formats of the dvdisaster
+Reed-Solomon codecs which are currently called RS01, RS02 and RS03.
+The codecs create Reed-Solomon parity data to protect data stored on optical media.
+Depending on the codec, parity data can either be stored in a separate file 
+or be integrated with the .iso image on the same medium. 
+See \url{http://dvdisaster.org}  for additional resources on the dvdisaster project,
+e.g. for the {\em orange manual} (manual.pdf) containing information for end users.
+\end{abstract}
+
+\bigskip
+
+{\bf Target audience.} This paper is primarily intended as a working base for the
+dvdisaster developers and, when the final version has been crafted, as an implementation
+guide for third party developers who wish to create and process dvdisaster error correction data.
+It is {\bf neither intended nor suitable} as end-user documentation; for usage information
+please refer to the online documentation at \url{http://dvdisaster.org}.
+
+\bigskip
+
+{\bf Prerequisites.} This paper assumes profound knowledge of coding theory and the 
+underlying math. The reader is assumed to have a thorough understanding of Reed-Solomon
+codes, both in theory and from an implementation viewpoint. A basic understanding
+of programming in C is also assumed.
+
+\vfill
+\begin{center}
+{\em 
+Copyright 2008-2015 Carsten Gnörlich.
+Verbatim copying and distribution of this entire article is permitted in any medium, 
+provided this notice is preserved.}
+\end{center}
+
+\newpage
+\nopagecolor
+
+% Changelog
+
+\input{changelog}
+
+% Table of Contents
+
+\tableofcontents
+\newpage
+
+% Reed-Solomon encoding details
+
+\input{rs03}
+
+\input{rs02}
+
+\input{rs01}
+
+% Header formats
+
+\appendix
+
+\input{ecc-header}
+
+\input{crc-block}
+
+\input{rs-params}
+\end{document}

documentation/codec-specs/crc-block.tex

@@ -0,0 +1,113 @@
+
+\newpage
+\section{RS03 CRC block format}
+\label{crc-block}
+
+The crc layer contains 2048 byte blocks containing the data structure
+described below. Except for the CRC32 checksums most of the information
+contained in this data structure is copied from the Ecc Header described
+in appendix \ref{eh}. The crc block format is defined in the include 
+file {\em dvdisaster.h} and has the following C definition:
+
+\begin{tabbing}
+ xxx \= xxxxxxxxxxxxxxxxxxxxxxx \= xxx \kill
+typedef struct \_CrcBlock \\
+\{\>guint32 crc[256];           \>{\em /* Checksum for the data sectors */}\\
+\> gint8 cookie[12];            \>{\em /* "*dvdisaster*" */}\\
+\> gint8 method[4];             \>{\em /* e.g. "RS03" */}\\
+\> gint8 methodFlags[4];        \>{\em /* 0-2 for free use by the respective methods; 3 see above */}\\
+\> gint32 creatorVersion;       \>{\em /* which dvdisaster version created this */}\\
+\> gint32 neededVersion;        \>{\em /* oldest version which can decode this file */}\\
+\> gint32 fpSector;             \>{\em /* sector used to calculate mediumFP */}\\
+\> guint8 mediumFP[16];         \>{\em /* fingerprint of FINGERPRINT SECTOR */}\\ 
+\> guint8 mediumSum[16];        \>{\em /* complete md5sum of whole medium */}\\
+\> guint64 dataSectors;         \>{\em /* number of sectors of the payload (e.g. iso file sys) */}\\
+\> gint32 inLast;               \>{\em /* bytes contained in last sector */}\\
+\> gint32 dataBytes;            \>{\em /* data bytes per ecc block */}\\
+\> gint32 eccBytes;             \>{\em /* ecc bytes per ecc block */}\\
+\> guint64 sectorsPerLayer;     \>{\em /* for recalculation of layout */}\\
+\> guint32 selfCRC;             \>{\em /* CRC32 of ourself, zero padded to 2048 bytes */}\\
+\} CrcBlock;
+\end{tabbing}
+
+\bigskip
+
+The CrcBlock data structure is used in the CRC layer of RS03 augmented images
+only. RS02 has a similar CRC layer but uses a different concept for retrieving
+layout information from the image. The following table describes the meaning
+and usage of the CrcBlock fields:
+\medskip
+
+\begin{tabular}{|l|p{12cm}|}
+\hline
+Field & Usage \\
+\hline 
+crc & If this data structure is found in the {\em i-th} sector of the CRC layer,
+it contains the CRC32 checksum for data sectors $d_{j,1}, \ldots, d_{j,n}$, with
+$j = (i+1) \bmod\ layer\ size$. See figure \ref{layout-logical} for details.
+Please note that the crc[] array is filled starting from crc[0], and unused field
+are left zero. \\
+\hline
+$cookie$ & Magic byte sequence for recognizing the header.\newline
+Contains the string {\tt *dvdisaster*}. \\
+\hline
+$method$ & 4 characters describing the format; currently only ``RS03''
+may appear here.\\
+\hline
+\end{tabular}
+
+{\footnotesize (continued on next page)}
+\vfill
+\newpage
+
+\begin{tabular}{|l|p{12cm}|}
+\hline
+$methodFlags$ & 4 bytes for further specification of the format.\newline
+Byte 0 contains the following flags:\newline
+Bit 0 - The {\em mediumSum} field is valid.\newline
+Bit 1 - Set to 1 in ecc files.\newline
+Bytes 1-2 are unused in the current methods.\newline
+Byte 3 contains the following flags:\newline
+Bit 0 - ecc data was created by a development release.\newline
+Bit 1 - ecc data was created by a release candidate.\newline
+If these bits are present, the user will be hinted that he is using
+ecc data from a non-stable dvdisaster version. \\
+\hline
+$creatorVersion$ & The dvdisaster version used for creating this ecc data.
+A decimal value 102345 would mean dvdisaster version 10.23.45.\\
+\hline
+$neededVersion$ & The minimum dvdisaster version required for 
+processing this ecc data. Version encoding as above. \\
+\hline
+$fpSector$ & The sector used for calculating $mediumFP$. \\
+\hline
+$mediumFP$ & The md5sum of the sector specified by the {\em fpSector}.
+The sector should be chosen to have a huge probability being unique to the medium;
+currently sector 16 (the ISO filesystem root sector) is used. \\
+\hline
+$mediumSum$ & The md5sum of the original ISO image if the first bit 
+in the {\em methodFlags} field is set. Since md5sum generation can not be
+parallelized, the user may opt not to calculate this checksum if multi core
+encoding is used. \\
+\hline
+$dataSectors$ & For error correction files this is the number of sectors in the
+protected medium. If augmented images are used, this denotes the number of
+sectors in the original ISO image (without the added padding and RS03 sectors). \\
+\hline
+$inLast$ & The number of Bytes contained in the last image sector. This allows for
+encoding of files with arbitrary length, not just ISO images.\\
+\hline
+$dataBytes$ & The number of data layers, including the CRC layer. \\
+\hline
+$eccBytes$ & The number of ecc layers (= number of roots) for the parity. \newline
+$dataBytes + eccBytes = 255$. \\
+\hline
+$sectorsPerLayer$ & The number of sectors per layer. \\
+\hline
+$selfCRC$ & A CRC32 checksum of the ecc header itself. Not used fields are
+set to zero and the selfCRC field is initialized to the 
+value 0x4c5047 (little endian). \\
+\hline
+remaining bytes & The CrcBlock is zero padded to a size of 2048 bytes.\\
+\hline
+\end{tabular}

documentation/codec-specs/ecc-header.tex

@@ -0,0 +1,123 @@
+\appendix
+\newpage
+\section{The common Ecc header format}
+\label{eh}
+
+The ecc header is defined in the include file {\em dvdisaster.h}. 
+Its C definition is as follows:
+
+\begin{tabbing}
+ xxx \= xxxxxxxxxxxxxxxxxxxxxxx \= xxx \kill
+typedef struct \_EccHeader \\
+\{\>gint8 cookie[12];           \>{\em /* "*dvdisaster*" */}\\
+ \>gint8 method[4];            \>{\em /* e.g. "RS01" */}\\
+ \>gint8 methodFlags[4];       \>{\em /* 0-2 for free use by the respective methods; 3 see above */}\\
+ \>guint8 mediumFP[16];        \>{\em /* fingerprint of FINGERPRINT SECTOR */}\\ 
+ \>guint8 mediumSum[16];       \>{\em /* complete md5sum of whole medium */}\\
+ \>guint8 eccSum[16];          \>{\em /* md5sum of ecc code section of .ecc file */}\\
+ \>guint8 sectors[8];          \>{\em /* number of sectors medium is supposed to have w/o ecc*/}\\
+ \>gint32 dataBytes;           \>{\em /* data bytes per ecc block */}\\
+ \>gint32 eccBytes;            \>{\em /* ecc bytes per ecc block */}\\
+ \>gint32 creatorVersion;      \>{\em /* which dvdisaster version created this */}\\
+ \>gint32 neededVersion;       \>{\em /* oldest version which can decode this file */}\\
+ \>gint32 fpSector;            \>{\em /* sector used to calculate mediumFP */}\\
+ \>guint32 selfCRC;            \>{\em /* CRC32 of EccHeader (currently RS02 only) -- since V0.66 --*/}\\
+ \>guint8 crcSum[16];          \>{\em /* md5sum of crc code section of RS02 .iso file  */}\\
+ \>gint32 inLast;              \>{\em /* bytes contained in last sector */}\\
+ \>guint64 sectorsPerLayer;    \>{\em /* layer size for RS03 */}\\
+ \>guint64 sectorsAddedByEcc;  \>{\em /* sectors added by RS02 */}\\
+ \>gint8 padding[3960];        \>{\em /* pad to 4096 bytes: room for future expansion */}\\
+\} EccHeader;
+\end{tabbing}
+
+\bigskip
+
+The ecc header is used in all ecc formats (RS01, RS02, RS03) of dvdisaster,
+but not all fields apply to all formats. See the following table for the meaning
+and usage of the fields:
+\bigskip
+
+\begin{tabular}{|l|p{10cm}|c|}
+\hline
+Field & Usage & Format(s) \\
+\hline
+$cookie$ & Magic byte sequence for recognizing the header.\newline
+Contains the string {\tt *dvdisaster*}. & all \\
+\hline
+$method$ & 4 characters describing the format; currently allowed:\newline
+{\tt RS01}, {\tt RS02}, {\tt RS03}. & all \\ 
+\hline
+$methodFlags$ & 4 bytes for further specification of the format. &\\
+ \cline{2-3} 
+ & Byte 0 contains the following flag: &\\
+ & Bit 0 - The {\em mediumSum} field is valid. & RS03 \\
+ & Bit 1 - Set to 1 in ecc files. & RS03 \\
+ \cline{2-3} 
+ & Bytes 1-2 are unused in the current methods. & \\
+ \cline{2-3} 
+ & Byte 3 contains the following flags:\newline
+Bit 0 - ecc data was created by a development release.\newline
+Bit 1 - ecc data was created by a release candidate.\newline
+If these bits are present, the user will be hinted that he is using
+ecc data from a non-stable dvdisaster version. & all \\
+\hline
+\end{tabular}
+
+{\footnotesize (continued on next page)}
+\vfill
+\newpage
+
+\begin{tabular}{|l|p{10cm}|c|}
+\hline
+$mediumFP$ & The md5sum of the sector specified by the {\em fpSector}.
+The sector should be chosen to have a huge probability being unique to the medium;
+currently sector 16 (the ISO filesystem root sector) is used. & all \\
+\hline
+$mediumSum$ & The md5sum of the ISO image. For RS01 this is the md5sum of the
+whole image; for RS02 it is calculated for the original ISO image (without
+the added RS02 sectors). RS03 uses this value only when bit 1 in
+{\em methodFlags} is set. & all \\ 
+\hline
+$eccSum$ & On RS01 this is the md5sum of the ecc file excluding the first 4096
+bytes. For RS02 this is the md5sum calculated over the md5sums of the $nroots$
+ecc layers. RS03 does not use this value. & RS01, RS02 \\
+\hline
+$sectors$ & For error correction files this is the number of sectors in the
+protected medium. If augmented images are used, this denotes the number of
+sectors in the original ISO image (without the added RS02/RS03 sectors). & all \\
+\hline
+$dataBytes$ & The number of data layers, including the CRC layer. & all \\
+\hline
+$eccBytes$ & The number of ecc layers (= number of roots) for the parity.
+$dataBytes + eccBytes = 255$. & all\\
+\hline
+$creatorVersion$ & The dvdisaster version used for creating this ecc data.
+A decimal value 102345 would mean dvdisaster version 10.23.45. & all \\
+\hline
+$neededVersion$ & The minimum dvdisaster version required for 
+processing this ecc data. Version encoding as above. & all \\
+\hline
+$fpSector$ & The sector used for calculating $mediumFP$. & all \\
+\hline
+$selfCRC$ & A CRC32 checksum of the ecc header itself. Not used 
+header fields are set to zero and the selfCRC field is initialized to the 
+value 0x4c5047 (little endian). & \\
+\hline
+$crcSum$ & md5sum of the CRC layer in RS02 encoded images. & RS02 \\
+\hline
+$inLast$ & The number of Bytes contained in the last image sector. This allows for
+encoding of files with arbitrary length, not just ISO images. 
+dvdisaster versions prior to V0.66 do not use this field and always assume it
+to be 2048 which is the default for iso images. & all \\
+\hline
+$sectorsPerLayer$ & The number of sectors per layer. & RS03 \\
+\hline
+$sectorsAddedByEcc$ & The total number of sectors (Headers, CRC, ECC) added. & RS02 \\
+\hline
+$padding$ & The ecc header is zero padded to a length of 4096 bytes. Future codes
+may allocate additional space for the zero padding. See the note below for
+usage of the upper 2048 bytes on RS02/RS03. & all \\
+\hline
+Byte 2048-4096 & A copy of the first CRC layer sector. & RS02 \\
+\hline
+\end{tabular}

documentation/codec-specs/layer.eps

@@ -0,0 +1,373 @@
+%!PS-Adobe-2.0 EPSF-2.0
+%%Title: layer.fig
+%%Creator: fig2dev Version 3.2 Patchlevel 5
+%%CreationDate: Thu Oct 29 11:27:42 2009
+%%For: cg@wanderer (Carsten Gnoerlich)
+%%BoundingBox: 0 0 609 385
+%Magnification: 1.0000
+%%EndComments
+%%BeginProlog
+/$F2psDict 200 dict def
+$F2psDict begin
+$F2psDict /mtrx matrix put
+/col-1 {0 setgray} bind def
+/col0 {0.000 0.000 0.000 srgb} bind def
+/col1 {0.000 0.000 1.000 srgb} bind def
+/col2 {0.000 1.000 0.000 srgb} bind def
+/col3 {0.000 1.000 1.000 srgb} bind def
+/col4 {1.000 0.000 0.000 srgb} bind def
+/col5 {1.000 0.000 1.000 srgb} bind def
+/col6 {1.000 1.000 0.000 srgb} bind def
+/col7 {1.000 1.000 1.000 srgb} bind def
+/col8 {0.000 0.000 0.560 srgb} bind def
+/col9 {0.000 0.000 0.690 srgb} bind def
+/col10 {0.000 0.000 0.820 srgb} bind def
+/col11 {0.530 0.810 1.000 srgb} bind def
+/col12 {0.000 0.560 0.000 srgb} bind def
+/col13 {0.000 0.690 0.000 srgb} bind def
+/col14 {0.000 0.820 0.000 srgb} bind def
+/col15 {0.000 0.560 0.560 srgb} bind def
+/col16 {0.000 0.690 0.690 srgb} bind def
+/col17 {0.000 0.820 0.820 srgb} bind def
+/col18 {0.560 0.000 0.000 srgb} bind def
+/col19 {0.690 0.000 0.000 srgb} bind def
+/col20 {0.820 0.000 0.000 srgb} bind def
+/col21 {0.560 0.000 0.560 srgb} bind def
+/col22 {0.690 0.000 0.690 srgb} bind def
+/col23 {0.820 0.000 0.820 srgb} bind def
+/col24 {0.500 0.190 0.000 srgb} bind def
+/col25 {0.630 0.250 0.000 srgb} bind def
+/col26 {0.750 0.380 0.000 srgb} bind def
+/col27 {1.000 0.500 0.500 srgb} bind def
+/col28 {1.000 0.630 0.630 srgb} bind def
+/col29 {1.000 0.750 0.750 srgb} bind def
+/col30 {1.000 0.880 0.880 srgb} bind def
+/col31 {1.000 0.840 0.000 srgb} bind def
+
+end
+
+/cp {closepath} bind def
+/ef {eofill} bind def
+/gr {grestore} bind def
+/gs {gsave} bind def
+/sa {save} bind def
+/rs {restore} bind def
+/l {lineto} bind def
+/m {moveto} bind def
+/rm {rmoveto} bind def
+/n {newpath} bind def
+/s {stroke} bind def
+/sh {show} bind def
+/slc {setlinecap} bind def
+/slj {setlinejoin} bind def
+/slw {setlinewidth} bind def
+/srgb {setrgbcolor} bind def
+/rot {rotate} bind def
+/sc {scale} bind def
+/sd {setdash} bind def
+/ff {findfont} bind def
+/sf {setfont} bind def
+/scf {scalefont} bind def
+/sw {stringwidth} bind def
+/tr {translate} bind def
+/tnt {dup dup currentrgbcolor
+  4 -2 roll dup 1 exch sub 3 -1 roll mul add
+  4 -2 roll dup 1 exch sub 3 -1 roll mul add
+  4 -2 roll dup 1 exch sub 3 -1 roll mul add srgb}
+  bind def
+/shd {dup dup currentrgbcolor 4 -2 roll mul 4 -2 roll mul
+  4 -2 roll mul srgb} bind def
+/reencdict 12 dict def /ReEncode { reencdict begin
+/newcodesandnames exch def /newfontname exch def /basefontname exch def
+/basefontdict basefontname findfont def /newfont basefontdict maxlength dict def
+basefontdict { exch dup /FID ne { dup /Encoding eq
+{ exch dup length array copy newfont 3 1 roll put }
+{ exch newfont 3 1 roll put } ifelse } { pop pop } ifelse } forall
+newfont /FontName newfontname put newcodesandnames aload pop
+128 1 255 { newfont /Encoding get exch /.notdef put } for
+newcodesandnames length 2 idiv { newfont /Encoding get 3 1 roll put } repeat
+newfontname newfont definefont pop end } def
+/isovec [
+8#055 /minus 8#200 /grave 8#201 /acute 8#202 /circumflex 8#203 /tilde
+8#204 /macron 8#205 /breve 8#206 /dotaccent 8#207 /dieresis
+8#210 /ring 8#211 /cedilla 8#212 /hungarumlaut 8#213 /ogonek 8#214 /caron
+8#220 /dotlessi 8#230 /oe 8#231 /OE
+8#240 /space 8#241 /exclamdown 8#242 /cent 8#243 /sterling
+8#244 /currency 8#245 /yen 8#246 /brokenbar 8#247 /section 8#250 /dieresis
+8#251 /copyright 8#252 /ordfeminine 8#253 /guillemotleft 8#254 /logicalnot
+8#255 /hyphen 8#256 /registered 8#257 /macron 8#260 /degree 8#261 /plusminus
+8#262 /twosuperior 8#263 /threesuperior 8#264 /acute 8#265 /mu 8#266 /paragraph
+8#267 /periodcentered 8#270 /cedilla 8#271 /onesuperior 8#272 /ordmasculine
+8#273 /guillemotright 8#274 /onequarter 8#275 /onehalf
+8#276 /threequarters 8#277 /questiondown 8#300 /Agrave 8#301 /Aacute
+8#302 /Acircumflex 8#303 /Atilde 8#304 /Adieresis 8#305 /Aring
+8#306 /AE 8#307 /Ccedilla 8#310 /Egrave 8#311 /Eacute
+8#312 /Ecircumflex 8#313 /Edieresis 8#314 /Igrave 8#315 /Iacute
+8#316 /Icircumflex 8#317 /Idieresis 8#320 /Eth 8#321 /Ntilde 8#322 /Ograve
+8#323 /Oacute 8#324 /Ocircumflex 8#325 /Otilde 8#326 /Odieresis 8#327 /multiply
+8#330 /Oslash 8#331 /Ugrave 8#332 /Uacute 8#333 /Ucircumflex
+8#334 /Udieresis 8#335 /Yacute 8#336 /Thorn 8#337 /germandbls 8#340 /agrave
+8#341 /aacute 8#342 /acircumflex 8#343 /atilde 8#344 /adieresis 8#345 /aring
+8#346 /ae 8#347 /ccedilla 8#350 /egrave 8#351 /eacute
+8#352 /ecircumflex 8#353 /edieresis 8#354 /igrave 8#355 /iacute
+8#356 /icircumflex 8#357 /idieresis 8#360 /eth 8#361 /ntilde 8#362 /ograve
+8#363 /oacute 8#364 /ocircumflex 8#365 /otilde 8#366 /odieresis 8#367 /divide
+8#370 /oslash 8#371 /ugrave 8#372 /uacute 8#373 /ucircumflex
+8#374 /udieresis 8#375 /yacute 8#376 /thorn 8#377 /ydieresis] def
+/Helvetica-Bold /Helvetica-Bold-iso isovec ReEncode
+/$F2psBegin {$F2psDict begin /$F2psEnteredState save def} def
+/$F2psEnd {$F2psEnteredState restore end} def
+
+/pageheader {
+save
+newpath 0 385 moveto 0 0 lineto 609 0 lineto 609 385 lineto closepath clip newpath
+-87.1 383.6 translate
+1 -1 scale
+$F2psBegin
+10 setmiterlimit
+0 slj 0 slc
+ 0.06299 0.06299 sc
+} bind def
+/pagefooter {
+$F2psEnd
+restore
+} bind def
+%%EndProlog
+pageheader
+%
+% Fig objects follow
+%
+% 
+% here starts figure with depth 51
+% Polyline
+0 slj
+0 slc
+7.500 slw
+n 8295 0 m 8190 0 8190 5610 105 arcto 4 {pop} repeat
+  8190 5715 9030 5715 105 arcto 4 {pop} repeat
+  9135 5715 9135 105 105 arcto 4 {pop} repeat
+  9135 0 8295 0 105 arcto 4 {pop} repeat
+ cp gs col7 0.80 shd ef gr gs col7 s gr 
+% Polyline
+n 1395 3375 m 11025 3375 l 11025 4050 l 1395 4050 l
+ cp gs col0 s gr 
+% Polyline
+n 1395 2475 m 11025 2475 l 11025 3150 l 1395 3150 l
+ cp gs col0 s gr 
+% Polyline
+n 9045 225 m
+ 9045 900 l gs col0 s gr 
+% Polyline
+n 9045 4725 m
+ 9045 5400 l gs col0 s gr 
+% Polyline
+n 9045 3375 m
+ 9045 4050 l gs col0 s gr 
+% Polyline
+n 9045 2475 m
+ 9045 3150 l gs col0 s gr 
+% Polyline
+n 9045 1575 m
+ 9045 2250 l gs col0 s gr 
+% Polyline
+n 1395 225 m 11025 225 l 11025 900 l 1395 900 l
+ cp gs col0 s gr 
+% Polyline
+n 9765 225 m
+ 9765 900 l gs col0 s gr 
+% Polyline
+n 9765 4725 m
+ 9765 5400 l gs col0 s gr 
+% Polyline
+n 9765 3375 m
+ 9765 4050 l gs col0 s gr 
+% Polyline
+n 9765 2475 m
+ 9765 3150 l gs col0 s gr 
+% Polyline
+n 8280 225 m
+ 8280 900 l gs col0 s gr 
+% Polyline
+n 8280 4725 m
+ 8280 5400 l gs col0 s gr 
+% Polyline
+n 8280 3375 m
+ 8280 4050 l gs col0 s gr 
+% Polyline
+n 8280 2475 m
+ 8280 3150 l gs col0 s gr 
+% Polyline
+n 8280 1575 m
+ 8280 2250 l gs col0 s gr 
+% Polyline
+n 1395 4725 m 11025 4725 l 11025 5400 l 1395 5400 l
+ cp gs col0 s gr 
+% Polyline
+n 7515 225 m
+ 7515 900 l gs col0 s gr 
+% Polyline
+n 7515 4725 m
+ 7515 5400 l gs col0 s gr 
+% Polyline
+n 7515 3375 m
+ 7515 4050 l gs col0 s gr 
+% Polyline
+n 7515 2475 m
+ 7515 3150 l gs col0 s gr 
+% Polyline
+n 7515 1575 m
+ 7515 2250 l gs col0 s gr 
+% Polyline
+n 1395 1575 m 9045 1575 l 9045 2250 l 1395 2250 l
+ cp gs col0 s gr 
+% Polyline
+ [15 45] 45 sd
+n 9090 1575 m 11025 1575 l 11025 2250 l 9090 2250 l
+ cp gs col0 s gr  [] 0 sd
+% Polyline
+ [15 45] 45 sd
+n 9765 1575 m
+ 9765 2250 l gs col0 s gr  [] 0 sd
+/Helvetica-Bold-iso ff 317.50 scf sf
+1575 675 m
+gs 1 -1 sc (Data 1) col0 sh gr
+/Helvetica-Bold-iso ff 285.75 scf sf
+8460 675 m
+gs 1 -1 sc (d) col0 sh gr
+/Helvetica-Bold-iso ff 190.50 scf sf
+8640 765 m
+gs 1 -1 sc (i, 1) col0 sh gr
+/Helvetica-Bold-iso ff 317.50 scf sf
+1845 1350 m
+gs 1 -1 sc (...) col0 sh gr
+/Helvetica-Bold-iso ff 317.50 scf sf
+1575 5175 m
+gs 1 -1 sc (ECC m) col0 sh gr
+/Helvetica-Bold-iso ff 285.75 scf sf
+8460 5175 m
+gs 1 -1 sc (e) col0 sh gr
+/Helvetica-Bold-iso ff 190.50 scf sf
+8640 5265 m
+gs 1 -1 sc (i, m) col0 sh gr
+/Helvetica-Bold-iso ff 317.50 scf sf
+1575 3825 m
+gs 1 -1 sc (ECC 1) col0 sh gr
+/Helvetica-Bold-iso ff 285.75 scf sf
+8460 3825 m
+gs 1 -1 sc (e) col0 sh gr
+/Helvetica-Bold-iso ff 190.50 scf sf
+8640 3915 m
+gs 1 -1 sc (i, 1) col0 sh gr
+/Helvetica-Bold-iso ff 317.50 scf sf
+1575 2925 m
+gs 1 -1 sc (CRC) col0 sh gr
+/Helvetica-Bold-iso ff 285.75 scf sf
+8460 2925 m
+gs 1 -1 sc (c) col0 sh gr
+/Helvetica-Bold-iso ff 190.50 scf sf
+8640 3015 m
+gs 1 -1 sc (i) col0 sh gr
+/Helvetica-Bold-iso ff 317.50 scf sf
+1575 2025 m
+gs 1 -1 sc (Data n) col0 sh gr
+/Helvetica-Bold-iso ff 285.75 scf sf
+8460 2025 m
+gs 1 -1 sc (d) col0 sh gr
+/Helvetica-Bold-iso ff 190.50 scf sf
+8640 2115 m
+gs 1 -1 sc (i, n) col0 sh gr
+/Helvetica-Bold-iso ff 317.50 scf sf
+1845 4500 m
+gs 1 -1 sc (...) col0 sh gr
+/Helvetica-Bold-iso ff 285.75 scf sf
+9090 675 m
+gs 1 -1 sc (d) col0 sh gr
+/Helvetica-Bold-iso ff 285.75 scf sf
+9090 5175 m
+gs 1 -1 sc (e) col0 sh gr
+/Helvetica-Bold-iso ff 285.75 scf sf
+9090 3825 m
+gs 1 -1 sc (e) col0 sh gr
+/Helvetica-Bold-iso ff 285.75 scf sf
+9090 2925 m
+gs 1 -1 sc (c) col0 sh gr
+/Helvetica-Bold-iso ff 190.50 scf sf
+9270 765 m
+gs 1 -1 sc (i+1, 1) col0 sh gr
+/Helvetica-Bold-iso ff 190.50 scf sf
+9270 5265 m
+gs 1 -1 sc (i+1, m) col0 sh gr
+/Helvetica-Bold-iso ff 190.50 scf sf
+9270 3915 m
+gs 1 -1 sc (i+1, 1) col0 sh gr
+/Helvetica-Bold-iso ff 190.50 scf sf
+9270 3015 m
+gs 1 -1 sc (i+1) col0 sh gr
+/Helvetica-Bold-iso ff 285.75 scf sf
+9945 675 m
+gs 1 -1 sc (...) col0 sh gr
+/Helvetica-Bold-iso ff 285.75 scf sf
+9945 5175 m
+gs 1 -1 sc (...) col0 sh gr
+/Helvetica-Bold-iso ff 285.75 scf sf
+9945 3825 m
+gs 1 -1 sc (...) col0 sh gr
+/Helvetica-Bold-iso ff 285.75 scf sf
+9945 2925 m
+gs 1 -1 sc (...) col0 sh gr
+/Helvetica-Bold-iso ff 285.75 scf sf
+7560 675 m
+gs 1 -1 sc (d) col0 sh gr
+/Helvetica-Bold-iso ff 285.75 scf sf
+7155 675 m
+gs 1 -1 sc (...) col0 sh gr
+/Helvetica-Bold-iso ff 285.75 scf sf
+7560 5175 m
+gs 1 -1 sc (e) col0 sh gr
+/Helvetica-Bold-iso ff 285.75 scf sf
+7155 5175 m
+gs 1 -1 sc (...) col0 sh gr
+/Helvetica-Bold-iso ff 285.75 scf sf
+7560 3825 m
+gs 1 -1 sc (e) col0 sh gr
+/Helvetica-Bold-iso ff 285.75 scf sf
+7155 3825 m
+gs 1 -1 sc (...) col0 sh gr
+/Helvetica-Bold-iso ff 285.75 scf sf
+7560 2925 m
+gs 1 -1 sc (c) col0 sh gr
+/Helvetica-Bold-iso ff 190.50 scf sf
+7740 3015 m
+gs 1 -1 sc (i-1) col0 sh gr
+/Helvetica-Bold-iso ff 285.75 scf sf
+7155 2925 m
+gs 1 -1 sc (...) col0 sh gr
+/Helvetica-Bold-iso ff 285.75 scf sf
+7560 2025 m
+gs 1 -1 sc (d) col0 sh gr
+/Helvetica-Bold-iso ff 285.75 scf sf
+7155 2025 m
+gs 1 -1 sc (...) col0 sh gr
+/Helvetica-Bold-iso ff 190.50 scf sf
+7785 5265 m
+gs 1 -1 sc (i-1, m) col0 sh gr
+/Helvetica-Bold-iso ff 190.50 scf sf
+7785 3915 m
+gs 1 -1 sc (i-1, 1) col0 sh gr
+/Helvetica-Bold-iso ff 190.50 scf sf
+7785 2115 m
+gs 1 -1 sc (i-1, n) col0 sh gr
+/Helvetica-Bold-iso ff 190.50 scf sf
+7785 765 m
+gs 1 -1 sc (i-1, 1) col0 sh gr
+/Helvetica-Bold-iso ff 317.50 scf sf
+7785 6075 m
+gs 1 -1 sc (ECC block i) col0 sh gr
+/Helvetica-Bold-iso ff 285.75 scf sf
+9495 1980 m
+gs 1 -1 sc (padding) col0 sh gr
+% here ends figure;
+pagefooter
+showpage
+%%Trailer
+%EOF

documentation/codec-specs/layer.fig

@@ -0,0 +1,109 @@
+#FIG 3.2  Produced by xfig version 3.2.5
+Landscape
+Center
+Metric
+A4      
+100.00
+Single
+-2
+1200 2
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 1395 3375 11025 3375 11025 4050 1395 4050 1395 3375
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 1395 2475 11025 2475 11025 3150 1395 3150 1395 2475
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 9045 225 9045 900
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 9045 4725 9045 5400
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 9045 3375 9045 4050
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 9045 2475 9045 3150
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 9045 1575 9045 2250
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 1395 225 11025 225 11025 900 1395 900 1395 225
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 9765 225 9765 900
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 9765 4725 9765 5400
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 9765 3375 9765 4050
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 9765 2475 9765 3150
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 8280 225 8280 900
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 8280 4725 8280 5400
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 8280 3375 8280 4050
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 8280 2475 8280 3150
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 8280 1575 8280 2250
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 1395 4725 11025 4725 11025 5400 1395 5400 1395 4725
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 7515 225 7515 900
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 7515 4725 7515 5400
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 7515 3375 7515 4050
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 7515 2475 7515 3150
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 7515 1575 7515 2250
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 1395 1575 9045 1575 9045 2250 1395 2250 1395 1575
+2 2 2 1 0 7 50 -1 -1 3.000 0 0 -1 0 0 5
+	 9090 1575 11025 1575 11025 2250 9090 2250 9090 1575
+2 4 0 1 7 7 51 -1 16 0.000 0 0 7 0 0 5
+	 9135 5715 8190 5715 8190 0 9135 0 9135 5715
+2 1 2 1 0 7 50 -1 -1 3.000 0 0 -1 0 0 2
+	 9765 1575 9765 2250
+4 0 0 50 -1 18 20 0.0000 4 240 975 1575 675 Data 1\001
+4 0 0 50 -1 18 18 0.0000 4 210 180 8460 675 d\001
+4 0 0 50 -1 18 12 0.0000 4 180 285 8640 765 i, 1\001
+4 0 0 50 -1 18 20 0.0000 4 45 270 1845 1350 ...\001
+4 0 0 50 -1 18 20 0.0000 4 240 1095 1575 5175 ECC m\001
+4 0 0 50 -1 18 18 0.0000 4 150 165 8460 5175 e\001
+4 0 0 50 -1 18 12 0.0000 4 180 360 8640 5265 i, m\001
+4 0 0 50 -1 18 20 0.0000 4 240 975 1575 3825 ECC 1\001
+4 0 0 50 -1 18 18 0.0000 4 150 165 8460 3825 e\001
+4 0 0 50 -1 18 12 0.0000 4 180 285 8640 3915 i, 1\001
+4 0 0 50 -1 18 20 0.0000 4 240 720 1575 2925 CRC\001
+4 0 0 50 -1 18 18 0.0000 4 150 165 8460 2925 c\001
+4 0 0 50 -1 18 12 0.0000 4 150 60 8640 3015 i\001
+4 0 0 50 -1 18 20 0.0000 4 240 1005 1575 2025 Data n\001
+4 0 0 50 -1 18 18 0.0000 4 210 180 8460 2025 d\001
+4 0 0 50 -1 18 12 0.0000 4 180 300 8640 2115 i, n\001
+4 0 0 50 -1 18 20 0.0000 4 45 270 1845 4500 ...\001
+4 0 0 50 -1 18 18 0.0000 4 210 180 9090 675 d\001
+4 0 0 50 -1 18 18 0.0000 4 150 165 9090 5175 e\001
+4 0 0 50 -1 18 18 0.0000 4 150 165 9090 3825 e\001
+4 0 0 50 -1 18 18 0.0000 4 150 165 9090 2925 c\001
+4 0 0 50 -1 18 12 0.0000 4 180 510 9270 765 i+1, 1\001
+4 0 0 50 -1 18 12 0.0000 4 180 585 9270 5265 i+1, m\001
+4 0 0 50 -1 18 12 0.0000 4 180 510 9270 3915 i+1, 1\001
+4 0 0 50 -1 18 12 0.0000 4 150 285 9270 3015 i+1\001
+4 0 0 50 -1 18 18 0.0000 4 45 225 9945 675 ...\001
+4 0 0 50 -1 18 18 0.0000 4 45 225 9945 5175 ...\001
+4 0 0 50 -1 18 18 0.0000 4 45 225 9945 3825 ...\001
+4 0 0 50 -1 18 18 0.0000 4 45 225 9945 2925 ...\001
+4 0 0 50 -1 18 18 0.0000 4 210 180 7560 675 d\001
+4 0 0 50 -1 18 18 0.0000 4 45 225 7155 675 ...\001
+4 0 0 50 -1 18 18 0.0000 4 150 165 7560 5175 e\001
+4 0 0 50 -1 18 18 0.0000 4 45 225 7155 5175 ...\001
+4 0 0 50 -1 18 18 0.0000 4 150 165 7560 3825 e\001
+4 0 0 50 -1 18 18 0.0000 4 45 225 7155 3825 ...\001
+4 0 0 50 -1 18 18 0.0000 4 150 165 7560 2925 c\001
+4 0 0 50 -1 18 12 0.0000 4 150 225 7740 3015 i-1\001
+4 0 0 50 -1 18 18 0.0000 4 45 225 7155 2925 ...\001
+4 0 0 50 -1 18 18 0.0000 4 210 180 7560 2025 d\001
+4 0 0 50 -1 18 18 0.0000 4 45 225 7155 2025 ...\001
+4 0 0 50 -1 18 12 0.0000 4 180 525 7785 5265 i-1, m\001
+4 0 0 50 -1 18 12 0.0000 4 180 450 7785 3915 i-1, 1\001
+4 0 0 50 -1 18 12 0.0000 4 180 465 7785 2115 i-1, n\001
+4 0 0 50 -1 18 12 0.0000 4 180 450 7785 765 i-1, 1\001
+4 0 0 50 -1 18 20 0.0000 4 240 1845 7785 6075 ECC block i\001
+4 0 0 50 -1 18 18 0.0000 4 270 1125 9495 1980 padding\001

documentation/codec-specs/rs-params.tex

@@ -0,0 +1,126 @@
+\newpage
+\section{RS(255,k) encoding parameters and examples}
+\label{rs}
+
+dvdisaster uses a standard, non-shortened Reed-Solomon code
+with the following commonly used parameters: \smallskip
+
+The Galois field tables are generated by the field
+generator polynomial 0x187 ($1 + X + X^2 + X^7 + X^8$).
+The Reed-Solomon code generator polynomial is created using element 
+0x70 as first consecutive root and the primitive element 0x0b. \medskip
+
+As a starting point for testing your own implementation, some 
+values and tables are shown below. The logarithm
+and anti-logarithm tables in the Galois field are shown in tables
+\ref{log-table} and \ref{anti-log-table}. Please note that there is no need for hard-coding
+these tables as their contents can be enumerated by using
+the field generator polynomial. \medskip
+
+When encoding for 32 roots, the RS code generator polynomial will be:
+
+{\small 01 5b 7f 56 10 1e 0d eb 61 a5 08 2a 36 56 ab 20 71 20 ab 56 36 2a 08 a5 61 eb 0d 1e 10 56 7f 5b 01}
+
+or in index form:
+
+{\small 00 f9 3b 42 04 2b 7e fb 61 1e 03 d5 32 42 aa 05 18 05 aa 42 32 d5 03 1e 61 fb 7e 2b 04 42 3b f9 00} \medskip
+
+Using the above generator polynomial for encoding the data byte
+sequence $\{0,1,\ldots,222\}$ produces the following parity bytes:
+
+{\small 2f bd 4f b4 74 84 94 b9 ac d5 54 62 72 12 ee b3 eb ed 41 19 1d e1 d3 63 20 ea 49 29 0b 25 ab cf}
+
+\newpage
+
+\begin{table}
+\begin{center}
+\begin{tabular}{|l||c|c|c|c|c|c|c|c|c|c|c|c|c|c|c|c|}
+\hline
+&  00 & 01 & 02 & 03 & 04 & 05 & 06 & 07 & 08 & 09 & 0a & 0b & 0c & 0d & 0e & 0f \\
+\hline
+\hline
+00 &  ff & 00 & 01 & 63 & 02 & c6 & 64 & 6a & 03 & cd & c7 & bc & 65 & 7e & 6b & 2a \\
+\hline
+10 &  04 & 8d & ce & 4e & c8 & d4 & bd & e1 & 66 & dd & 7f & 31 & 6c & 20 & 2b & f3 \\
+\hline
+20 &  05 & 57 & 8e & e8 & cf & ac & 4f & 83 & c9 & d9 & d5 & 41 & be & 94 & e2 & b4 \\
+\hline
+30 &  67 & 27 & de & f0 & 80 & b1 & 32 & 35 & 6d & 45 & 21 & 12 & 2c & 0d & f4 & 38 \\
+\hline
+40 &  06 & 9b & 58 & 1a & 8f & 79 & e9 & 70 & d0 & c2 & ad & a8 & 50 & 75 & 84 & 48 \\
+\hline
+50 &  ca & fc & da & 8a & d6 & 54 & 42 & 24 & bf & 98 & 95 & f9 & e3 & 5e & b5 & 15 \\
+\hline
+60 &  68 & 61 & 28 & ba & df & 4c & f1 & 2f & 81 & e6 & b2 & 3f & 33 & ee & 36 & 10 \\
+\hline
+70 &  6e & 18 & 46 & a6 & 22 & 88 & 13 & f7 & 2d & b8 & 0e & 3d & f5 & a4 & 39 & 3b \\
+\hline
+80 &  07 & 9e & 9c & 9d & 59 & 9f & 1b & 08 & 90 & 09 & 7a & 1c & ea & a0 & 71 & 5a \\
+\hline
+90 &  d1 & 1d & c3 & 7b & ae & 0a & a9 & 91 & 51 & 5b & 76 & 72 & 85 & a1 & 49 & eb \\
+\hline
+a0 &  cb & 7c & fd & c4 & db & 1e & 8b & d2 & d7 & 92 & 55 & aa & 43 & 0b & 25 & af \\
+\hline
+b0 &  c0 & 73 & 99 & 77 & 96 & 5c & fa & 52 & e4 & ec & 5f & 4a & b6 & a2 & 16 & 86 \\
+\hline
+c0 &  69 & c5 & 62 & fe & 29 & 7d & bb & cc & e0 & d3 & 4d & 8c & f2 & 1f & 30 & dc \\
+\hline
+d0 &  82 & ab & e7 & 56 & b3 & 93 & 40 & d8 & 34 & b0 & ef & 26 & 37 & 0c & 11 & 44 \\
+\hline
+e0 &  6f & 78 & 19 & 9a & 47 & 74 & a7 & c1 & 23 & 53 & 89 & fb & 14 & 5d & f8 & 97 \\
+\hline
+f0 &  2e & 4b & b9 & 60 & 0f & ed & 3e & e5 & f6 & 87 & a5 & 17 & 3a & a3 & 3c & b7 \\
+\hline
+\end{tabular}
+\end{center}
+\caption{Galois field logarithm table}
+\label{log-table}
+\end{table}
+
+\bigskip
+
+\begin{table}
+\begin{center}
+\begin{tabular}{|l||c|c|c|c|c|c|c|c|c|c|c|c|c|c|c|c|}
+\hline
+&  00 & 01 & 02 & 03 & 04 & 05 & 06 & 07 & 08 & 09 & 0a & 0b & 0c & 0d & 0e & 0f \\
+\hline
+\hline
+00 &  01 & 02 & 04 & 08 & 10 & 20 & 40 & 80 & 87 & 89 & 95 & ad & dd & 3d & 7a & f4 \\
+\hline
+10 &  6f & de & 3b & 76 & ec & 5f & be & fb & 71 & e2 & 43 & 86 & 8b & 91 & a5 & cd \\
+\hline
+20 &  1d & 3a & 74 & e8 & 57 & ae & db & 31 & 62 & c4 & 0f & 1e & 3c & 78 & f0 & 67 \\
+\hline
+30 &  ce & 1b & 36 & 6c & d8 & 37 & 6e & dc & 3f & 7e & fc & 7f & fe & 7b & f6 & 6b \\
+\hline
+40 &  d6 & 2b & 56 & ac & df & 39 & 72 & e4 & 4f & 9e & bb & f1 & 65 & ca & 13 & 26 \\
+\hline
+50 &  4c & 98 & b7 & e9 & 55 & aa & d3 & 21 & 42 & 84 & 8f & 99 & b5 & ed & 5d & ba \\
+\hline
+60 &  f3 & 61 & c2 & 03 & 06 & 0c & 18 & 30 & 60 & c0 & 07 & 0e & 1c & 38 & 70 & e0 \\
+\hline
+70 &  47 & 8e & 9b & b1 & e5 & 4d & 9a & b3 & e1 & 45 & 8a & 93 & a1 & c5 & 0d & 1a \\
+\hline
+80 &  34 & 68 & d0 & 27 & 4e & 9c & bf & f9 & 75 & ea & 53 & a6 & cb & 11 & 22 & 44 \\
+\hline
+90 &  88 & 97 & a9 & d5 & 2d & 5a & b4 & ef & 59 & b2 & e3 & 41 & 82 & 83 & 81 & 85 \\
+\hline
+a0 &  8d & 9d & bd & fd & 7d & fa & 73 & e6 & 4b & 96 & ab & d1 & 25 & 4a & 94 & af \\
+\hline
+b0 &  d9 & 35 & 6a & d4 & 2f & 5e & bc & ff & 79 & f2 & 63 & c6 & 0b & 16 & 2c & 58 \\
+\hline
+c0 &  b0 & e7 & 49 & 92 & a3 & c1 & 05 & 0a & 14 & 28 & 50 & a0 & c7 & 09 & 12 & 24 \\
+\hline
+d0 &  48 & 90 & a7 & c9 & 15 & 2a & 54 & a8 & d7 & 29 & 52 & a4 & cf & 19 & 32 & 64 \\
+\hline
+e0 &  c8 & 17 & 2e & 5c & b8 & f7 & 69 & d2 & 23 & 46 & 8c & 9f & b9 & f5 & 6d & da \\
+\hline
+f0 &  33 & 66 & cc & 1f & 3e & 7c & f8 & 77 & ee & 5b & b6 & eb & 51 & a2 & c3 & 00 \\
+\hline
+\end{tabular}
+\end{center}
+\caption{Galois field anti-logarithm table}
+\label{anti-log-table}
+\label{LastPage}
+\end{table}

documentation/codec-specs/rs01-layout.eps

@@ -0,0 +1,353 @@
+%!PS-Adobe-2.0 EPSF-2.0
+%%Title: rs01-layout.fig
+%%Creator: fig2dev Version 3.2 Patchlevel 5c
+%%CreationDate: Sat May 12 18:48:22 2012
+%%BoundingBox: 0 0 714 413
+%Magnification: 1.0000
+%%EndComments
+%%BeginProlog
+/$F2psDict 200 dict def
+$F2psDict begin
+$F2psDict /mtrx matrix put
+/col-1 {0 setgray} bind def
+/col0 {0.000 0.000 0.000 srgb} bind def
+/col1 {0.000 0.000 1.000 srgb} bind def
+/col2 {0.000 1.000 0.000 srgb} bind def
+/col3 {0.000 1.000 1.000 srgb} bind def
+/col4 {1.000 0.000 0.000 srgb} bind def
+/col5 {1.000 0.000 1.000 srgb} bind def
+/col6 {1.000 1.000 0.000 srgb} bind def
+/col7 {1.000 1.000 1.000 srgb} bind def
+/col8 {0.000 0.000 0.560 srgb} bind def
+/col9 {0.000 0.000 0.690 srgb} bind def
+/col10 {0.000 0.000 0.820 srgb} bind def
+/col11 {0.530 0.810 1.000 srgb} bind def
+/col12 {0.000 0.560 0.000 srgb} bind def
+/col13 {0.000 0.690 0.000 srgb} bind def
+/col14 {0.000 0.820 0.000 srgb} bind def
+/col15 {0.000 0.560 0.560 srgb} bind def
+/col16 {0.000 0.690 0.690 srgb} bind def
+/col17 {0.000 0.820 0.820 srgb} bind def
+/col18 {0.560 0.000 0.000 srgb} bind def
+/col19 {0.690 0.000 0.000 srgb} bind def
+/col20 {0.820 0.000 0.000 srgb} bind def
+/col21 {0.560 0.000 0.560 srgb} bind def
+/col22 {0.690 0.000 0.690 srgb} bind def
+/col23 {0.820 0.000 0.820 srgb} bind def
+/col24 {0.500 0.190 0.000 srgb} bind def
+/col25 {0.630 0.250 0.000 srgb} bind def
+/col26 {0.750 0.380 0.000 srgb} bind def
+/col27 {1.000 0.500 0.500 srgb} bind def
+/col28 {1.000 0.630 0.630 srgb} bind def
+/col29 {1.000 0.750 0.750 srgb} bind def
+/col30 {1.000 0.880 0.880 srgb} bind def
+/col31 {1.000 0.840 0.000 srgb} bind def
+
+end
+
+/cp {closepath} bind def
+/ef {eofill} bind def
+/gr {grestore} bind def
+/gs {gsave} bind def
+/sa {save} bind def
+/rs {restore} bind def
+/l {lineto} bind def
+/m {moveto} bind def
+/rm {rmoveto} bind def
+/n {newpath} bind def
+/s {stroke} bind def
+/sh {show} bind def
+/slc {setlinecap} bind def
+/slj {setlinejoin} bind def
+/slw {setlinewidth} bind def
+/srgb {setrgbcolor} bind def
+/rot {rotate} bind def
+/sc {scale} bind def
+/sd {setdash} bind def
+/ff {findfont} bind def
+/sf {setfont} bind def
+/scf {scalefont} bind def
+/sw {stringwidth} bind def
+/tr {translate} bind def
+/tnt {dup dup currentrgbcolor
+  4 -2 roll dup 1 exch sub 3 -1 roll mul add
+  4 -2 roll dup 1 exch sub 3 -1 roll mul add
+  4 -2 roll dup 1 exch sub 3 -1 roll mul add srgb}
+  bind def
+/shd {dup dup currentrgbcolor 4 -2 roll mul 4 -2 roll mul
+  4 -2 roll mul srgb} bind def
+/$F2psBegin {$F2psDict begin /$F2psEnteredState save def} def
+/$F2psEnd {$F2psEnteredState restore end} def
+
+/pageheader {
+save
+newpath 0 413 moveto 0 0 lineto 714 0 lineto 714 413 lineto closepath clip newpath
+-83.0 393.3 translate
+1 -1 scale
+$F2psBegin
+10 setmiterlimit
+0 slj 0 slc
+ 0.06299 0.06299 sc
+} bind def
+/pagefooter {
+$F2psEnd
+restore
+} bind def
+%%EndProlog
+pageheader
+%
+% Fig objects follow
+%
+% 
+% here starts figure with depth 51
+% Polyline
+0 slj
+0 slc
+7.500 slw
+n 2790 90 m 2790 3960 l 6480 4860 l 6480 5805 l 8730 5805 l 8730 4725 l
+ 3510 3645 l 3510 90 l
+ 2790 90 l  cp gs col7 0.70 shd ef gr gs col0 s gr 
+% Polyline
+n 3510 1125 m
+ 3510 1800 l gs col0 s gr 
+% Polyline
+n 4230 1125 m
+ 4230 1800 l gs col0 s gr 
+% Polyline
+n 7650 1125 m
+ 7650 1800 l gs col0 s gr 
+% Polyline
+n 6930 1080 m
+ 6930 1755 l gs col0 s gr 
+% Polyline
+n 2790 1125 m 11025 1125 l 11025 1800 l 2790 1800 l
+ cp gs col0 s gr 
+% Polyline
+n 10260 1125 m
+ 10260 1800 l gs col0 s gr 
+% Polyline
+n 3510 2835 m
+ 3510 3510 l gs col0 s gr 
+% Polyline
+n 7875 2835 m
+ 7875 3510 l gs col0 s gr 
+% Polyline
+ [15 45] 45 sd
+n 8685 2790 m 10980 2790 l 10980 3510 l 8685 3510 l
+ cp gs col0 s gr  [] 0 sd
+% Polyline
+n 3510 225 m
+ 3510 900 l gs col0 s gr 
+% Polyline
+n 4230 225 m
+ 4230 900 l gs col0 s gr 
+% Polyline
+n 7650 225 m
+ 7650 900 l gs col0 s gr 
+% Polyline
+n 2790 225 m 11025 225 l 11025 900 l 2790 900 l
+ cp gs col0 s gr 
+% Polyline
+n 10260 225 m
+ 10260 900 l gs col0 s gr 
+% Polyline
+n 6930 225 m
+ 6930 900 l gs col0 s gr 
+% Polyline
+n 4230 4950 m
+ 4230 5625 l gs col0 s gr 
+% Polyline
+n 5760 4950 m
+ 5760 5625 l gs col0 s gr 
+% Polyline
+n 4950 4950 m
+ 4950 5625 l gs col0 s gr 
+% Polyline
+n 6480 4950 m
+ 6480 5625 l gs col0 s gr 
+% Polyline
+n 7200 4950 m
+ 7200 5625 l gs col0 s gr 
+% Polyline
+n 8010 4950 m
+ 8010 5625 l gs col0 s gr 
+% Polyline
+n 9450 4950 m
+ 9450 5625 l gs col0 s gr 
+% Polyline
+30.000 slw
+ [120] 0 sd
+n 1455 4500 m 1350 4500 1350 6105 105 arcto 4 {pop} repeat
+  1350 6210 11865 6210 105 arcto 4 {pop} repeat
+  11970 6210 11970 4605 105 arcto 4 {pop} repeat
+  11970 4500 1455 4500 105 arcto 4 {pop} repeat
+ cp gs col0 s gr  [] 0 sd
+% Polyline
+ [90] 0 sd
+n 1455 -270 m 1350 -270 1350 4125 105 arcto 4 {pop} repeat
+  1350 4230 11865 4230 105 arcto 4 {pop} repeat
+  11970 4230 11970 -165 105 arcto 4 {pop} repeat
+  11970 -270 1455 -270 105 arcto 4 {pop} repeat
+ cp gs col0 s gr  [] 0 sd
+% Polyline
+7.500 slw
+n 8730 4950 m
+ 8730 5625 l gs col0 s gr 
+% Polyline
+n 2790 4950 m 11025 4950 l 11025 5625 l 2790 5625 l
+ cp gs col0 s gr 
+% Polyline
+n 4230 2835 m
+ 4230 3510 l gs col0 s gr 
+% Polyline
+n 2790 2835 m 8685 2835 l 8685 3510 l 2790 3510 l
+ cp gs col0 s gr 
+/Helvetica-Bold ff 285.75 scf sf
+7065 675 m
+gs 1 -1 sc (d) col0 sh gr
+/Helvetica-Bold ff 190.50 scf sf
+7245 765 m
+gs 1 -1 sc (i, 1) col0 sh gr
+/Helvetica ff 222.25 scf sf
+2880 5220 m
+gs 1 -1 sc (Ecc Header) col0 sh gr
+/Helvetica ff 206.38 scf sf
+2880 5460 m
+gs 1 -1 sc (\(4096 bytes\)) col0 sh gr
+/Helvetica-Bold ff 190.50 scf sf
+3825 3375 m
+gs 1 -1 sc (2, n) col0 sh gr
+/Helvetica-Bold ff 285.75 scf sf
+3645 3285 m
+gs 1 -1 sc (d) col0 sh gr
+/Helvetica-Bold ff 190.50 scf sf
+4620 5460 m
+gs 1 -1 sc (1) col0 sh gr
+/Helvetica-Bold ff 285.75 scf sf
+4440 5370 m
+gs 1 -1 sc (c) col0 sh gr
+/Helvetica-Bold ff 190.50 scf sf
+6165 5460 m
+gs 1 -1 sc (s) col0 sh gr
+/Helvetica-Bold ff 285.75 scf sf
+5985 5370 m
+gs 1 -1 sc (c) col0 sh gr
+/Helvetica-Bold ff 190.50 scf sf
+6795 5490 m
+gs 1 -1 sc (1, 1) col0 sh gr
+/Helvetica-Bold ff 285.75 scf sf
+6615 5400 m
+gs 1 -1 sc (e) col0 sh gr
+/Helvetica-Bold ff 190.50 scf sf
+8325 5505 m
+gs 1 -1 sc (1, k) col0 sh gr
+/Helvetica-Bold ff 285.75 scf sf
+8145 5415 m
+gs 1 -1 sc (e) col0 sh gr
+/Helvetica-Bold ff 190.50 scf sf
+9000 5505 m
+gs 1 -1 sc (2, 1) col0 sh gr
+/Helvetica-Bold ff 285.75 scf sf
+8820 5415 m
+gs 1 -1 sc (e) col0 sh gr
+/Helvetica-Bold ff 317.50 scf sf
+1890 2340 m
+gs 1 -1 sc (...) col0 sh gr
+/Helvetica-Bold ff 317.50 scf sf
+1575 1575 m
+gs 1 -1 sc (Data 2) col0 sh gr
+/Helvetica-Bold ff 285.75 scf sf
+5670 1530 m
+gs 1 -1 sc (...) col0 sh gr
+/Helvetica-Bold ff 285.75 scf sf
+8955 1530 m
+gs 1 -1 sc (...) col0 sh gr
+/Helvetica-Bold ff 285.75 scf sf
+10305 1575 m
+gs 1 -1 sc (d) col0 sh gr
+/Helvetica-Bold ff 190.50 scf sf
+10485 1665 m
+gs 1 -1 sc (ls, 2) col0 sh gr
+/Helvetica-Bold ff 190.50 scf sf
+3060 1665 m
+gs 1 -1 sc (1, 2) col0 sh gr
+/Helvetica-Bold ff 190.50 scf sf
+3825 1665 m
+gs 1 -1 sc (2, 2) col0 sh gr
+/Helvetica-Bold ff 285.75 scf sf
+3645 1575 m
+gs 1 -1 sc (d) col0 sh gr
+/Helvetica-Bold ff 285.75 scf sf
+2880 1575 m
+gs 1 -1 sc (d) col0 sh gr
+/Helvetica-Bold ff 285.75 scf sf
+7065 1575 m
+gs 1 -1 sc (d) col0 sh gr
+/Helvetica-Bold ff 190.50 scf sf
+7245 1665 m
+gs 1 -1 sc (i, 2) col0 sh gr
+/Helvetica-Bold ff 317.50 scf sf
+1575 3285 m
+gs 1 -1 sc (Data n) col0 sh gr
+/Helvetica-Bold ff 285.75 scf sf
+5670 3240 m
+gs 1 -1 sc (...) col0 sh gr
+/Helvetica-Bold ff 190.50 scf sf
+3060 3375 m
+gs 1 -1 sc (1, n) col0 sh gr
+/Helvetica-Bold ff 190.50 scf sf
+8235 3375 m
+gs 1 -1 sc (x, n) col0 sh gr
+/Helvetica-Bold ff 285.75 scf sf
+8955 3285 m
+gs 1 -1 sc (zero padding) col0 sh gr
+/Helvetica-Bold ff 317.50 scf sf
+1575 675 m
+gs 1 -1 sc (Data 1) col0 sh gr
+/Helvetica-Bold ff 285.75 scf sf
+5670 630 m
+gs 1 -1 sc (...) col0 sh gr
+/Helvetica-Bold ff 285.75 scf sf
+8955 630 m
+gs 1 -1 sc (...) col0 sh gr
+/Helvetica-Bold ff 285.75 scf sf
+10305 675 m
+gs 1 -1 sc (d) col0 sh gr
+/Helvetica-Bold ff 190.50 scf sf
+10485 765 m
+gs 1 -1 sc (ls, 1) col0 sh gr
+/Helvetica-Bold ff 285.75 scf sf
+2880 675 m
+gs 1 -1 sc (d) col0 sh gr
+/Helvetica-Bold ff 190.50 scf sf
+3060 765 m
+gs 1 -1 sc (1, 1) col0 sh gr
+/Helvetica-Bold ff 190.50 scf sf
+3825 765 m
+gs 1 -1 sc (2, 1) col0 sh gr
+/Helvetica-Bold ff 285.75 scf sf
+3645 675 m
+gs 1 -1 sc (d) col0 sh gr
+/Helvetica-Bold ff 285.75 scf sf
+5220 5355 m
+gs 1 -1 sc (...) col0 sh gr
+/Helvetica-Bold ff 285.75 scf sf
+9585 5355 m
+gs 1 -1 sc (...) col0 sh gr
+/Helvetica-Bold ff 381.00 scf sf
+12510 6120 m
+gs 1 -1 sc  90.0 rot (ECC file) col0 sh gr
+/Helvetica-Bold ff 381.00 scf sf
+12510 2970 m
+gs 1 -1 sc  90.0 rot (ISO image) col0 sh gr
+/Helvetica-Bold ff 285.75 scf sf
+2880 3285 m
+gs 1 -1 sc (d) col0 sh gr
+/Helvetica-Bold ff 285.75 scf sf
+8055 3285 m
+gs 1 -1 sc (d) col0 sh gr
+% here ends figure;
+pagefooter
+showpage
+%%Trailer
+%EOF

documentation/codec-specs/rs01-layout.fig

@@ -0,0 +1,132 @@
+#FIG 3.2  Produced by xfig version 3.2.5b
+Landscape
+Center
+Metric
+A4      
+100.00
+Single
+-2
+1200 2
+6 7065 450 7560 810
+4 0 0 50 -1 18 18 0.0000 4 210 180 7065 675 d\001
+4 0 0 50 -1 18 12 0.0000 4 180 285 7245 765 i, 1\001
+-6
+6 2880 5040 4140 5535
+4 0 0 50 -1 16 14 0.0000 4 180 1260 2880 5220 Ecc Header\001
+4 0 0 50 -1 16 13 0.0000 4 210 1185 2880 5460 (4096 bytes)\001
+-6
+6 3645 3075 4170 3405
+4 0 0 50 -1 18 12 0.0000 4 165 345 3825 3375 2, n\001
+4 0 0 50 -1 18 18 0.0000 4 210 180 3645 3285 d\001
+-6
+6 4440 5220 4725 5460
+4 0 0 50 -1 18 12 0.0000 4 135 105 4620 5460 1\001
+4 0 0 50 -1 18 18 0.0000 4 150 165 4440 5370 c\001
+-6
+6 5985 5220 6270 5460
+4 0 0 50 -1 18 12 0.0000 4 105 105 6165 5460 s\001
+4 0 0 50 -1 18 18 0.0000 4 150 165 5985 5370 c\001
+-6
+6 6615 5250 7125 5520
+4 0 0 50 -1 18 12 0.0000 4 165 330 6795 5490 1, 1\001
+4 0 0 50 -1 18 18 0.0000 4 150 165 6615 5400 e\001
+-6
+6 8145 5265 8655 5535
+4 0 0 50 -1 18 12 0.0000 4 180 330 8325 5505 1, k\001
+4 0 0 50 -1 18 18 0.0000 4 150 165 8145 5415 e\001
+-6
+6 8820 5265 9330 5535
+4 0 0 50 -1 18 12 0.0000 4 165 330 9000 5505 2, 1\001
+4 0 0 50 -1 18 18 0.0000 4 150 165 8820 5415 e\001
+-6
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 3510 1125 3510 1800
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 4230 1125 4230 1800
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 7650 1125 7650 1800
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 6930 1080 6930 1755
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 2790 1125 11025 1125 11025 1800 2790 1800 2790 1125
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 10260 1125 10260 1800
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 3510 2835 3510 3510
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 7875 2835 7875 3510
+2 2 2 1 0 7 50 -1 -1 3.000 0 0 -1 0 0 5
+	 8685 2790 10980 2790 10980 3510 8685 3510 8685 2790
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 3510 225 3510 900
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 4230 225 4230 900
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 7650 225 7650 900
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 2790 225 11025 225 11025 900 2790 900 2790 225
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 10260 225 10260 900
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 6930 225 6930 900
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 4230 4950 4230 5625
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 5760 4950 5760 5625
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 4950 4950 4950 5625
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 6480 4950 6480 5625
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 7200 4950 7200 5625
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 8010 4950 8010 5625
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 9450 4950 9450 5625
+2 1 0 1 0 7 51 -1 14 0.000 0 0 -1 0 0 9
+	 2790 90 2790 3960 6480 4860 6480 5805 8730 5805 8730 4725
+	 3510 3645 3510 90 2790 90
+2 4 1 3 0 7 50 -1 -1 8.000 0 0 7 0 0 5
+	 11970 6210 1350 6210 1350 4500 11970 4500 11970 6210
+2 4 1 3 0 7 50 -1 -1 6.000 0 0 7 0 0 5
+	 11970 4230 1350 4230 1350 -270 11970 -270 11970 4230
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 8730 4950 8730 5625
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 2790 4950 11025 4950 11025 5625 2790 5625 2790 4950
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 4230 2835 4230 3510
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 2790 2835 8685 2835 8685 3510 2790 3510 2790 2835
+4 0 0 50 -1 18 20 0.0000 4 45 270 1890 2340 ...\001
+4 0 0 50 -1 18 20 0.0000 4 240 975 1575 1575 Data 2\001
+4 0 0 50 -1 18 18 0.0000 4 45 225 5670 1530 ...\001
+4 0 0 50 -1 18 18 0.0000 4 45 225 8955 1530 ...\001
+4 0 0 50 -1 18 18 0.0000 4 210 180 10305 1575 d\001
+4 0 0 50 -1 18 12 0.0000 4 180 390 10485 1665 ls, 2\001
+4 0 0 50 -1 18 12 0.0000 4 165 330 3060 1665 1, 2\001
+4 0 0 50 -1 18 12 0.0000 4 165 330 3825 1665 2, 2\001
+4 0 0 50 -1 18 18 0.0000 4 210 180 3645 1575 d\001
+4 0 0 50 -1 18 18 0.0000 4 210 180 2880 1575 d\001
+4 0 0 50 -1 18 18 0.0000 4 210 180 7065 1575 d\001
+4 0 0 50 -1 18 12 0.0000 4 180 285 7245 1665 i, 2\001
+4 0 0 50 -1 18 20 0.0000 4 240 1005 1575 3285 Data n\001
+4 0 0 50 -1 18 18 0.0000 4 45 225 5670 3240 ...\001
+4 0 0 50 -1 18 12 0.0000 4 165 345 3060 3375 1, n\001
+4 0 0 50 -1 18 12 0.0000 4 135 345 8235 3375 x, n\001
+4 0 0 50 -1 18 18 0.0000 4 270 1800 8955 3285 zero padding\001
+4 0 0 50 -1 18 20 0.0000 4 240 975 1575 675 Data 1\001
+4 0 0 50 -1 18 18 0.0000 4 45 225 5670 630 ...\001
+4 0 0 50 -1 18 18 0.0000 4 45 225 8955 630 ...\001
+4 0 0 50 -1 18 18 0.0000 4 210 180 10305 675 d\001
+4 0 0 50 -1 18 12 0.0000 4 180 390 10485 765 ls, 1\001
+4 0 0 50 -1 18 18 0.0000 4 210 180 2880 675 d\001
+4 0 0 50 -1 18 12 0.0000 4 165 330 3060 765 1, 1\001
+4 0 0 50 -1 18 12 0.0000 4 165 330 3825 765 2, 1\001
+4 0 0 50 -1 18 18 0.0000 4 210 180 3645 675 d\001
+4 0 0 50 -1 18 18 0.0000 4 45 225 5220 5355 ...\001
+4 0 0 50 -1 18 18 0.0000 4 45 225 9585 5355 ...\001
+4 0 0 50 -1 18 24 1.5708 4 300 1590 12510 6120 ECC file\001
+4 0 0 50 -1 18 24 1.5708 4 390 2010 12510 2970 ISO image\001
+4 0 0 50 -1 18 18 0.0000 4 210 180 2880 3285 d\001
+4 0 0 50 -1 18 18 0.0000 4 210 180 8055 3285 d\001

documentation/codec-specs/rs01.tex

@@ -0,0 +1,237 @@
+\newpage
+\section{The RS01 codec}
+\label{rs01}
+This section describes the dvdisaster RS01 Reed-Solomon codec. 
+It was conceived during the summer of 2004 for creating 
+error correction files in the first dvdisaster versions.
+At this time, CD media was still predominant. 
+Typical machines were based on Pentium 4 (tm) processors.
+Measured by todays standards physical RAM and hard disk
+space were scarce, and especially hard disk random I/O
+was extremely slow. 
+
+\smallskip
+
+In order to work efficiently with the available technology,
+RS01 was designed to be as space efficient as possible 
+and to minimize hard disk random access. 
+Optimizing the data layout for random access efficiency
+lead to a parity byte distribution which left the error correction
+file vulnerable to being damaged. RS01 was 
+occasionally being critcized for not being able to recover 
+from damaged error corrction files, but these points
+were not really fair. RS01 error correction
+files were never designed for being stored on fragile
+media. They are supposed to
+be either stored on hard disk, or to be stored on optical
+media which itself is protected by dvdisaster error
+correction which has the following consequences:
+ Unlike optical media, hard disks do not degrade
+gradually. Hard disks are usually either 100\% readable or 
+completely dead, so we can assume that error correction
+files on hard disk are either completely readable or fully lost.
+
+Storing error correction files on optical media is a different
+story. While an error correction file could protect itself to some
+degree against lost sectors (as RS03 ecc files do), it is still
+prone to the shortcomings of a file level error correction. 
+The biggest disadvantage of file level error correction is
+that there is no protection of file system meta data.
+If meta data like a directory node becomes damaged, all files
+in the directory are lost regardless of the redundancy contained
+within the files. Therefore any medium containing error 
+correction files must be protected with an image level
+error correction layer (by using RS01,RS02 or RS03 on the medium), 
+since only image level error correction avoids meta 
+data sectors to become a single point of failure. See the
+discussion at \url{https://web.archive.org/web/20180428070843/http://dvdisaster.net/en/qa32.html} for
+more information on the advantages of image level data protection
+over file level approaches.
+
+\smallskip
+
+Nevertheless, the time has come to phase out the RS01 codec.
+Consider creating an error correction file with 32 roots 
+for a 650MiB sized image using both  codecs\footnote{The benchmark was
+done using the GNU/Linux version 
+of dvdisaster 0.79.4 on a AMD Athlon(tm) II X4 615e 
+processor. RS03 used all 4 cores of the machine.
+Both image and ecc files were stored in {\tt /dev/shm}
+to rule out I/O effects.}:
+
+\begin{center}
+\begin{tabular}{|l|r|r|}
+\hline
+codec & ecc file size & encoding time \\
+\hline
+RS01 & 94.58MiB & 46.2s \\
+RS03 & 96.68MiB &  2.4s \\
+\hline
+\end{tabular}
+\end{center}
+
+RS03 is about 2.2\% less storage efficient than RS01 since
+its data layout has been rearranged for better parallelization.
+But this is made up by a 19-fold speed improvement as
+RS03 can use multiple cores and SSE2 extensions
+(of course the speed improvement varies depending on the
+hardware used).
+Since all other properties of RS03 do at least match those
+of RS01, it's fair to begin phasing out RS01 in dvdisaster.
+
+%\smallskip
+
+dvdisaster V0.80 will be the first and only version 
+featuring all three codecs. In version 0.82, users
+will be presented a note the RS01 became deprecated.
+In subsequent releases support for encoding RS01 will
+be removed. Of course, capabilities to use and decode
+RS01 will remain in dvdisaster for umlimited time.
+Existing RS01 error correction files should remain in use
+and there is be no need to replace them with RS03 ones.
+
+\subsection{Physical layout}
+
+\begin{figure}
+ \begin{center}
+ \includegraphics[width=67mm]{spiral-rs01.eps}
+ \caption{Interpretation of physical layout in the .iso image}
+ \label{layout-phy-one}
+ \end{center}
+\end{figure}
+
+RS01 is meant to protect data which has already been written to an optical
+medium, so the parity data can not be appended to the medium and must instead 
+be kept in a separate error correction file. Like all dvdisaster
+codecs, RS01 is based on a RS(255,k) Reed-Solomon code with  each
+ecc block being comprised of $n$ data bytes and $k$ parity bytes, and
+$n+k=255$.
+
+The $n$ data bytes are taken from an iso image generated from the medium.
+Reading data directly from the optical drive during encoding would slow down the
+process tremendously due to massive random access over the medium, and 
+quickly wear out the drive mechanics. However producing the .iso image 
+takes one fast linear read, accesses the drive in a way it is designed to be used,
+and puts the data on hard disk which can sustain the needed random access I/O.
+
+Reed-Solomon codes
+work best when errors are evenly distributed over all ecc blocks.
+Therefore the $n$ data bytes used for creating an ecc block must be picked from
+locations which are evenly distributed over the medium with a maximum
+distance between each data byte pair. To obtain a suitable data distribution,
+it is taken  into account that optical media are recorded as a single long 
+spiral\footnote{Multiple layered
+media contain one spiral for each physical layer, but are otherwise conceptually
+identical.} of sectors each containing 2048 bytes.
+The first sector lies at the innermost position of the spiral and is indexed with 0;
+numbering continues onward to the outside of the spiral. The .iso image
+contains a 1:1 mapping of this storage scheme, with the first 2048 bytes
+holding the contents of sector 0, the next 2048 bytes resembling sector 1, and so on.
+
+When encoding with $n$ data bytes per ecc block, the iso image is divided into
+$n$ layers which physically map to the medium as shown in fig.\ref{layout-phy-one}. 
+This distributes the ecc block reasonably good over the medium surface.
+However since the image size does not need
+to be a multiple of the layer size, the $n$-th layer may be physically shorter
+as the layer size. For encoding purposes, the non-existant sectors in layer
+$n$ are treated as sectors being filled with 2048 zero bytes. 
+
+\subsection{Logical ecc file layout}
+
+\begin{figure}
+ \begin{center}
+ \includegraphics[width=\textwidth]{rs01-layout.eps}
+ \caption{Logical RS01 layout}
+ \label{layout-logical-one}
+ \end{center}
+\end{figure}
+
+The ecc file layout, and therefore the relationship between the iso image
+contents and the ecc file, is shown in 
+figure \ref{layout-logical-one}. The first 4096 bytes of the ecc file
+contain the ecc header whose format is described in appendix \ref{eh}.
+For RS01, only the data fields marked with ``all'' or ``RS01'' are
+relevant; all other fields should be set to zero.
+
+Next to the ecc header comes the CRC section of the ecc file. If the
+iso image contains $s$ sectors, the next $4*s$ bytes in the ecc file
+contain the CRC32 sums of the sectors from the iso image: Let $b_1,\dots,b_{2048}$ denote 
+the bytes of the first data sector; $b_{2049},\dots,b_{4096}$ those of the
+second data sector and so on. Then $c_1 = CRC32(b_1,\dots,b_{2048})$,
+$c_2 = CRC32(b_{2049},\dots,b_{4096})$ etc. Note that in contrast to
+RS02 and RS03, bytes from the CRC section are not included into the ecc block
+calculation and are therefore not protected by ecc.
+
+\smallskip
+
+The remainder of the ecc file contains the parity bytes of the
+ecc blocks. For an ecc file built with $k$ roots, 
+the iso image is logically divided into 
+$n = 255-k$ layers as shown in figure \ref{layout-logical-one}.
+The $d_{i,j}$ denote the $i-th$ byte in the $j-th$ layer.
+In order to create the first ecc block, bytes $d_{1,1}$ to  $d_{1,n}$ are taken from the
+$n$ layers. Then the RS(255,k) code is calculated (see appendix \ref{rs} for its parameters)
+and the 
+resulting $k$ parity bytes $e_{1,1}$ up to $e_{k,1}$ are stored
+in the ecc file. The resulting ecc block is marked grey in the
+figure. The next ecc blocks are calculated and stored accordingly.
+In total, the ecc section contains $k*ls$ bytes of parity information,
+with the $k$ parity bytes of each ecc block being stored consecutively.
+
+\subsection{Calculating the layout for encoding}
+
+The RS01 layout is fully determined by the number of roots for the error correction code
+and the iso image size in sectors (from now on, ``size'' always means ``number of
+2048K sectors). The number of roots can be freely chosen by the user from the
+range of $[8...100]$. The iso image size is directly measured
+from the iso image file.
+
+\smallskip
+
+The number of data layers is simply calculated from the number of roots, $k$:
+
+\[ data\ layers = 255 - k\]
+
+The size of each layer is:
+
+\[ layer\ size = \left\lceil\frac{medium\ size}{data\ layers}\right\rceil\]
+
+At the end of the last layer, $data\ layers * layer\ size - medium\ size$
+zero filled padding sectors are used in the encoding process.
+
+\subsection{Getting the layout when recovering defective media}
+
+The required parameters are taken from the ecc header stored in
+the error correction file (see appendix \ref{eh}). Especially,
+the number of roots are taken from the {\em eccBytes} field and
+the medium size is recorded in the {\em sectors} field.
+
+\subsection{md5 checksums}
+
+RS01 provides two md5 checksums for integrity checking.
+The md5 sum of the iso image is calculated and stored in the
+{\em mediumSum} field of the ecc header. 
+Another md5 sum is calculated over the ecc file, excluding the
+first 4096 bytes, and stored in the {\em eccSum} field of
+the ecc header. It can be used to verify the integrity of the
+ecc file itself. The ecc header is protected by its own CRC
+checksum which is stored in the {\em selfCRC} field.
+
+\smallskip
+
+The md5 checksum generation is the major obstacle for parallelizing
+the encoder. In RS03, md5sum generation has been made optional since
+the RS03 layout allows suffcient consistency checks 
+by doing a quick error syndrome check using the Reed-Solomon code.
+
+\subsection{Special cases}
+
+Error correction files can be created for any type of input files, not just iso files,
+as long as the input files are ``reasonably'' long\footnote{Input files should contain
+at least 2048*(255-k) bytes, so that there is at least one sector for each data
+layer.}. Since input files are processed in units of 2048 kByte sectors, 
+files whose byte size is not an integer multiple of 2048 are virtually padded 
+with zeroes. In that case, the {\em inLast} field of the ecc header
+contains the real byte size of the last file ``sector'' so that recovering the
+last file sector does not write out the padding bytes. A size of zero in the
+{\em inLast} field means that the last sector contains 2048 bytes.

documentation/codec-specs/rs02-layout.eps

@@ -0,0 +1,985 @@
+%!PS-Adobe-2.0 EPSF-2.0
+%%Title: rs02-layout.fig
+%%Creator: fig2dev Version 3.2 Patchlevel 5c
+%%CreationDate: Sun Aug 19 15:16:45 2012
+%%BoundingBox: 0 0 969 472
+%Magnification: 1.0000
+%%EndComments
+%%BeginProlog
+/MyAppDict 100 dict dup begin def
+/$F2psDict 200 dict def
+$F2psDict begin
+$F2psDict /mtrx matrix put
+/col-1 {0 setgray} bind def
+/col0 {0.000 0.000 0.000 srgb} bind def
+/col1 {0.000 0.000 1.000 srgb} bind def
+/col2 {0.000 1.000 0.000 srgb} bind def
+/col3 {0.000 1.000 1.000 srgb} bind def
+/col4 {1.000 0.000 0.000 srgb} bind def
+/col5 {1.000 0.000 1.000 srgb} bind def
+/col6 {1.000 1.000 0.000 srgb} bind def
+/col7 {1.000 1.000 1.000 srgb} bind def
+/col8 {0.000 0.000 0.560 srgb} bind def
+/col9 {0.000 0.000 0.690 srgb} bind def
+/col10 {0.000 0.000 0.820 srgb} bind def
+/col11 {0.530 0.810 1.000 srgb} bind def
+/col12 {0.000 0.560 0.000 srgb} bind def
+/col13 {0.000 0.690 0.000 srgb} bind def
+/col14 {0.000 0.820 0.000 srgb} bind def
+/col15 {0.000 0.560 0.560 srgb} bind def
+/col16 {0.000 0.690 0.690 srgb} bind def
+/col17 {0.000 0.820 0.820 srgb} bind def
+/col18 {0.560 0.000 0.000 srgb} bind def
+/col19 {0.690 0.000 0.000 srgb} bind def
+/col20 {0.820 0.000 0.000 srgb} bind def
+/col21 {0.560 0.000 0.560 srgb} bind def
+/col22 {0.690 0.000 0.690 srgb} bind def
+/col23 {0.820 0.000 0.820 srgb} bind def
+/col24 {0.500 0.190 0.000 srgb} bind def
+/col25 {0.630 0.250 0.000 srgb} bind def
+/col26 {0.750 0.380 0.000 srgb} bind def
+/col27 {1.000 0.500 0.500 srgb} bind def
+/col28 {1.000 0.630 0.630 srgb} bind def
+/col29 {1.000 0.750 0.750 srgb} bind def
+/col30 {1.000 0.880 0.880 srgb} bind def
+/col31 {1.000 0.840 0.000 srgb} bind def
+
+end
+
+% This junk string is used by the show operators
+/PATsstr 1 string def
+/PATawidthshow { 	% cx cy cchar rx ry string
+  % Loop over each character in the string
+  {  % cx cy cchar rx ry char
+    % Show the character
+    dup				% cx cy cchar rx ry char char
+    PATsstr dup 0 4 -1 roll put	% cx cy cchar rx ry char (char)
+    false charpath		% cx cy cchar rx ry char
+    /clip load PATdraw
+    % Move past the character (charpath modified the
+    % current point)
+    currentpoint			% cx cy cchar rx ry char x y
+    newpath
+    moveto			% cx cy cchar rx ry char
+    % Reposition by cx,cy if the character in the string is cchar
+    3 index eq {			% cx cy cchar rx ry
+      4 index 4 index rmoveto
+    } if
+    % Reposition all characters by rx ry
+    2 copy rmoveto		% cx cy cchar rx ry
+  } forall
+  pop pop pop pop pop		% -
+  currentpoint
+  newpath
+  moveto
+} bind def
+/PATcg {
+  7 dict dup begin
+    /lw currentlinewidth def
+    /lc currentlinecap def
+    /lj currentlinejoin def
+    /ml currentmiterlimit def
+    /ds [ currentdash ] def
+    /cc [ currentrgbcolor ] def
+    /cm matrix currentmatrix def
+  end
+} bind def
+% PATdraw - calculates the boundaries of the object and
+% fills it with the current pattern
+/PATdraw {			% proc
+  save exch
+    PATpcalc			% proc nw nh px py
+    5 -1 roll exec		% nw nh px py
+    newpath
+    PATfill			% -
+  restore
+} bind def
+% PATfill - performs the tiling for the shape
+/PATfill { % nw nh px py PATfill -
+  PATDict /CurrentPattern get dup begin
+    setfont
+    % Set the coordinate system to Pattern Space
+    PatternGState PATsg
+    % Set the color for uncolored pattezns
+    PaintType 2 eq { PATDict /PColor get PATsc } if
+    % Create the string for showing
+    3 index string		% nw nh px py str
+    % Loop for each of the pattern sources
+    0 1 Multi 1 sub {		% nw nh px py str source
+	% Move to the starting location
+	3 index 3 index		% nw nh px py str source px py
+	moveto			% nw nh px py str source
+	% For multiple sources, set the appropriate color
+	Multi 1 ne { dup PC exch get PATsc } if
+	% Set the appropriate string for the source
+	0 1 7 index 1 sub { 2 index exch 2 index put } for pop
+	% Loop over the number of vertical cells
+	3 index 		% nw nh px py str nh
+	{			% nw nh px py str
+	  currentpoint		% nw nh px py str cx cy
+	  2 index oldshow	% nw nh px py str cx cy
+	  YStep add moveto	% nw nh px py str
+	} repeat		% nw nh px py str
+    } for
+    5 { pop } repeat
+  end
+} bind def
+
+% PATkshow - kshow with the current pattezn
+/PATkshow {			% proc string
+  exch bind			% string proc
+  1 index 0 get			% string proc char
+  % Loop over all but the last character in the string
+  0 1 4 index length 2 sub {
+				% string proc char idx
+    % Find the n+1th character in the string
+    3 index exch 1 add get	% string proc char char+1
+    exch 2 copy			% strinq proc char+1 char char+1 char
+    % Now show the nth character
+    PATsstr dup 0 4 -1 roll put	% string proc chr+1 chr chr+1 (chr)
+    false charpath		% string proc char+1 char char+1
+    /clip load PATdraw
+    % Move past the character (charpath modified the current point)
+    currentpoint newpath moveto
+    % Execute the user proc (should consume char and char+1)
+    mark 3 1 roll		% string proc char+1 mark char char+1
+    4 index exec		% string proc char+1 mark...
+    cleartomark			% string proc char+1
+  } for
+  % Now display the last character
+  PATsstr dup 0 4 -1 roll put	% string proc (char+1)
+  false charpath		% string proc
+  /clip load PATdraw
+  neewath
+  pop pop			% -
+} bind def
+% PATmp - the makepattern equivalent
+/PATmp {			% patdict patmtx PATmp patinstance
+  exch dup length 7 add		% We will add 6 new entries plus 1 FID
+  dict copy			% Create a new dictionary
+  begin
+    % Matrix to install when painting the pattern
+    TilingType PATtcalc
+    /PatternGState PATcg def
+    PatternGState /cm 3 -1 roll put
+    % Check for multi pattern sources (Level 1 fast color patterns)
+    currentdict /Multi known not { /Multi 1 def } if
+    % Font dictionary definitions
+    /FontType 3 def
+    % Create a dummy encoding vector
+    /Encoding 256 array def
+    3 string 0 1 255 {
+      Encoding exch dup 3 index cvs cvn put } for pop
+    /FontMatrix matrix def
+    /FontBBox BBox def
+    /BuildChar {
+	mark 3 1 roll		% mark dict char
+	exch begin
+	Multi 1 ne {PaintData exch get}{pop} ifelse  % mark [paintdata]
+	  PaintType 2 eq Multi 1 ne or
+	  { XStep 0 FontBBox aload pop setcachedevice }
+	  { XStep 0 setcharwidth } ifelse
+	  currentdict		% mark [paintdata] dict
+	  /PaintProc load	% mark [paintdata] dict paintproc
+	end
+	gsave
+	  false PATredef exec true PATredef
+	grestore
+	cleartomark		% -
+    } bind def
+    currentdict
+  end				% newdict
+  /foo exch			% /foo newlict
+  definefont			% newfont
+} bind def
+% PATpcalc - calculates the starting point and width/height
+% of the tile fill for the shape
+/PATpcalc {	% - PATpcalc nw nh px py
+  PATDict /CurrentPattern get begin
+    gsave
+	% Set up the coordinate system to Pattern Space
+	% and lock down pattern
+	PatternGState /cm get setmatrix
+	BBox aload pop pop pop translate
+	% Determine the bounding box of the shape
+	pathbbox			% llx lly urx ury
+    grestore
+    % Determine (nw, nh) the # of cells to paint width and height
+    PatHeight div ceiling		% llx lly urx qh
+    4 1 roll				% qh llx lly urx
+    PatWidth div ceiling		% qh llx lly qw
+    4 1 roll				% qw qh llx lly
+    PatHeight div floor			% qw qh llx ph
+    4 1 roll				% ph qw qh llx
+    PatWidth div floor			% ph qw qh pw
+    4 1 roll				% pw ph qw qh
+    2 index sub cvi abs			% pw ph qs qh-ph
+    exch 3 index sub cvi abs exch	% pw ph nw=qw-pw nh=qh-ph
+    % Determine the starting point of the pattern fill
+    %(px, py)
+    4 2 roll				% nw nh pw ph
+    PatHeight mul			% nw nh pw py
+    exch				% nw nh py pw
+    PatWidth mul exch			% nw nh px py
+  end
+} bind def
+
+% Save the original routines so that we can use them later on
+/oldfill	/fill load def
+/oldeofill	/eofill load def
+/oldstroke	/stroke load def
+/oldshow	/show load def
+/oldashow	/ashow load def
+/oldwidthshow	/widthshow load def
+/oldawidthshow	/awidthshow load def
+/oldkshow	/kshow load def
+
+% These defs are necessary so that subsequent procs don't bind in
+% the originals
+/fill	   { oldfill } bind def
+/eofill	   { oldeofill } bind def
+/stroke	   { oldstroke } bind def
+/show	   { oldshow } bind def
+/ashow	   { oldashow } bind def
+/widthshow { oldwidthshow } bind def
+/awidthshow { oldawidthshow } bind def
+/kshow 	   { oldkshow } bind def
+/PATredef {
+  MyAppDict begin
+    {
+    /fill { /clip load PATdraw newpath } bind def
+    /eofill { /eoclip load PATdraw newpath } bind def
+    /stroke { PATstroke } bind def
+    /show { 0 0 null 0 0 6 -1 roll PATawidthshow } bind def
+    /ashow { 0 0 null 6 3 roll PATawidthshow }
+    bind def
+    /widthshow { 0 0 3 -1 roll PATawidthshow }
+    bind def
+    /awidthshow { PATawidthshow } bind def
+    /kshow { PATkshow } bind def
+  } {
+    /fill   { oldfill } bind def
+    /eofill { oldeofill } bind def
+    /stroke { oldstroke } bind def
+    /show   { oldshow } bind def
+    /ashow  { oldashow } bind def
+    /widthshow { oldwidthshow } bind def
+    /awidthshow { oldawidthshow } bind def
+    /kshow  { oldkshow } bind def
+    } ifelse
+  end
+} bind def
+false PATredef
+% Conditionally define setcmykcolor if not available
+/setcmykcolor where { pop } {
+  /setcmykcolor {
+    1 sub 4 1 roll
+    3 {
+	3 index add neg dup 0 lt { pop 0 } if 3 1 roll
+    } repeat
+    setrgbcolor - pop
+  } bind def
+} ifelse
+/PATsc {		% colorarray
+  aload length		% c1 ... cn length
+    dup 1 eq { pop setgray } { 3 eq { setrgbcolor } { setcmykcolor
+  } ifelse } ifelse
+} bind def
+/PATsg {		% dict
+  begin
+    lw setlinewidth
+    lc setlinecap
+    lj setlinejoin
+    ml setmiterlimit
+    ds aload pop setdash
+    cc aload pop setrgbcolor
+    cm setmatrix
+  end
+} bind def
+
+/PATDict 3 dict def
+/PATsp {
+  true PATredef
+  PATDict begin
+    /CurrentPattern exch def
+    % If it's an uncolored pattern, save the color
+    CurrentPattern /PaintType get 2 eq {
+      /PColor exch def
+    } if
+    /CColor [ currentrgbcolor ] def
+  end
+} bind def
+% PATstroke - stroke with the current pattern
+/PATstroke {
+  countdictstack
+  save
+  mark
+  {
+    currentpoint strokepath moveto
+    PATpcalc				% proc nw nh px py
+    clip newpath PATfill
+    } stopped {
+	(*** PATstroke Warning: Path is too complex, stroking
+	  with gray) =
+    cleartomark
+    restore
+    countdictstack exch sub dup 0 gt
+	{ { end } repeat } { pop } ifelse
+    gsave 0.5 setgray oldstroke grestore
+  } { pop restore pop } ifelse
+  newpath
+} bind def
+/PATtcalc {		% modmtx tilingtype PATtcalc tilematrix
+  % Note: tiling types 2 and 3 are not supported
+  gsave
+    exch concat					% tilingtype
+    matrix currentmatrix exch			% cmtx tilingtype
+    % Tiling type 1 and 3: constant spacing
+    2 ne {
+	% Distort the pattern so that it occupies
+	% an integral number of device pixels
+	dup 4 get exch dup 5 get exch		% tx ty cmtx
+	XStep 0 dtransform
+	round exch round exch			% tx ty cmtx dx.x dx.y
+	XStep div exch XStep div exch		% tx ty cmtx a b
+	0 YStep dtransform
+	round exch round exch			% tx ty cmtx a b dy.x dy.y
+	YStep div exch YStep div exch		% tx ty cmtx a b c d
+	7 -3 roll astore			% { a b c d tx ty }
+    } if
+  grestore
+} bind def
+/PATusp {
+  false PATredef
+  PATDict begin
+    CColor PATsc
+  end
+} bind def
+
+% left45
+11 dict begin
+/PaintType 1 def
+/PatternType 1 def
+/TilingType 1 def
+/BBox [0 0 1 1] def
+/XStep 1 def
+/YStep 1 def
+/PatWidth 1 def
+/PatHeight 1 def
+/Multi 2 def
+/PaintData [
+  { clippath } bind
+  { 20 20 true [ 20 0 0 -20 0 20 ]
+	{<8020004010002008001004000802000401000200
+	8001004000802000401080200040100020080010
+	0400080200040100020080010040008020004010>}
+     imagemask } bind
+] def
+/PaintProc {
+	pop
+	exec fill
+} def
+currentdict
+end
+/P4 exch def
+
+% right45
+11 dict begin
+/PaintType 1 def
+/PatternType 1 def
+/TilingType 1 def
+/BBox [0 0 1 1] def
+/XStep 1 def
+/YStep 1 def
+/PatWidth 1 def
+/PatHeight 1 def
+/Multi 2 def
+/PaintData [
+  { clippath } bind
+  { 20 20 true [ 20 0 0 -20 0 20 ]
+	{<0040100080200100400200800401000802001004
+	0020080040100080200000401000802001004002
+	0080040100080200100400200800401000802000>}
+     imagemask } bind
+] def
+/PaintProc {
+	pop
+	exec fill
+} def
+currentdict
+end
+/P5 exch def
+
+/cp {closepath} bind def
+/ef {eofill} bind def
+/gr {grestore} bind def
+/gs {gsave} bind def
+/sa {save} bind def
+/rs {restore} bind def
+/l {lineto} bind def
+/m {moveto} bind def
+/rm {rmoveto} bind def
+/n {newpath} bind def
+/s {stroke} bind def
+/sh {show} bind def
+/slc {setlinecap} bind def
+/slj {setlinejoin} bind def
+/slw {setlinewidth} bind def
+/srgb {setrgbcolor} bind def
+/rot {rotate} bind def
+/sc {scale} bind def
+/sd {setdash} bind def
+/ff {findfont} bind def
+/sf {setfont} bind def
+/scf {scalefont} bind def
+/sw {stringwidth} bind def
+/tr {translate} bind def
+/tnt {dup dup currentrgbcolor
+  4 -2 roll dup 1 exch sub 3 -1 roll mul add
+  4 -2 roll dup 1 exch sub 3 -1 roll mul add
+  4 -2 roll dup 1 exch sub 3 -1 roll mul add srgb}
+  bind def
+/shd {dup dup currentrgbcolor 4 -2 roll mul 4 -2 roll mul
+  4 -2 roll mul srgb} bind def
+/reencdict 12 dict def /ReEncode { reencdict begin
+/newcodesandnames exch def /newfontname exch def /basefontname exch def
+/basefontdict basefontname findfont def /newfont basefontdict maxlength dict def
+basefontdict { exch dup /FID ne { dup /Encoding eq
+{ exch dup length array copy newfont 3 1 roll put }
+{ exch newfont 3 1 roll put } ifelse } { pop pop } ifelse } forall
+newfont /FontName newfontname put newcodesandnames aload pop
+128 1 255 { newfont /Encoding get exch /.notdef put } for
+newcodesandnames length 2 idiv { newfont /Encoding get 3 1 roll put } repeat
+newfontname newfont definefont pop end } def
+/isovec [
+8#055 /minus 8#200 /grave 8#201 /acute 8#202 /circumflex 8#203 /tilde
+8#204 /macron 8#205 /breve 8#206 /dotaccent 8#207 /dieresis
+8#210 /ring 8#211 /cedilla 8#212 /hungarumlaut 8#213 /ogonek 8#214 /caron
+8#220 /dotlessi 8#230 /oe 8#231 /OE
+8#240 /space 8#241 /exclamdown 8#242 /cent 8#243 /sterling
+8#244 /currency 8#245 /yen 8#246 /brokenbar 8#247 /section 8#250 /dieresis
+8#251 /copyright 8#252 /ordfeminine 8#253 /guillemotleft 8#254 /logicalnot
+8#255 /hyphen 8#256 /registered 8#257 /macron 8#260 /degree 8#261 /plusminus
+8#262 /twosuperior 8#263 /threesuperior 8#264 /acute 8#265 /mu 8#266 /paragraph
+8#267 /periodcentered 8#270 /cedilla 8#271 /onesuperior 8#272 /ordmasculine
+8#273 /guillemotright 8#274 /onequarter 8#275 /onehalf
+8#276 /threequarters 8#277 /questiondown 8#300 /Agrave 8#301 /Aacute
+8#302 /Acircumflex 8#303 /Atilde 8#304 /Adieresis 8#305 /Aring
+8#306 /AE 8#307 /Ccedilla 8#310 /Egrave 8#311 /Eacute
+8#312 /Ecircumflex 8#313 /Edieresis 8#314 /Igrave 8#315 /Iacute
+8#316 /Icircumflex 8#317 /Idieresis 8#320 /Eth 8#321 /Ntilde 8#322 /Ograve
+8#323 /Oacute 8#324 /Ocircumflex 8#325 /Otilde 8#326 /Odieresis 8#327 /multiply
+8#330 /Oslash 8#331 /Ugrave 8#332 /Uacute 8#333 /Ucircumflex
+8#334 /Udieresis 8#335 /Yacute 8#336 /Thorn 8#337 /germandbls 8#340 /agrave
+8#341 /aacute 8#342 /acircumflex 8#343 /atilde 8#344 /adieresis 8#345 /aring
+8#346 /ae 8#347 /ccedilla 8#350 /egrave 8#351 /eacute
+8#352 /ecircumflex 8#353 /edieresis 8#354 /igrave 8#355 /iacute
+8#356 /icircumflex 8#357 /idieresis 8#360 /eth 8#361 /ntilde 8#362 /ograve
+8#363 /oacute 8#364 /ocircumflex 8#365 /otilde 8#366 /odieresis 8#367 /divide
+8#370 /oslash 8#371 /ugrave 8#372 /uacute 8#373 /ucircumflex
+8#374 /udieresis 8#375 /yacute 8#376 /thorn 8#377 /ydieresis] def
+/Helvetica-Bold /Helvetica-Bold-iso isovec ReEncode
+/$F2psBegin {$F2psDict begin /$F2psEnteredState save def} def
+/$F2psEnd {$F2psEnteredState restore end} def
+
+/pageheader {
+save
+newpath 0 472 moveto 0 0 lineto 969 0 lineto 969 472 lineto closepath clip newpath
+-237.2 454.5 translate
+1 -1 scale
+$F2psBegin
+10 setmiterlimit
+0 slj 0 slc
+ 0.06299 0.06299 sc
+} bind def
+/pagefooter {
+$F2psEnd
+restore
+} bind def
+%%EndProlog
+pageheader
+%
+% Fig objects follow
+%
+% 
+% here starts figure with depth 51
+% Polyline
+0 slj
+0 slc
+0.000 slw
+n 9045 225 m
+ 9045 900 l gs col7 0.70 shd ef gr 
+% Polyline
+30.000 slw
+n 8280 0 m 8280 4095 l 9900 4410 l 9900 5310 l 8280 5715 l 8280 6795 l
+ 9045 6795 l 9045 5715 l 10620 5310 l 10620 4365 l 9045 4095 l
+ 9045 0 l
+ cp gs col7 0.70 shd ef gr gs col0 s gr 
+% Polyline
+7.500 slw
+n 10305 3375 m 12780 3375 l 12780 4050 l 10305 4050 l
+ cp gs col7 0.80 shd ef gr gs col0 s gr 
+% Polyline
+n 12780 3375 m 15255 3375 l 15255 4050 l 12780 4050 l
+ cp gs col7 0.60 shd ef gr gs col0 s gr 
+% Polyline
+n 15705 3375 m 17595 3375 l 17595 4050 l 15705 4050 l
+ cp gs col7 0.80 shd ef gr gs col0 s gr 
+% Polyline
+n 8280 4500 m 9900 4500 l 9900 5175 l 8280 5175 l
+ cp gs /PC [[1.00 1.00 1.00] [0.00 0.00 0.00]] def
+15.00 15.00 sc P4 [16 0 0 -16 552.00 300.00] PATmp PATsp ef gr PATusp gs col0 s gr 
+% Polyline
+n 10350 2385 m 11970 2385 l 11970 3060 l 10350 3060 l
+ cp gs /PC [[1.00 1.00 1.00] [0.00 0.00 0.00]] def
+15.00 15.00 sc P4 [16 0 0 -16 690.00 159.00] PATmp PATsp ef gr PATusp gs col0 s gr 
+% Polyline
+n 8280 225 m
+ 8280 900 l gs col0 s gr 
+% Polyline
+n 7515 225 m
+ 7515 900 l gs col0 s gr 
+% Polyline
+n 9765 225 m
+ 9765 900 l gs col0 s gr 
+% Polyline
+n 9045 1125 m
+ 9045 1800 l gs col0 s gr 
+% Polyline
+n 8280 1125 m
+ 8280 1800 l gs col0 s gr 
+% Polyline
+n 9765 1125 m
+ 9765 1800 l gs col0 s gr 
+% Polyline
+n 8280 3285 m
+ 8280 3960 l gs col0 s gr 
+% Polyline
+n 7515 2385 m
+ 7515 3060 l gs col0 s gr 
+% Polyline
+n 8280 4500 m
+ 8280 5175 l gs col0 s gr 
+% Polyline
+n 7515 5850 m
+ 7515 6525 l gs col0 s gr 
+% Polyline
+n 7515 4500 m
+ 7515 5175 l gs col0 s gr 
+% Polyline
+n 10620 4500 m
+ 10620 5175 l gs col0 s gr 
+% Polyline
+n 11340 4500 m
+ 11340 5175 l gs col0 s gr 
+% Polyline
+n 8280 2385 m
+ 8280 3060 l gs col0 s gr 
+% Polyline
+n 8280 5850 m
+ 8280 6525 l gs col0 s gr 
+% Polyline
+n 9045 5850 m
+ 9045 6525 l gs col0 s gr 
+% Polyline
+n 9765 5850 m
+ 9765 6525 l gs col0 s gr 
+% Polyline
+n 5625 225 m
+ 5625 900 l gs col0 s gr 
+% Polyline
+n 5625 1125 m
+ 5625 1800 l gs col0 s gr 
+% Polyline
+n 7515 1125 m
+ 7515 1800 l gs col0 s gr 
+% Polyline
+n 5625 4500 m
+ 5625 5175 l gs col0 s gr 
+% Polyline
+n 5625 5850 m
+ 5625 6525 l gs col0 s gr 
+% Polyline
+n 4950 2385 m 9045 2385 l 9045 3060 l 4950 3060 l
+ cp gs col0 s gr 
+% Polyline
+30.000 slw
+ [120] 0 sd
+n 4860 135 m 4860 3150 l 10395 3150 l 10395 1890 l 16560 1890 l 16560 90 l
+ 5265 135 l
+ cp gs col0 s gr  [] 0 sd
+% Polyline
+7.500 slw
+n 9045 2385 m
+ 9045 3060 l gs col0 s gr 
+% Polyline
+n 10350 2385 m 9045 2385 l 9045 3060 l 10350 3060 l
+ cp gs col0 s gr 
+% Polyline
+n 9540 2385 m
+ 9540 3060 l gs col0 s gr 
+% Polyline
+n 5625 2385 m
+ 5625 3060 l gs col0 s gr 
+% Polyline
+n 4950 135 m 16470 135 l 16470 900 l 4950 900 l
+ cp gs col0 s gr 
+% Polyline
+n 15705 225 m
+ 15705 900 l gs col0 s gr 
+% Polyline
+n 4950 1125 m 16470 1125 l 16470 1800 l 4950 1800 l
+ cp gs col0 s gr 
+% Polyline
+n 15705 1125 m
+ 15705 1800 l gs col0 s gr 
+% Polyline
+ [15 45] 45 sd
+n 15120 2385 m 16470 2385 l 16470 3060 l 15120 3060 l
+ cp gs col0 s gr  [] 0 sd
+% Polyline
+n 11970 2385 m 15120 2385 l 15120 3060 l 11970 3060 l
+ cp gs /PC [[1.00 1.00 1.00] [0.00 0.00 0.00]] def
+15.00 15.00 sc P5 [16 0 0 -16 798.00 159.00] PATmp PATsp ef gr PATusp gs col0 s gr 
+% Polyline
+n 10980 3375 m
+ 10980 4050 l gs col0 s gr 
+% Polyline
+n 11655 3375 m
+ 11655 4050 l gs col0 s gr 
+% Polyline
+n 12105 3375 m
+ 12105 4050 l gs col0 s gr 
+% Polyline
+n 13455 3375 m
+ 13455 4050 l gs col0 s gr 
+% Polyline
+n 14130 3375 m
+ 14130 4050 l gs col0 s gr 
+% Polyline
+n 14580 3375 m
+ 14580 4050 l gs col0 s gr 
+% Polyline
+n 15255 3375 m
+ 15255 4050 l gs col0 s gr 
+% Polyline
+n 15705 3375 m
+ 15705 4050 l gs col0 s gr 
+% Polyline
+n 16425 3375 m
+ 16425 4050 l gs col0 s gr 
+% Polyline
+n 16875 3375 m
+ 16875 4050 l gs col0 s gr 
+% Polyline
+n 11970 3060 m
+ 10305 3375 l gs col0 s gr 
+% Polyline
+n 15120 3060 m
+ 17595 3375 l gs col0 s gr 
+% Polyline
+n 12780 3375 m
+ 12780 4050 l gs col0 s gr 
+% Polyline
+n 10305 3375 m 17595 3375 l 17595 4050 l 10305 4050 l
+ cp gs col0 s gr 
+% Polyline
+n 4950 5850 m 16470 5850 l 16470 6525 l 4950 6525 l
+ cp gs col0 s gr 
+% Polyline
+n 15705 5850 m
+ 15705 6525 l gs col0 s gr 
+% Polyline
+n 4950 4500 m 19125 4500 l 19125 5175 l 4950 5175 l
+ cp gs col0 s gr 
+% Polyline
+n 18405 4500 m
+ 18405 5175 l gs col0 s gr 
+/Helvetica-Bold-iso ff 254.00 scf sf
+8370 4815 m
+gs 1 -1 sc (Ecc Header) col0 sh gr
+/Helvetica-Bold-iso ff 254.00 scf sf
+8370 5085 m
+gs 1 -1 sc (2048 Bytes) col0 sh gr
+/Helvetica-Bold-iso ff 254.00 scf sf
+10440 2700 m
+gs 1 -1 sc (Ecc Header) col0 sh gr
+/Helvetica-Bold-iso ff 254.00 scf sf
+10440 2970 m
+gs 1 -1 sc (2048 Bytes) col0 sh gr
+/Helvetica-Bold-iso ff 285.75 scf sf
+15795 675 m
+gs 1 -1 sc (d) col0 sh gr
+/Helvetica-Bold-iso ff 190.50 scf sf
+15975 765 m
+gs 1 -1 sc (ls, 1) col0 sh gr
+/Helvetica-Bold-iso ff 285.75 scf sf
+15795 1575 m
+gs 1 -1 sc (d) col0 sh gr
+/Helvetica-Bold-iso ff 190.50 scf sf
+15975 1665 m
+gs 1 -1 sc (ls, 2) col0 sh gr
+/Helvetica-Bold-iso ff 190.50 scf sf
+15975 6390 m
+gs 1 -1 sc (ls, k) col0 sh gr
+/Helvetica-Bold-iso ff 285.75 scf sf
+15750 6300 m
+gs 1 -1 sc (e) col0 sh gr
+/Helvetica-Bold-iso ff 190.50 scf sf
+18675 5040 m
+gs 1 -1 sc (ls, 1) col0 sh gr
+/Helvetica-Bold-iso ff 285.75 scf sf
+18495 4950 m
+gs 1 -1 sc (e) col0 sh gr
+/Helvetica-Bold-iso ff 285.75 scf sf
+8460 675 m
+gs 1 -1 sc (d) col0 sh gr
+/Helvetica-Bold-iso ff 190.50 scf sf
+8640 765 m
+gs 1 -1 sc (i, 1) col0 sh gr
+/Helvetica-Bold-iso ff 285.75 scf sf
+9090 675 m
+gs 1 -1 sc (d) col0 sh gr
+/Helvetica-Bold-iso ff 190.50 scf sf
+9270 765 m
+gs 1 -1 sc (i+1, 1) col0 sh gr
+/Helvetica-Bold-iso ff 285.75 scf sf
+7560 675 m
+gs 1 -1 sc (d) col0 sh gr
+/Helvetica-Bold-iso ff 190.50 scf sf
+7785 765 m
+gs 1 -1 sc (i-1, 1) col0 sh gr
+/Helvetica-Bold-iso ff 317.50 scf sf
+3780 675 m
+gs 1 -1 sc (Data 1) col0 sh gr
+/Helvetica-Bold-iso ff 285.75 scf sf
+8460 1575 m
+gs 1 -1 sc (d) col0 sh gr
+/Helvetica-Bold-iso ff 190.50 scf sf
+8640 1665 m
+gs 1 -1 sc (i, 2) col0 sh gr
+/Helvetica-Bold-iso ff 285.75 scf sf
+9090 1575 m
+gs 1 -1 sc (d) col0 sh gr
+/Helvetica-Bold-iso ff 190.50 scf sf
+9270 1665 m
+gs 1 -1 sc (i+1, 2) col0 sh gr
+/Helvetica-Bold-iso ff 285.75 scf sf
+7560 1575 m
+gs 1 -1 sc (d) col0 sh gr
+/Helvetica-Bold-iso ff 190.50 scf sf
+7785 1665 m
+gs 1 -1 sc (i-1, 2) col0 sh gr
+/Helvetica-Bold-iso ff 317.50 scf sf
+3780 1575 m
+gs 1 -1 sc (Data 2) col0 sh gr
+/Helvetica-Bold-iso ff 285.75 scf sf
+8460 2835 m
+gs 1 -1 sc (d) col0 sh gr
+/Helvetica-Bold-iso ff 190.50 scf sf
+8640 2925 m
+gs 1 -1 sc (i, n) col0 sh gr
+/Helvetica-Bold-iso ff 285.75 scf sf
+7560 2835 m
+gs 1 -1 sc (d) col0 sh gr
+/Helvetica-Bold-iso ff 190.50 scf sf
+7785 2925 m
+gs 1 -1 sc (i-1, n) col0 sh gr
+/Helvetica-Bold-iso ff 317.50 scf sf
+3780 2835 m
+gs 1 -1 sc (Data n) col0 sh gr
+/Helvetica-Bold-iso ff 285.75 scf sf
+8460 6300 m
+gs 1 -1 sc (e) col0 sh gr
+/Helvetica-Bold-iso ff 190.50 scf sf
+8640 6390 m
+gs 1 -1 sc (i, k) col0 sh gr
+/Helvetica-Bold-iso ff 285.75 scf sf
+9090 6300 m
+gs 1 -1 sc (e) col0 sh gr
+/Helvetica-Bold-iso ff 190.50 scf sf
+9270 6390 m
+gs 1 -1 sc (i+1, k) col0 sh gr
+/Helvetica-Bold-iso ff 285.75 scf sf
+7560 6300 m
+gs 1 -1 sc (e) col0 sh gr
+/Helvetica-Bold-iso ff 285.75 scf sf
+7560 4950 m
+gs 1 -1 sc (e) col0 sh gr
+/Helvetica-Bold-iso ff 190.50 scf sf
+7785 6390 m
+gs 1 -1 sc (i-1, k) col0 sh gr
+/Helvetica-Bold-iso ff 190.50 scf sf
+7785 5040 m
+gs 1 -1 sc (i-1, 1) col0 sh gr
+/Helvetica-Bold-iso ff 317.50 scf sf
+7785 7200 m
+gs 1 -1 sc (ECC block i) col0 sh gr
+/Helvetica-Bold-iso ff 317.50 scf sf
+3780 6300 m
+gs 1 -1 sc (ECC k) col0 sh gr
+/Helvetica-Bold-iso ff 317.50 scf sf
+3780 4950 m
+gs 1 -1 sc (ECC 1) col0 sh gr
+/Helvetica-Bold-iso ff 285.75 scf sf
+10035 4950 m
+gs 1 -1 sc (e) col0 sh gr
+/Helvetica-Bold-iso ff 190.50 scf sf
+10215 5040 m
+gs 1 -1 sc (i, 1) col0 sh gr
+/Helvetica-Bold-iso ff 285.75 scf sf
+10665 4950 m
+gs 1 -1 sc (e) col0 sh gr
+/Helvetica-Bold-iso ff 190.50 scf sf
+10845 5040 m
+gs 1 -1 sc (i+1, 1) col0 sh gr
+/Helvetica-Bold-iso ff 317.50 scf sf
+4140 2160 m
+gs 1 -1 sc (...) col0 sh gr
+/Helvetica-Bold-iso ff 317.50 scf sf
+4050 5625 m
+gs 1 -1 sc (...) col0 sh gr
+/Helvetica-Bold-iso ff 285.75 scf sf
+4995 675 m
+gs 1 -1 sc (d) col0 sh gr
+/Helvetica-Bold-iso ff 190.50 scf sf
+5220 765 m
+gs 1 -1 sc (1, 1) col0 sh gr
+/Helvetica-Bold-iso ff 285.75 scf sf
+4995 1575 m
+gs 1 -1 sc (d) col0 sh gr
+/Helvetica-Bold-iso ff 190.50 scf sf
+5220 1665 m
+gs 1 -1 sc (1, 2) col0 sh gr
+/Helvetica-Bold-iso ff 285.75 scf sf
+4995 2835 m
+gs 1 -1 sc (d) col0 sh gr
+/Helvetica-Bold-iso ff 190.50 scf sf
+5220 2925 m
+gs 1 -1 sc (1, n) col0 sh gr
+/Helvetica-Bold-iso ff 285.75 scf sf
+4995 4950 m
+gs 1 -1 sc (e) col0 sh gr
+/Helvetica-Bold-iso ff 190.50 scf sf
+5175 5040 m
+gs 1 -1 sc (1, 1) col0 sh gr
+/Helvetica-Bold-iso ff 285.75 scf sf
+4995 6300 m
+gs 1 -1 sc (e) col0 sh gr
+/Helvetica-Bold-iso ff 190.50 scf sf
+5175 6390 m
+gs 1 -1 sc (1, k) col0 sh gr
+/Helvetica-Bold-iso ff 285.75 scf sf
+6435 675 m
+gs 1 -1 sc (...) col0 sh gr
+/Helvetica-Bold-iso ff 285.75 scf sf
+6435 1575 m
+gs 1 -1 sc (...) col0 sh gr
+/Helvetica-Bold-iso ff 285.75 scf sf
+6435 2835 m
+gs 1 -1 sc (...) col0 sh gr
+/Helvetica-Bold-iso ff 285.75 scf sf
+6435 4950 m
+gs 1 -1 sc (...) col0 sh gr
+/Helvetica-Bold-iso ff 285.75 scf sf
+6480 6300 m
+gs 1 -1 sc (...) col0 sh gr
+/Helvetica-Bold-iso ff 190.50 scf sf
+9765 2925 m
+gs 1 -1 sc (ns, n) col0 sh gr
+/Helvetica-Bold-iso ff 285.75 scf sf
+9585 2835 m
+gs 1 -1 sc (d) col0 sh gr
+/Helvetica-Bold-iso ff 285.75 scf sf
+9225 2835 m
+gs 1 -1 sc (...) col0 sh gr
+/Helvetica-Bold-iso ff 285.75 scf sf
+12960 675 m
+gs 1 -1 sc (...) col0 sh gr
+/Helvetica-Bold-iso ff 285.75 scf sf
+12960 1575 m
+gs 1 -1 sc (...) col0 sh gr
+/Helvetica-Bold-iso ff 285.75 scf sf
+15165 2790 m
+gs 1 -1 sc (padding) col0 sh gr
+/Helvetica-Bold-iso ff 285.75 scf sf
+12420 2700 m
+gs 1 -1 sc (CRC checksums) col0 sh gr
+/Helvetica-Bold-iso ff 190.50 scf sf
+12375 2925 m
+gs 1 -1 sc (\(see zoomed view below\)) col0 sh gr
+/Helvetica-Bold-iso ff 285.75 scf sf
+10350 3825 m
+gs 1 -1 sc (c) col0 sh gr
+/Helvetica-Bold-iso ff 190.50 scf sf
+10530 3915 m
+gs 1 -1 sc (y1,1) col0 sh gr
+/Helvetica-Bold-iso ff 285.75 scf sf
+11025 3825 m
+gs 1 -1 sc (c) col0 sh gr
+/Helvetica-Bold-iso ff 190.50 scf sf
+11205 3915 m
+gs 1 -1 sc (y1,2) col0 sh gr
+/Helvetica-Bold-iso ff 285.75 scf sf
+11745 3825 m
+gs 1 -1 sc (...) col0 sh gr
+/Helvetica-Bold-iso ff 285.75 scf sf
+12150 3825 m
+gs 1 -1 sc (c) col0 sh gr
+/Helvetica-Bold-iso ff 190.50 scf sf
+12330 3915 m
+gs 1 -1 sc (y1,n) col0 sh gr
+/Helvetica-Bold-iso ff 285.75 scf sf
+12825 3825 m
+gs 1 -1 sc (c) col0 sh gr
+/Helvetica-Bold-iso ff 190.50 scf sf
+13005 3915 m
+gs 1 -1 sc (y2,1) col0 sh gr
+/Helvetica-Bold-iso ff 285.75 scf sf
+13500 3825 m
+gs 1 -1 sc (c) col0 sh gr
+/Helvetica-Bold-iso ff 190.50 scf sf
+13680 3915 m
+gs 1 -1 sc (y2,2) col0 sh gr
+/Helvetica-Bold-iso ff 285.75 scf sf
+14220 3825 m
+gs 1 -1 sc (...) col0 sh gr
+/Helvetica-Bold-iso ff 285.75 scf sf
+14625 3825 m
+gs 1 -1 sc (c) col0 sh gr
+/Helvetica-Bold-iso ff 190.50 scf sf
+14805 3915 m
+gs 1 -1 sc (y2,n) col0 sh gr
+/Helvetica-Bold-iso ff 285.75 scf sf
+15345 3825 m
+gs 1 -1 sc (...) col0 sh gr
+/Helvetica-Bold-iso ff 285.75 scf sf
+15750 3825 m
+gs 1 -1 sc (c) col0 sh gr
+/Helvetica-Bold-iso ff 190.50 scf sf
+15930 3915 m
+gs 1 -1 sc (lss,1) col0 sh gr
+/Helvetica-Bold-iso ff 285.75 scf sf
+16515 3825 m
+gs 1 -1 sc (...) col0 sh gr
+/Helvetica-Bold-iso ff 285.75 scf sf
+16920 3825 m
+gs 1 -1 sc (c) col0 sh gr
+/Helvetica-Bold-iso ff 190.50 scf sf
+17100 3915 m
+gs 1 -1 sc (lss,n) col0 sh gr
+/Helvetica-Bold-iso ff 285.75 scf sf
+12960 6300 m
+gs 1 -1 sc (...) col0 sh gr
+/Helvetica-Bold-iso ff 285.75 scf sf
+13500 4950 m
+gs 1 -1 sc (...) col0 sh gr
+/Helvetica-Bold-iso ff 317.50 scf sf
+10980 0 m
+gs 1 -1 sc (dashed area: original .iso image) col0 sh gr
+% here ends figure;
+pagefooter
+showpage
+%%Trailer
+end
+%EOF

documentation/codec-specs/rs02-layout.fig

@@ -0,0 +1,236 @@
+#FIG 3.2  Produced by xfig version 3.2.5b
+Landscape
+Center
+Metric
+A4      
+100.00
+Single
+-2
+1200 2
+6 8280 4500 9900 5175
+2 2 0 1 0 7 50 -1 44 0.000 0 0 -1 0 0 5
+	 8280 4500 9900 4500 9900 5175 8280 5175 8280 4500
+4 0 0 50 -1 18 16 0.0000 4 210 1515 8370 4815 Ecc Header\001
+4 0 0 50 -1 18 16 0.0000 4 270 1410 8370 5085 2048 Bytes\001
+-6
+6 10350 2385 11970 3060
+2 2 0 1 0 7 50 -1 44 0.000 0 0 -1 0 0 5
+	 10350 2385 11970 2385 11970 3060 10350 3060 10350 2385
+4 0 0 50 -1 18 16 0.0000 4 210 1515 10440 2700 Ecc Header\001
+4 0 0 50 -1 18 16 0.0000 4 270 1410 10440 2970 2048 Bytes\001
+-6
+6 15795 450 16380 810
+4 0 0 50 -1 18 18 0.0000 4 210 180 15795 675 d\001
+4 0 0 50 -1 18 12 0.0000 4 180 390 15975 765 ls, 1\001
+-6
+6 15795 1350 16380 1710
+4 0 0 50 -1 18 18 0.0000 4 210 180 15795 1575 d\001
+4 0 0 50 -1 18 12 0.0000 4 180 390 15975 1665 ls, 2\001
+-6
+6 15750 6120 16380 6435
+4 0 0 50 -1 18 12 0.0000 4 180 390 15975 6390 ls, k\001
+4 0 0 50 -1 18 18 0.0000 4 150 165 15750 6300 e\001
+-6
+6 18495 4770 19080 5085
+4 0 0 50 -1 18 12 0.0000 4 180 390 18675 5040 ls, 1\001
+4 0 0 50 -1 18 18 0.0000 4 150 165 18495 4950 e\001
+-6
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 8280 225 8280 900
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 7515 225 7515 900
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 9765 225 9765 900
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 9045 1125 9045 1800
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 8280 1125 8280 1800
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 9765 1125 9765 1800
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 8280 3285 8280 3960
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 7515 2385 7515 3060
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 8280 4500 8280 5175
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 7515 5850 7515 6525
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 7515 4500 7515 5175
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 10620 4500 10620 5175
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 11340 4500 11340 5175
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 8280 2385 8280 3060
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 8280 5850 8280 6525
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 9045 5850 9045 6525
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 9765 5850 9765 6525
+2 1 0 0 0 7 51 -1 14 0.000 0 0 -1 0 0 2
+	 9045 225 9045 900
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 5625 225 5625 900
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 5625 1125 5625 1800
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 7515 1125 7515 1800
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 5625 4500 5625 5175
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 5625 5850 5625 6525
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 4950 2385 9045 2385 9045 3060 4950 3060 4950 2385
+2 3 1 3 0 7 50 -1 -1 8.000 0 0 -1 0 0 8
+	 4860 135 4860 3150 10395 3150 10395 1890 16560 1890 16560 90
+	 5265 135 4860 135
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 9045 2385 9045 3060
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 10350 2385 9045 2385 9045 3060 10350 3060 10350 2385
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 9540 2385 9540 3060
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 5625 2385 5625 3060
+2 3 0 3 0 7 51 -1 14 0.000 0 0 -1 0 0 13
+	 8280 0 8280 4095 9900 4410 9900 5310 8280 5715 8280 6795
+	 9045 6795 9045 5715 10620 5310 10620 4365 9045 4095 9045 0
+	 8280 0
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 4950 135 16470 135 16470 900 4950 900 4950 135
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 15705 225 15705 900
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 4950 1125 16470 1125 16470 1800 4950 1800 4950 1125
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 15705 1125 15705 1800
+2 2 2 1 0 7 50 -1 -1 3.000 0 0 -1 0 0 5
+	 15120 2385 16470 2385 16470 3060 15120 3060 15120 2385
+2 2 0 1 0 7 50 -1 45 0.000 0 0 -1 0 0 5
+	 11970 2385 15120 2385 15120 3060 11970 3060 11970 2385
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 10980 3375 10980 4050
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 11655 3375 11655 4050
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 12105 3375 12105 4050
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 13455 3375 13455 4050
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 14130 3375 14130 4050
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 14580 3375 14580 4050
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 15255 3375 15255 4050
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 15705 3375 15705 4050
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 16425 3375 16425 4050
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 16875 3375 16875 4050
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 11970 3060 10305 3375
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 15120 3060 17595 3375
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 12780 3375 12780 4050
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 10305 3375 17595 3375 17595 4050 10305 4050 10305 3375
+2 2 0 1 0 7 51 -1 16 0.000 0 0 -1 0 0 5
+	 10305 3375 12780 3375 12780 4050 10305 4050 10305 3375
+2 2 0 1 0 7 51 -1 12 0.000 0 0 -1 0 0 5
+	 12780 3375 15255 3375 15255 4050 12780 4050 12780 3375
+2 2 0 1 0 7 51 -1 16 0.000 0 0 -1 0 0 5
+	 15705 3375 17595 3375 17595 4050 15705 4050 15705 3375
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 4950 5850 16470 5850 16470 6525 4950 6525 4950 5850
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 15705 5850 15705 6525
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 4950 4500 19125 4500 19125 5175 4950 5175 4950 4500
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+	 18405 4500 18405 5175
+4 0 0 50 -1 18 18 0.0000 4 210 180 8460 675 d\001
+4 0 0 50 -1 18 12 0.0000 4 180 285 8640 765 i, 1\001
+4 0 0 50 -1 18 18 0.0000 4 210 180 9090 675 d\001
+4 0 0 50 -1 18 12 0.0000 4 180 510 9270 765 i+1, 1\001
+4 0 0 50 -1 18 18 0.0000 4 210 180 7560 675 d\001
+4 0 0 50 -1 18 12 0.0000 4 180 450 7785 765 i-1, 1\001
+4 0 0 50 -1 18 20 0.0000 4 240 975 3780 675 Data 1\001
+4 0 0 50 -1 18 18 0.0000 4 210 180 8460 1575 d\001
+4 0 0 50 -1 18 12 0.0000 4 180 285 8640 1665 i, 2\001
+4 0 0 50 -1 18 18 0.0000 4 210 180 9090 1575 d\001
+4 0 0 50 -1 18 12 0.0000 4 180 510 9270 1665 i+1, 2\001
+4 0 0 50 -1 18 18 0.0000 4 210 180 7560 1575 d\001
+4 0 0 50 -1 18 12 0.0000 4 180 450 7785 1665 i-1, 2\001
+4 0 0 50 -1 18 20 0.0000 4 240 975 3780 1575 Data 2\001
+4 0 0 50 -1 18 18 0.0000 4 210 180 8460 2835 d\001
+4 0 0 50 -1 18 12 0.0000 4 180 300 8640 2925 i, n\001
+4 0 0 50 -1 18 18 0.0000 4 210 180 7560 2835 d\001
+4 0 0 50 -1 18 12 0.0000 4 180 465 7785 2925 i-1, n\001
+4 0 0 50 -1 18 20 0.0000 4 240 1005 3780 2835 Data n\001
+4 0 0 50 -1 18 18 0.0000 4 150 165 8460 6300 e\001
+4 0 0 50 -1 18 12 0.0000 4 180 285 8640 6390 i, k\001
+4 0 0 50 -1 18 18 0.0000 4 150 165 9090 6300 e\001
+4 0 0 50 -1 18 12 0.0000 4 180 510 9270 6390 i+1, k\001
+4 0 0 50 -1 18 18 0.0000 4 150 165 7560 6300 e\001
+4 0 0 50 -1 18 18 0.0000 4 150 165 7560 4950 e\001
+4 0 0 50 -1 18 12 0.0000 4 180 450 7785 6390 i-1, k\001
+4 0 0 50 -1 18 12 0.0000 4 180 450 7785 5040 i-1, 1\001
+4 0 0 50 -1 18 20 0.0000 4 240 1845 7785 7200 ECC block i\001
+4 0 0 50 -1 18 20 0.0000 4 240 975 3780 6300 ECC k\001
+4 0 0 50 -1 18 20 0.0000 4 240 975 3780 4950 ECC 1\001
+4 0 0 50 -1 18 18 0.0000 4 150 165 10035 4950 e\001
+4 0 0 50 -1 18 12 0.0000 4 180 285 10215 5040 i, 1\001
+4 0 0 50 -1 18 18 0.0000 4 150 165 10665 4950 e\001
+4 0 0 50 -1 18 12 0.0000 4 180 510 10845 5040 i+1, 1\001
+4 0 0 50 -1 18 20 0.0000 4 45 270 4140 2160 ...\001
+4 0 0 50 -1 18 20 0.0000 4 45 270 4050 5625 ...\001
+4 0 0 50 -1 18 18 0.0000 4 210 180 4995 675 d\001
+4 0 0 50 -1 18 12 0.0000 4 165 330 5220 765 1, 1\001
+4 0 0 50 -1 18 18 0.0000 4 210 180 4995 1575 d\001
+4 0 0 50 -1 18 12 0.0000 4 165 330 5220 1665 1, 2\001
+4 0 0 50 -1 18 18 0.0000 4 210 180 4995 2835 d\001
+4 0 0 50 -1 18 12 0.0000 4 165 345 5220 2925 1, n\001
+4 0 0 50 -1 18 18 0.0000 4 150 165 4995 4950 e\001
+4 0 0 50 -1 18 12 0.0000 4 165 330 5175 5040 1, 1\001
+4 0 0 50 -1 18 18 0.0000 4 150 165 4995 6300 e\001
+4 0 0 50 -1 18 12 0.0000 4 180 330 5175 6390 1, k\001
+4 0 0 50 -1 18 18 0.0000 4 45 225 6435 675 ...\001
+4 0 0 50 -1 18 18 0.0000 4 45 225 6435 1575 ...\001
+4 0 0 50 -1 18 18 0.0000 4 45 225 6435 2835 ...\001
+4 0 0 50 -1 18 18 0.0000 4 45 225 6435 4950 ...\001
+4 0 0 50 -1 18 18 0.0000 4 45 225 6480 6300 ...\001
+4 0 0 50 -1 18 12 0.0000 4 135 465 9765 2925 ns, n\001
+4 0 0 50 -1 18 18 0.0000 4 210 180 9585 2835 d\001
+4 0 0 50 -1 18 18 0.0000 4 45 225 9225 2835 ...\001
+4 0 0 50 -1 18 18 0.0000 4 45 225 12960 675 ...\001
+4 0 0 50 -1 18 18 0.0000 4 45 225 12960 1575 ...\001
+4 0 0 50 -1 18 18 0.0000 4 270 1125 15165 2790 padding\001
+4 0 0 50 -1 18 18 0.0000 4 210 2265 12420 2700 CRC checksums\001
+4 0 0 50 -1 18 12 0.0000 4 180 2340 12375 2925 (see zoomed view below)\001
+4 0 0 50 -1 18 18 0.0000 4 150 165 10350 3825 c\001
+4 0 0 50 -1 18 12 0.0000 4 180 375 10530 3915 y1,1\001
+4 0 0 50 -1 18 18 0.0000 4 150 165 11025 3825 c\001
+4 0 0 50 -1 18 12 0.0000 4 180 375 11205 3915 y1,2\001
+4 0 0 50 -1 18 18 0.0000 4 45 225 11745 3825 ...\001
+4 0 0 50 -1 18 18 0.0000 4 150 165 12150 3825 c\001
+4 0 0 50 -1 18 12 0.0000 4 180 390 12330 3915 y1,n\001
+4 0 0 50 -1 18 18 0.0000 4 150 165 12825 3825 c\001
+4 0 0 50 -1 18 12 0.0000 4 180 375 13005 3915 y2,1\001
+4 0 0 50 -1 18 18 0.0000 4 150 165 13500 3825 c\001
+4 0 0 50 -1 18 12 0.0000 4 180 375 13680 3915 y2,2\001
+4 0 0 50 -1 18 18 0.0000 4 45 225 14220 3825 ...\001
+4 0 0 50 -1 18 18 0.0000 4 150 165 14625 3825 c\001
+4 0 0 50 -1 18 12 0.0000 4 180 390 14805 3915 y2,n\001
+4 0 0 50 -1 18 18 0.0000 4 45 225 15345 3825 ...\001
+4 0 0 50 -1 18 18 0.0000 4 150 165 15750 3825 c\001
+4 0 0 50 -1 18 12 0.0000 4 180 435 15930 3915 lss,1\001
+4 0 0 50 -1 18 18 0.0000 4 45 225 16515 3825 ...\001
+4 0 0 50 -1 18 18 0.0000 4 150 165 16920 3825 c\001
+4 0 0 50 -1 18 12 0.0000 4 180 450 17100 3915 lss,n\001
+4 0 0 50 -1 18 18 0.0000 4 45 225 12960 6300 ...\001
+4 0 0 50 -1 18 18 0.0000 4 45 225 13500 4950 ...\001
+4 0 0 50 -1 18 20 0.0000 4 315 5055 10980 0 dashed area: original .iso image\001

documentation/codec-specs/rs02.tex

@@ -0,0 +1,856 @@
+\newpage
+\section{The RS02 codec}
+
+This section describes the dvdisaster RS02 Reed-Solomon codec.
+It was developed during the winter of 2005/2006 in order to facilitate
+augmenting iso images directly with error correction data.
+
+RS02 is based on the Reed-Solomon encoders and decoders 
+introduced with RS01, but focuses exclusively on augmenting
+iso images. The allocation of data sectors within an ecc block 
+follows a similar scheme as in RS01. However the layout of the
+parity bytes is vastly different between RS01 and RS02, as the codec must
+cope with any parity sector being damaged or unreadable. 
+Consequently a RS02 image can lose as many sectors as 
+allowed by the redundancy of
+the error correction data, and the lost sectors can be any
+combination of data and parity sectors, as it is expected from
+a Reed-Solomon scheme.
+
+\smallskip
+
+Unlike RS01, which will be completely superseded by RS03 soon,
+the case of RS02 vs. RS03 still remains open, as both codecs
+have their individual strengths. RS02 is slightly more space
+efficient than RS03, so on CD media RS02 might provide
+slightly more redundancy (typically one additional root) than RS03. 
+This effect will be less
+pronounced on larger media like DVD and BD. 
+RS02 images can be augmented to an arbitrary size which may
+be smaller than the maximum medium size, while RS03 requires
+augmenting the image to the full medium size.
+This might favour RS02 for working on images which are only
+30\% or less of the medium size, as they can be encoded with
+less than the maximum of 170 roots 
+(the maximum redundancy requires lots of time to compute, producing
+a three-fold redundancy which may not be needed in all cases). 
+On the other hand RS03 will counter
+the performance argument since it can encode at least 
+20 times faster than RS02 on multi-core architectures, 
+because RS02 encoding can not be parallelized. 
+See the end of section \ref{rs01}  for a speed comparison of RS01 vs. RS03; 
+RS01 and RS02 are very similar performance-wise.
+Finally, the data layout of RS03 does not depend on interspersed
+ecc headers which gives it a better robustness over RS02;
+see subsection \ref{layout-logical-two} for details.
+
+\subsection{Physical layout}
+
+\begin{figure}
+ \begin{center}
+ \includegraphics[width=10cm]{spiral-rs02.eps}
+ \caption{Physical RS02 layout}
+ \label{layout-phy-two}
+ \end{center}
+\end{figure}
+
+RS02 must be applied to the .iso image before it is written to
+the medium. Additional sectors are appended to the .iso image 
+containing the parity data. The data structures of the .iso image
+are not changed to reflect the new image size, so the original
+part of the augmented .iso image remains untouched. The parity
+sectors can be removed from the augmented image by simply 
+truncating the .iso image to its original sector size; the resulting
+image file will have the same contents as prior to the augmentation.
+As a side effect, the parity data is invisible to applications reading
+the medium at the filesystem level, including most hardware media
+players. If you find a player which gets confused by media containing
+RS02 (or RS03) parity, please consider telling the dvdisaster project about it. As of this writing,
+not a single device has been reported to run into problems with
+the RS02 data scheme. The RS02 augmented image might conflict with
+optical media writing software, though. If the writing software
+decides the image length by looking at the iso filesystem structures,
+the parity data portion of the image might not be written to the medium.
+Most current writing programs do however measure the .iso image by examining
+its file size, and will transfer the parity data correctly. To be sure you
+should follow the steps described under ``Testing image compatibility''
+at the dvdisaster site (\url{https://web.archive.org/web/20180428070843/http://dvdisaster.net/en/howtos92.html}) once
+before using each version of your optical media authoring software.
+
+Like the other dvdisaster codecs, RS02 is based on a  RS(255,k) Reed-Solomon code
+with each ecc block being comprised of $n$ data bytes and $k$ parity bytes, and
+$n+k=255$. The $n$ data bytes comprise the .iso image which will be
+written to the medium, and the additional ecc header and CRC checksums added
+by dvdisaster. Reed-Solomon encoding works best when errors are
+distributed evenly over all ecc blocks. Therefore we must strive to distribute
+the ecc blocks evenly over the medium surface. To facilitate such mapping,
+dvdisaster logically divides the medium into 255 logical units which are called
+``layers'' for historical reasons. 
+Figure \ref{layout-phy-two} shows how the medium is divided into $n$ data layers
+and $k$ ecc layers, with $n + k = 255$. Ecc blocks are
+created by taking on byte from each layer as shown in fig. \ref{layout-logical-two}
+on the following page. This distributes the ecc block reasonably good over
+the medium surface. 
+All layers have the same length in bytes, with the possible exception of
+data layer $n$. As the .iso image size plus the size of one ecc header and the CRC data
+is usually not a multiple of the layer size, the $n$-th data layer may be shorter
+than the layer size and considered to be filled up with a virtual zero padding. 
+The zero padding is not written out to the augmented image (note that data layer $n$
+is intentionally drawn shorter in fig. \ref{layout-phy-two}), but it is used in the
+calculation of the respective parity bytes.
+
+\newpage
+
+\subsection{Logical layout}
+\label{sec-layout-logical-two}
+
+\begin{figure}
+ \begin{center}
+ \includegraphics[width=\textwidth]{rs02-layout.eps}
+ \caption{Logical RS02 layout}
+ \label{layout-logical-two}
+ \end{center}
+\end{figure}
+
+The data layout in the augmented image is shown in figure \ref{layout-logical-two}.
+Note that in this figure the data is byte-indexed; e.g. $d_{1,1}$ denotes the
+first data byte in the augmented image. Each layer has a length of
+$ls$ bytes, with the exception of data layer $n$ which may be shortened (see subsection \ref{calc-two} for an exact calculation of its size). 
+Some ecc layers my be interleaved with redundant copies of the ecc header. 
+The ecc header size is not included in the respective ecc layer size.
+
+\paragraph{Data layers.} A data layer index $d_{i,j}$ refers to the $i$-th byte in the $j$-th data layer.
+The $n$ data layers are mapped in a linear fashion to the original iso image.
+$d_{1,1}$ maps to the first .iso image byte, and $d_{ns,n}$ maps to the last .iso image
+byte ($ns$ is the number of remaining iso image bytes in the $n$-th data layer). 
+
+The last data layer is special because it does not only contain the rest of the iso image,
+but also the ecc header and the CRC checksums. These extensions 
+are logically treated as a part of the iso image; their contents are used in the
+ecc data calculation and are therefore protected by the ecc data.
+The ecc header follows immediately after byte $d_{ns,n}$ and is 4096 bytes long.
+Its format is described in appendix \ref{eh}. For RS02, only the data fields
+marked with ``all'' or ``RS02'' are relevant; all other fields should be set to zero.
+
+Data layer $n$ does also contain the CRC32 checksums of each data sector
+up to the ecc header. If the .iso image contains $s$ sectors,
+then the CRC field contains $4s$ bytes, rounded up
+to the nearest multiple of 2048. 
+CRC32 checksums are calculated over a whole CD sector comprising 2048 bytes.
+Let $c_{y,j}$ be the 4-byte checksum of the $y$-th sector in the $j$-th layer
+and $lss$ be the number of sectors in each layer.
+Then $c_{y,j}$ = CRC32($d_{2048*y,j}$, $d_{2048*y+1,j}$, \dots, $d_{2048*y+2047,j}$).  
+ 
+$y_1$ is usually not the first sector in the layer, but a later sector.
+In general, $y_i$ = $(i+offset)$ mod $lss$. The offset is introduced to restore
+the CRC32 sums of ecc block $i+1$ during the correction of ecc block $i$.
+This helps if the data portion of the image is corrupted with wrong byte values and
+the sectors containing the CRC32 sums have been lost. 
+The error correction will start at the ecc block $i$ which is determined
+by the offset, and whose CRC32 checksums are stored in the ecc header (at least one
+ecc header will be recovered before any error correction can begin). Correcting
+ecc block $i$ will recover the CRC32 checksums for ecc block $i+1$ in the image
+(and possibly some more in advance, as less than 2048 bytes are required for
+one set of checksums). This makes it possible to detect corrupted bytes by the
+checksums and flag them as erasures which effectively doubles the error correction
+capabilities of the Reed-Solomon code.
+
+\paragraph{Ecc layers.} For an image augmented with $k$ roots, the parity bytes
+will be spread over $k$ ecc layers. In order to calculate the first ecc block,
+bytes $d_{1,1}$ to $d_{1,n}$ are taken from the $n$ data layers. The RS(255,k) code
+is calculated (see appendix \ref{rs} for its parameters) and the resulting $k$
+parity bytes $e_{1,1}$ to $e_{1,k}$ are stored in the $k$ ecc layers. 
+The next ecc blocks are calculated and stored accordingly; ecc block $i$ 
+is marked grey in the figure.
+Care must be taken to honour the non-linear mapping of
+ecc layer bytes as the ecc area is interleaved with 20-40 copies of the ecc header.
+The ecc header copies are placed at sector addresses whose numbers 
+are large powers of two. This makes it possible to heuristically search for them
+during the decoding boot-strap process 
+when no other information (image size, layer size, etc.) is yet available.
+See section \ref{search-two} on the search heuristics and section \ref{addressing-two}
+on calculating ecc bytes positions from the non-linear mapping. 
+
+\subsection{Calculating the image layout for encoding}
+
+The image layout can be either computed automatically to fill up
+the medium as much as possible, or by user selected criteria such
+as a maximum image size or a specified redundancy.
+
+\subsubsection{Automatic layout calculation}
+\label{calc-two}
+
+The only available inputs to automatic layout detection are
+the .iso image size and a table of maximum media sizes (see
+tab. \ref{layout-size-table} in the RS03 section for the
+respective values). From the media size table the smallest
+possible medium  is chosen which can contain the .iso image.
+In some border cases, with e.g. the .iso image being only
+100 sectors smaller than the medium capacity, the automatic
+layout calculation will fail later due to insufficient space
+on the medium. In such cases, the user must decide between
+choosing the next larger medium size or splitting the image
+contents onto two media by himself (splitting a 700MiB CD image 
+onto two CDs may be better than writing it to a DVD).
+
+\smallskip
+
+From now on, all calculations are given in numbers of 2048K 
+sectors or sectors addresses
+unless noted otherwise. The number of sectors required for the
+CRC checksums can be directly computed from the .iso image size:
+
+\[
+crc\; sectors = \left\lceil\frac{4 * iso\; image\; sectors}{2048}\right\rceil
+\]
+
+The total accumulated size of all data layers is the sum of the
+.iso image size, the number of crc sectors and the two sectors required
+for the ecc header. Since these sectors are protected by the parity,
+they are called {\em protected sectors}:
+
+\[protected\; sectors = iso\; image\; size + 2 + crc\; sectors\]
+ 
+These calculations also produce two important sector addresses within
+the augmented image:
+
+\begin{itemize}
+\item The sector with address {\em iso image size} marks the location
+of the ecc header; and
+\item The sector at address $iso\; image\; size + 2$ marks the beginning
+of the CRC checksum data.
+\end{itemize}
+
+The next step is to partition the {\em protected sectors} and the remaining
+medium space into an optimal layer size. It is carried out iteratively.
+
+\smallskip
+
+For an approximate start, we determine the free space on the medium:
+
+\[free\; space = medium\; capacity - protected\; sectors\]
+
+and estimate a preliminary value for the number of roots and data layers:
+
+\[k\; roots = min\left(170, \quad\left\lfloor\frac{255 * free\; space}{medium\; capacity}\right\rfloor\right)\]
+
+\[n\; data = 255 - k\; roots\]
+
+The maximum number of roots is capped at 170 which is approximately a three-fold
+redundancy. Larger values would get too computationally expensive.
+
+\smallskip
+
+The preliminary layer size is then:
+
+\[preliminary\; layer\; size = \left\lceil\frac{protected\; sectors}{n\; data}\right\rceil\]
+
+and the expected size of the parity layers is:
+
+\[preliminary\; ecc\; size = k\; roots * preliminary\; layer\; size\]
+
+\smallskip
+
+% TODO: implement in codec
+\begin{comment}
+
+From these values we iteratively compute a $2^p$ which has about 20-40 multiples
+in the {\em preliminary ecc size} address space. This value will be used
+for interleaving the ecc header copies with the ecc layers:
+
+\smallskip
+
+{\tt
+p := 5
+
+while($\frac{preliminary\;ecc\;size}{2^p} > 40$)
+
+\quad p := p + 1}  
+\end{comment}
+
+From these values we compute a $2^p$ which has about 20-40 multiples
+in the {\em preliminary ecc size} address space. This value will be used
+for interleaving the ecc header copies with the ecc layers:
+
+\[ p = \left\lceil log_2\; \frac{preliminary\;ecc\;size}{40} \right\rceil \]
+
+%\[ p = \left\lceil \frac{log\; \frac{preliminary\;ecc\;size}{40}}{log\; 2} \right\rceil \]
+
+
+\smallskip
+
+Now the chosen values might be actually too big since we haven't taken
+the ecc header copies into account. 
+So the final task is to add up the number pf parity sectors and ecc header
+copies. If these fit into the free medium space, we are done; otherwise
+the calculations are done again with one root less.
+
+\newpage
+
+\bigskip
+
+while($n\; roots > 7$)
+
+\smallskip
+
+\quad $layer\; size := \left\lceil\frac{protected\; sectors}{n\; data}\right\rceil$
+
+\smallskip
+
+\quad $ecc\; size := n\; roots * layer\; size$
+
+\smallskip
+
+\quad $first\; ecc\; header\; repeat\; addr := \left\lceil\frac{protected\; sectors}{2^p}\right\rceil * 2^p$ 
+
+\smallskip
+
+\quad $space\; for\; interleaved\; sectors := protected\; sectors + ecc\; size - first\; ecc\; header\; repeat\; addr$
+
+\smallskip
+
+\quad $number\; of\; ecc\; copies := \left\lfloor\frac{space\; for\; interleaved\; sectors}{2^p - 2}\right\rfloor + 1$
+
+\smallskip
+
+\quad $total\; added\; sectors := 2 + crc\; sectors + ecc\; size + 2 * number\; of\; ecc\; copies$
+
+\medskip
+
+\quad If $iso\; image\; sectors + total\; added\; sectors < medium\; size$,
+we have a valid layout: STOP.
+
+\smallskip
+
+\quad Otherwise, set $n\; roots := n\; roots - 1$ and $n\; data := 255 - n\; roots$
+and do another iteration. 
+
+\medskip
+
+The iteration will either terminate with a valid layout or fail when
+$n\; roots$ drops below the minimum redundancy of 8 roots. 
+
+\subsubsection{Layout calculation by user selected criteria}
+
+The user has several means of specifying a certain redundancy:
+
+\paragraph{Specifying the maximum number of sectors for the augmented image.}
+
+This case is simply handled by setting {\em medium capacity} to the user
+selected sector size rather than using the maximum medium size from the
+built-in table. Afterwards, calculations continue as described in
+section \ref{calc-two}.
+
+\paragraph{Specifying the number of roots to use.}
+
+In this case we can skip the calculations for {\em free space} and
+{\em k roots} as described in section \ref{calc-two}, and instead
+set {\em k roots} directly to the user selected value. Then the
+layout calculation proceeds as usual. 
+
+\paragraph{Specifying the percentage of redundancy to use.}
+
+For a given number of {\em k roots}, the resulting redundancy in percent is:
+
+\[\frac{k\; roots \cdot 100}{255 - k\; roots}\]
+
+Pick a suitable value for {\em k roots} so that the user selected value
+is met or slightly exceeded. Proceed with the given number of roots
+as described in the previous paragraph.
+
+\subsubsection{Layout calculation from ecc header information}
+\label{recalc-layout-header-two}
+
+In a given ecc header struct {\em eh}, the number of sectors in the .iso
+image is recorded as \mbox{\em eh-$>$sectors} 
+and the number of roots is contained in \mbox{\em eh-$>$eccBytes}.
+Calculation of the layout is done as shown in section \ref{calc-two}, 
+with the exception of omitting the calculation for {\em free space} and
+setting {\em k roots} directly to  \mbox{\em eh-$>$eccBytes}.
+
+\subsection{Automatic layout calculation example}
+\label{example-two}
+
+Let's assume we are going to encode an .iso image of 295.000 sectors.
+This is well below the CD medium capacity of 359.424 sectors, so we
+start with:
+
+\smallskip
+
+$medium\; capacity = 359.424\; sectors$
+
+$iso\; image\; size = 295.000\; sectors$
+
+\medskip
+
+The number of CRC sectors will be:
+
+\smallskip
+
+$crc\; sectors = \left\lfloor\frac{4 * 295.000}{2.048}\right\rfloor = 577\; sectors$
+
+\medskip
+
+The total size of all data layers is:
+
+$protected\; sectors = 295.000 + 2 + 577 = 295.579\; sectors$
+
+\bigskip
+
+The next step is creating some preliminary starting values:
+
+\smallskip
+
+$free\; space = 359.424 - 295.579 = 63.845\; sectors$
+
+\smallskip
+
+$k\; roots = min\left(170, \left\lfloor\frac{255* 63.845}{359.424}\right\rfloor\right) = min(170, 45) = 45\; roots\; (or\; layers)$
+
+\smallskip
+
+$n\; data = 255 - 45 = 210\; layers$
+
+\bigskip
+
+Now some more preliminary values can be computed:
+
+\smallskip
+
+$preliminary\; layer\; size = \left\lceil\frac{295.579}{210}\right\rceil = 1.408\; sectors$
+
+\smallskip
+
+$preliminary\; ecc\; size = 45 * 1.408 = 63.360\; sectors$
+
+\bigskip
+
+Finally, we compute $p = 11$ since $\frac{63360}{2^{11}} = 30,9$.
+
+\bigskip
+
+Now the chosen values must be verified to produce a layout which is
+still smaller than the image size. We compute (the first two values are already known):
+
+\medskip
+
+$layer\; size = \left\lceil\frac{295.579}{210}\right\rceil = 1.408\; sectors$
+
+\smallskip
+
+$ecc\; size = 45 * 1.408 = 63.360\; sectors$
+
+\smallskip
+
+$first\; ecc\; header\; repeat\; addr = \left\lceil\frac{295.579}{2048}\right\rceil * 2048 = 296.960$
+
+\smallskip 
+
+$space\; for\; interleaved\; sectors = 295.579 + 63.360 - 296.960 = 61.979\; sectors$
+
+\smallskip
+
+$number\; of\; ecc\; copies = \left\lfloor\frac{61.979}{2048-2}\right\rfloor + 1 = 31\; header\; repeats$
+
+\smallskip
+
+$total\; added\; sectors = 2 + 577 + 63.360 + 2 * 31 = 64.001\; sectors$
+
+\medskip
+
+This layout will generate an augmented image containing
+$295.000 + 64.001 = 359.001$ sectors which is 
+less than the medium capacity of 359.424 sectors
+and therefore accepted.
+
+\subsection{Re-calculating the layout from defective media}
+\label{search-two}
+
+In order to recover a defective medium, at least one ecc header must
+remain readable and be located by the following heuristic. This
+is a major difference to RS03, which has more and different means
+for bootstrapping the recovery (see section \ref{recover} for details).
+Once one ecc header has been recovered, the ecc data layout can be
+calculated as described in section \ref{recalc-layout-header-two}.
+From this point, the error correction is done using the parameters
+and data described in section \ref{encoding-two}.
+
+\smallskip
+
+If the medium is not damaged or only slightly damaged, the following
+short cut might work: The size of the .iso image can be determined
+from the iso file system header. Then the ecc header immediately
+following the .iso image part of the augmented image is either
+located at sector number $iso\;image\;size$ or $iso\;image\;size + 150$.
+The latter case arises because some popular CD authoring software
+appends 150 padding sectors to any .iso image it creates. 
+
+\smallskip
+
+If the short cut does not work due to the required sectors being damaged,
+the following strategy is employed. The size of the augmented image
+can always be determined; it can either be queried from the drive or
+it is the file size of a file-based image. Then apply the following
+algorithm:
+
+\bigskip
+
+$p = \left\lfloor log_2(image\; size)\right\rfloor$
+
+while $p > 32$
+
+\quad $pos = \left\lfloor\frac{image\; size}{2^p}\right\rfloor \cdot 2^p$
+
+\smallskip
+
+\quad while $pos > 0$
+
+\qquad if {\em sector at pos} is a valid ecc header: STOP.
+
+\qquad if {\em sector at pos} is unreadable, set $pos := pos - 2^p$ .
+
+\hspace*{13mm} Continue with inner while loop.
+
+\qquad if {\em sector at pos} is readable and not a ecc header, set $p := p -1$ .
+
+\hspace*{13mm} Continue with outer while loop.
+
+\bigskip
+
+In order to test for a valid ecc header, check that {\em ec-$>$cookie}
+equals the 16-byte string ``*dvdisaster*RS02''. Then check that the
+CRC32 sum of the ecc header matches the value recorded in {\em eh-$>$selfCRC},
+with {\em eh-$>$selfCRC} set to the byte sequence 0x47,0x50,0x4c,0x00
+for the purpose of calculating the CRC32 sum.
+
+\medskip
+
+Please notice that during testing of the sectors at multiples of $2^{(p-1)}$,
+all sectors previously tested for $2^p$ will be examined again. It is therefore
+highly recommended to cache results from previous iterations of the outer
+while loop, especially when reading sectors from the optical medium.
+
+
+
+\subsection{Sector addressing and initialization scheme}
+\label{addressing-two}
+
+For encoding and decoding purposes it is required to retrieve the
+{\em i-th} sector from the {\em j-th} data or ecc layers, e.g. to calculate
+the corresponding sector number in the augmented image. 
+The reverse calculation is also needed, e.g. to calculate the
+corresponding layer and sector index for a given sector number
+in the augmented image.
+
+\smallskip
+
+Bear in mind that as shown in figure \ref{layout-logical-two}, an augmented image 
+is divided into two logical parts. There is a data area containing 
+the .iso image contents, the first ecc header and the CRC checksums.
+The data area is protected by the parity in the ecc area, which contains
+the parity data interleaved with copies of the ecc header. 
+
+\smallskip
+
+In order to carry out the calculations described below, the following
+values from the layout calculation (see section \ref{calc-two} are required:
+
+\bigskip
+
+\begin{tabular}{lp{10cm}}
+{\em protected sectors} & the size of the data part in sectors \\
+{\em layer size} & the number of sectors per layer \\
+{\em $2^p$} & the modulo value for locating ecc header copies \\
+\end{tabular}
+
+\paragraph{Converting (layer, sector index) pairs into image sector numbers.}
+
+The {\em i-th} sector of data layer {\em j} has the following address $s$ in the image:
+
+\[s = j \cdot layer\; size + i\]
+
+If $s >= protected\; sectors$, $s$ is a padding sector which must not be read 
+from the image file, but created in memory (see the paragraph on initialization below).
+
+\bigskip
+
+To calculate the sector address $es$ of the {\em i-th} sector from the {\em j-th} 
+ecc layer, the non-linear mapping of the ecc sectors has to be taken into account.
+The index of the first interleaved ecc header is:
+
+\[ first\; interleaved = \left\lceil\frac{protected\; sectors}{2^p}\right\rceil \cdot 2^p\]
+
+Since {\em protected sectors} is equal to the address of the first ecc sector in the image,
+the amount of ecc sectors before the first interleaved ecc header is:
+
+\[ base\; ecc\; sectors = first\; interleaved - protected\; sectors\]
+
+The ecc sector we are looking for would have the following index if ecc
+sectors were linearly mapped:
+
+\[ ecc\; index = j \cdot layer\; size + i\]
+
+If {\em ecc index $<$ base ecc sectors}, $es$ = {\em protected sectors} + {\em ecc index}.
+Otherwise, the non-linear mapping must be taken into account. The number of interleaved
+ecc headers before the (currently unknown) sector position $es$ is:
+
+\[ interleaved\; headers = \left\lfloor\frac{ecc\; index - base\; ecc\; sectors}{2^p - 2}\right\rfloor \]
+
+Therfore the position of the ecc sector in the augmented image is:
+
+\[ es = protected\; sectors + ecc\; index + 2 \cdot interleaved\; headers + 2 \] 
+
+\paragraph{Example.} To continue the example from section \ref{example-two}, the
+position of the 17th ecc sector in the 3rd ecc layer shall be computed. The relevant
+layout values are:
+
+\smallskip
+
+\begin{center}
+\begin{tabular}{rll}
+{\em protected sectors} & = & 295.579 \\
+{\em layer size} & = & 1.408 \\
+{\em $2^p$} & = & 2.048 \\
+\end{tabular}
+\end{center}
+
+The first interleaved ecc header is at position:
+
+\[ first\; interleaved = \left\lceil\frac{295.579}{2.048}\right\rceil \cdot 2.048 = 296.960 \]
+
+Before the first interleaved ecc header,
+
+\[ base\; ecc\; sectors = 296.960 - 295.579 = 1.381 \]
+
+ecc sectors have been stored. The linear index of the sought ecc sector is:
+
+\[ ecc\; index = 3 \cdot 1.408 + 17 = 4.241 \]
+
+Since 4.241 $\ge$ 1.381, the embedded ecc headers must be taken into account. There are
+
+\[ interleaved \; headers = \left\lfloor\frac{4.241 - 1.381}{2.048-2}\right\rfloor = 1 \]
+
+interleaved ecc headers, each containing 2 physical sectors. Therefore the position
+of the sought ecc sector in the image is:
+
+\[ es = 295.579 + 4.241 + 2 + 2 = 299.824 \]
+
+\bigskip
+
+{\bf Converting image sector numbers into (layer, sector index pairs).}
+
+\smallskip
+
+If the sector number $s$ $<$ {\em protected sectors}, the sector will map to the data part
+as follows:
+
+\[layer = \left\lfloor s\; /\; layer\;size \right\rfloor\]
+\[i = s \bmod layer\;size\]
+
+Otherwise, the mapping to the ecc part is calculated as follows. The index of the first interleaved ecc header is:
+
+\[ first\; interleaved = \left\lceil\frac{protected\; sectors}{2^p}\right\rceil \cdot 2^p\]
+
+If $s\; mod\; 2^p \le 1$, the sector maps to the {\em n-th} interleaved ecc header, with:
+
+\[n = \left\lfloor\frac{s - first\; interleaved}{2^p}\right\rfloor\] 
+
+If $s < first\; interleaved$, the sector is an ecc parity sector with the following mapping:
+
+\[ layer = \left\lfloor(s - protected\; sectors)\; /\; layer\; size\right\rfloor\]
+\[ i = (s - protected\; sectors)\; mod\; layer\;size\]
+
+If $s \ge first\; interleaved$, the mapping of the ecc parity sector is calculated as follows:
+
+The amount of ecc sectors before the first interleaved ecc header is:
+
+\[ base\; ecc\; sectors = first\; interleaved - protected\; sectors\]
+
+The number of interleaved ecc headers before sector $s$ is:
+
+\[ interleaved\; headers = \left\lfloor\frac{s - first\; interleaved - 2}{2^p}\right\rfloor \]
+
+If ecc sectors were mapped linearly, then $s$ had the linear index:
+
+\[ ecc\; index = s - protected\; sectors - 2 \cdot interleaved\; headers - 2\]
+
+Finally, this means that $s$ maps to the following parity sector:
+
+\[ layer = \left\lfloor ecc\; index\; /\; layer\; size\right\rfloor \]
+\[ i = ecc\;index \bmod layer\; size \]
+
+\paragraph{Padding sectors.} Let {\em iso image size} be the size of the
+.iso image prior to augmenting it with error correction data. In order
+to augment the image with error correction sectors, the following
+sectors are treated as padding sectors which are filled with zeroes:
+
+\begin{itemize}
+\item All sectors $s$ $>$ {\em protected sectors}.
+\item The first ecc header (sectors $iso\; image\; size$ and $iso\; image\; size+1$).
+\end{itemize}
+ 
+The first ecc header sectors must be treated as padding to break a circular
+dependency with the parity bytes; as the ecc header contains a md5 sum over
+all parity bytes, it can not be used as input for the parity generation.
+
+\subsection{Encoding the checksums}
+\label{crc-two}
+
+For each sector of the .iso image a CRC32 checksum is calculated and stored in the
+data part of the augmented image (see fig. \ref{layout-logical-two}). By using the
+conventions of section \ref{sec-layout-logical-two}, let $d_{i,j}$ be the $i$-th byte
+of the $j$-th data layer and $c(y,j)$ the 4-byte checksum of the $y$-th sector
+in the $j$-th data layer. Then $c(y,j)$ = CRC32($d_{2048*y,j}$, $d_{2048*y+1,j}$, \dots, $d_{2048*y+2047,j}$).  
+
+\smallskip
+
+Let $first\; layer\; crc\; idx = (iso\; image\; size + 2) \bmod layer\; size$. 
+
+$n$ is the number of data layers.
+
+\smallskip
+
+A total of $\left\lceil\frac{iso\; image\; size}{512}\right\rceil$ sectors holding the
+CRC32 checksums must be generated. The checksums are sorted by the layer sector $y$ first, 
+then by layer number $i$. So for each layer sector $y$, there is a block of $n$ checksums generated,
+and there are $layer\; size$ blocks of checksums total. Checksum generation does not start with
+layer sector $0$, but rather with layer sector $first\; layer\; crc\; idx$. Subsequent blocks
+are generated in ascending layer sector order {\em modulo layer size} so that all
+{\em layer  size} layer sector positions are eventually covered. 
+This scheme produces the following
+sequence of checksums: 
+
+\medskip
+
+\begin{tabular}{l}
+$c((first\; layer\; crc\; idx + 1) \bmod layer\; size, \quad 1)$\\
+$c((first\; layer\; crc\; idx + 1) \bmod layer\; size, \quad 2)$\\
+\dots\\
+$c((first\; layer\; crc\; idx + 1) \bmod layer\; size, \quad n)$\\
+\hline
+\end{tabular}
+
+\begin{tabular}{l}
+
+$c((first\; layer\; crc\; idx + 2) \bmod layer\; size, \quad 1)$\\
+$c((first\; layer\; crc\; idx + 2) \bmod layer\; size, \quad 2)$\\
+\dots\\
+$c((first\; layer\; crc\; idx + 2) \bmod layer\; size, \quad n)$\\
+\hline
+\end{tabular}
+
+\begin{tabular}{l}
+\dots\hspace*{81mm}\\[1mm]
+\hline
+\end{tabular}
+
+\begin{tabular}{l}
+$c((first\; layer\; crc\; idx + layer\; size -1) \bmod layer\; size, \quad 1)$\\
+$c((first\; layer\; crc\; idx + layer\; size -1) \bmod layer\; size, \quad 2)$\\
+\dots\\
+$c(first\; layer\; crc\; idx \bmod layer\; size, \quad n-1^*)$\\
+\hline
+\end{tabular}
+
+\begin{tabular}{l}
+$c(first\; layer\; crc\; idx \bmod layer\; size, \quad 1)$\\
+$c(first\; layer\; crc\; idx \bmod layer\; size, \quad 2)$\\
+\dots\\
+$c(first\; layer\; crc\; idx \bmod layer\; size, \quad n-1^*)$\\
+\end{tabular}
+
+\bigskip
+
+$^{*)}$ The last sectors of each data layer may be padding sectors. For those padding
+sectors, {\em no} CRC32 checksums are generated and stored (e.g. the number of
+generated checksums is always exactly {\em iso image size}).
+
+Since {\em iso image size} is usually not a multiple of 512, the last sector in
+the data part may only be partially filled with checksum data. The remaining
+bytes of this sector must be filled with the repeated byte sequence
+0x47,0x50,0x4c,0x00 which is the ASCII string representation of the text ``GPL''.
+
+\smallskip
+
+A copy of the CRC32 sums for the layer sectors at position ($first\; layer\; crc\; idx \bmod layer\; size$)
+is stored in the ecc header, starting there at byte position 2048. This has the advantage that
+the CRC checksums are already available for the {\em first layer crc}-th sectors
+of data layers $1,\ldots,n$. Any corrupted bytes in those sectors are
+detected by the CRC32 and can be handled by the error correction in erasure mode,
+saving precious parity bytes. When the error correction has restored all sectors
+of the {\em first layer crc}-th ecc block, note that the {\em first layer crc}-th
+sector of data layer $n$ will contain the CRC32 checksums for the data sectors 
+in the next ecc block ({\em first layer crc + 1}). Therefore the layout is robust
+against loss of CRC sectors as they are restored by the error correction just
+before they are actually needed.
+
+\subsection{Encoding the ecc layers}
+\label{encoding-two}
+
+Encoding the ecc layers requires the following steps:
+
+\medskip
+
+First the image must be examined whether it does already contain
+augmented ecc data (either RS02 or RS03). If ecc data is found, the
+image must be stripped to the original size of the .iso image. 
+Nesting ecc data is not supported by the current codecs and it
+might derail the heuristics for detecting the augmented data
+properly. From a technical point, nesting ecc data does not
+make sense either.
+
+\medskip
+
+Next the image must be checked for missing sectors, and be rejected
+if it is incomplete. Producing and
+writing images with missing sectors to a medium is
+confusing to the user as dvdisaster will always report 
+the medium as partially readable even though it does not contain
+any physical defects. Also the error correction will never
+succeed for such media as it is just restoring the sector
+in its missing  state. 
+During the check for missing sectors the CRC32 checksums 
+of each sector can be computed as described in section \ref{crc-two} and, 
+after writing a placeholder for the first ecc header, be appended to the image.
+Also, the MD5 sum of the .iso image can be calculated at this time and
+kept for insertion into the ecc header field {\em ec-$>$mediumSum}.
+As another step of preparation, enough space should be appended
+to the image to store the ecc layer sectors. This makes sure
+that the encoder does not run out of disk space during
+its potentially lenghty work, and minimizes the impact of
+fragmentation due to random writes into the appended 
+image area under most file systems.
+
+\medskip
+
+Finally, the error correction information needs to be encoded.
+Please refer to fig. \ref{layout-logical-two} on the location
+of the bytes comprising an error correction block.
+Although the ecc blocks could be encoded by a byte-wise scheme, 
+a possible encoding algorithm would preferably buffer at least the 
+255 sectors holding the required data for 2048 subsequent ecc
+blocks, and process those in bulk. From the first $n$ data layers,
+the required bytes are retrieved and fed into the RS(255,k)
+Reed-Solomon encoder, with $k = 255 -n$. The RS(255,k) encoder 
+is the same for RS01, RS02 and RS03. See
+appendix \ref{rs} for the parameters used in the encoder.
+ 
+Please refer to
+the previous section on information about zeroed-out and
+zero-padded data sectors. The resulting $k$ parity bytes
+are distributed into the $k$ ecc layers. When writing out
+the ecc data into the image, free gaps must be left for
+the interleaved ecc headers; see section
+\ref{addressing-two} for information on calculating the
+interleaved ecc header positions. At this time, the MD5
+sums of each ecc layer can be updated incrementally. 
+
+\medskip
+
+When all parity sectors have been calculated, the ecc headers
+can be completed by filling in their {\em eh-$>$eccSum} field.
+This field contains the MD5 sum calculated over the MD5 sums
+over each of the $k$ ecc layers. In contrast to a single MD5
+sum spanning the ecc layers in a linear fashion, this
+approach allows for an incremental calculation of the MD5 sum
+while the ecc data is generated and written out. 

documentation/codec-specs/rs03.tex

@@ -0,0 +1,361 @@
+\section{The RS03 codec}
+
+\begin{figure}
+ \begin{center}
+ \includegraphics[width=10cm]{spiral-rs03.eps}
+ \caption{Physical RS03 layout}
+ \label{layout-phy}
+ \end{center}
+\end{figure}
+
+This section describes the data format of the dvdisaster RS03 Reed-Solomon codec.
+RS03 can store parity data either in a separate file or append it to the .iso
+image on the same medium. In contrast to its predecessors RS03 is fully multi-threadable.
+RS03  is expected to become the default codec soon after its introduction in 
+dvdisaster 0.80.
+
+\subsection{Physical layout}
+
+Optical media are recorded as a single long spiral\footnote{Multiple layered
+media contain one spiral for each physical layer, but are otherwise conceptually
+identical.} of sectors which are indexed beginning with 0. 
+The first sector lies at the innermost position of the spiral and 
+numbering continues onward to the outside of the spiral.
+
+Reed-Solomon encoding works best when errors are evenly distributed over
+all ecc blocks. Therefore we must strive to spread our ecc blocks evenly over
+the media surface. To facilitate such distribution, dvdisaster logically
+divides the medium into 255 units which are called ``layers'' for historical reasons.
+Figure \ref{layout-phy} illustrates how a medium is divided into $n$ data layers,
+one CRC layer, and $m$ ecc layers, with $n+m+1 = 255$. Ecc blocks are comprised
+by taking one byte from each layer as shown in fig. \ref{layout-logical} on 
+the following page.
+This distributes the ecc block reasonably good 
+over the medium surface.
+
+Layer size is measured in numbers of sectors which are 2048 bytes in size. All
+255 layers have the same size. The data layers map exactly 
+to the iso image which is to be protected by dvdisaster; 
+e.g. the number and sequence of sectors in $Data_1,\ldots,Data_n$
+is the same as in the iso image. Two extra sectors are appended to the ISO image
+holding the ecc header ``EH''; these are logically treated as a part of the ISO image.
+If the ISO image size plus the two EH headers is not an integer multiple
+of the layer size, the last (n-th) data layer will be padded accordingly.  
+
+The data layers are followed by a CRC layer. Each CRC layer sector contains a
+data structure holding CRC32 checksums for the data sectors plus additional
+parameters which were used during the RS03 encoding process.
+The data and CRC layers are protected by the
+Reed-Solomon parity which is stored in the remaining layers ($ECC_1,\ldots,ECC_m$).
+Since the medium capacity is not necessarily an integer multiple of 255, some
+unused sectors remain at the end of the medium. These are neither written nor
+referenced in any way.
+
+\smallskip
+
+The RS03 data can be stored either directly on the medium or into a separate file.
+Figure \ref{layout-phy} shows the first case where ecc data is embedded into the
+image; this is also called a ``RS03 augmented ISO image'' in dvdisaster
+terminology. 
+In the other case a separate error correction file will be created containing
+the sectors starting with the EH header. The following discussion is based
+on the augmented image case; see section \ref{eccfile} for handling the
+file based format.
+
+\subsection{Logical layout}
+
+\begin{figure}
+ \begin{center}
+ \includegraphics[width=\textwidth]{layer.eps}
+ \caption{Logical RS03 layout}
+ \label{layout-logical}
+ \end{center}
+\end{figure}
+
+
+The relationship between layers and ecc blocks is stated again in the
+logical view presented in figure \ref{layout-logical}. Here the 255 layers are
+shown in stacked order. From each layer the $i-th$ byte corresponds to the
+$i-th$ error correction block. The parity is calculated using $n$ data bytes
+$d_{i,1},\ldots,d_{i,n}$ plus the crc byte $c_i$. The resulting $m$ roots of 
+the completed Reed-Solomon code are then stored in the 
+ecc bytes $e_{i,1},\ldots, e_{i,m}$. 
+
+Since the input iso image plus the two EH sectors is usually not an integer 
+multiple of the layer size, the last data layer $data_n$ may contain padding
+sectors containing a special signature. The content of the padding sectors
+is used in the ecc byte calculation and is written into the augmented image.
+
+\subsection{Calculating the layout for encoding}
+
+\begin{table}
+ \begin{center}
+ \begin{tabular}{|lrr|}
+ \hline
+ Medium type &  Maximum size & Layer size \\
+ \hline
+ CD & 359.424 & 1.409 \\
+ DVD 1 layer & 2.295.104 & 9.000 \\
+ DVD 2 layers & 4.171.712 & 16.359 \\
+ BD 1 layer & 11.826.176 & 46.377 \\
+ BD 2 layers & 23.652.352 & 92.754 \\
+ \hline
+ \end{tabular}
+ \caption{Sector size parameters for several media types}
+ \label{layout-size-table}
+ \end{center}
+\end{table}
+
+When encoding with RS03 the layout of the augmented image is fully specified
+by two values: the maximum medium size and the iso image size
+(from now on, ``size'' always means ``number of 2048K sectors''). \bigskip
+
+Media sizes are hard coded and taken from table \ref{layout-size-table}. Since we need to divide the medium into 255 layers, the layer size
+is:
+ 
+\[layer\ size = \left\lfloor\frac{medium\ size}{255}\right\rfloor\]
+
+This allows us to compute the number of data layers needed to cover the iso image plus the ecc header:
+
+\[data\ layers =  \left\lceil\frac{iso\ image\ size + 2}{layer\ size}\right\rceil\]
+
+The number of padding sectors in the last data layer is:
+
+\[padding\ sectors = layer\ size * data\ layers - iso\ image\ size - 2\]
+
+For Reed-Solomon encoding, we will have to encode 
+
+\[n\ data\ bytes = data\ layers + 1\]
+
+and produce the following number of parity bytes:
+
+\[m\ roots = 255 - n\ data\ bytes\]
+
+The RS03 augmented image must fill the medium completely (except for the 
+$medium\ size \bmod 255$ sectors  at the end). However for performance
+reasons the maximum redundancy is capped to 200\%, or 170 roots. This means
+that the ISO image must at least span the first 255-170=85 layers, otherwise
+additional padding will be added to fill up the 85 data layers. This situation
+is not reflected in the calculations and figure shown above.
+
+\subsection{Re-calculating the layout from defective media}
+\label{recover}
+
+In order to recover a defective medium, the values of {\em layer size}
+and {\em data layers} need to be determined. The RS03 format allows
+for three heuristics with increasing complexity for learning about these
+values:
+
+\subsubsection{Using the Ecc Header}
+
+All required information can be obtained from the data structures of the
+Ecc Header which is described in appendix \ref{eh}. 
+If ecc data is stored in a separate error correction
+file, the first 4096 bytes of the ecc file yield the Ecc Header.
+Otherwise, let $n$ be the size of the ISO file system which
+can be obtained from the ISO file system master block. Then the 
+Ecc Header is typically found in the RS03-augmented image at sectors $n,n+1$ 
+or at $n+150,n+151$ (due to padding inserted by some popular CD-R  mastering
+software). \smallskip
+
+If the ISO file system master block is unreadable, the Ecc Header
+can be identified by its characteristic signature and checksum. 
+If the Ecc Header is encountered during reading of the defective medium 
+it might be worthwhile to generate a tentative ISO master block in the image
+file. This would speed up future processing of the image; however current
+implementations of dvdisaster do not yet implement this feature.
+
+\subsubsection{Using the CRC layer}
+
+Each CRC layer sector contains a data structure which not only holds the
+CRC32 checksums but also a copy of important parameters from the Ecc header
+(see section \ref{crc} for details). CRC sectors can be easily recognized
+by looking for their signature and checksum while scanning the medium image.
+If dvdisaster finds a valid CRC sector and the Ecc header is defective,
+a tentative Ecc header is written to the image to speed up further
+operations on the image file.
+
+However it should be noted that since all CRC sectors are stored 
+consecutively on the medium, they can easily be wiped out by a large
+defective region on the medium. Therefore, another heuristic exists
+for learning about the RS03 layout.
+
+\subsubsection{Evaluating the Reed-Solomon code}
+\label{recover-rs}
+
+If neither the Ecc Header nor any CRC sectors are readable
+the RS03 layout can be determined by the following heuristic.
+
+First, the medium size is determined from table \ref{layout-size-table}.
+This is always possible as long as the drive will recognize the medium at all.
+Since the layer size is $\left\lfloor\frac{medium\ size}{255}\right\rfloor$,
+the location of the 255 layers on the medium is now known. The remaining task is to find
+out the redundancy of the Reed-Solomon code, e.g. how many layers contain
+roots for the RS code.
+
+\bigskip
+
+Taking the {\em i-th} sector from each layer will produce a valid error 
+correction block, but with unknown redundancy. As RS03 will create redundancies 
+using 8 to 170 roots, we employ a brute-force approach by evaluating
+the Reed-Solomon code for $8..170$ roots. If the error correction
+is successful for $n$ roots and the sector from layer {\em 255-1-n} yields
+the CRC data structure, the correct number of roots has been found.
+
+\medskip
+
+In reality, not all 162 combinations of roots need to tested since additional
+information can be exploited:
+
+\begin{enumerate}
+\item If the sector from layer {\em 255-1-n} is present/readable,
+we do not need to test for $n$ roots any further: Encoding with $n$ roots would
+have produced a CRC sector in this place.
+\item If the number of erasures (as indicated by unreadable sectors) is higher
+than $n$, we can trivially skip the RS decoding. We might have to test another
+set of 255 sectors though if testing for all other numbers of roots fails as well.
+\end{enumerate}
+
+Criterion 1) should quickly narrow down the possible numbers of roots
+in the average case, e.g. when enough redundancy is available for recovering the medium.
+Worst case behaviour of trying each ecc block for 8..170 roots is likely to appear only
+when the medium is unrecoverable, e.g. when more sectors are damaged than the 
+Reed-Solomon code can correct.
+
+\subsection{Contents of the CRC layer}
+\label{crc}
+
+Each sector of the CRC layer contains the data structure shown in
+appendix \ref{crc-block}. Following the numbering from figure \ref{layout-logical},
+CRC sector $c_i$ contains the CRC32 checksums for data sectors $d_{j,1},\ldots,d_{j,n}$
+with $j = (i+1)\bmod\ layer\ size$. The purpose of this offset is to have
+the error correction of ECC block $i$ recover the CRC checksum for the next 
+ECC block $i+1$. In case of readable but corrupted sectors this will keep the
+error correction in erasure mode and therefore save precious redundancy (the
+RS code can recover twice as much errors when the location of defective data
+is known). \medskip
+
+Checksums for data sector $d_{j,k}$ are stored in array element
+CrcBlock-$>$crc[k]. Unused array elements are set to zero.
+The remaining contents of the CRC sector structure provide 
+configuration and layout information; see appendix \ref{crc-block} for details.
+
+\subsection{Encoding the ecc layers}
+
+Encoding the error correction information
+ requires reading and buffering of at least
+255 sectors comprising the ecc block
+(see fig. \ref{layout-logical} for a definition of the ecc block).
+A possible encoding algorithm
+might process each ecc block at a time. For each ecc block $i$
+it would do the following: \smallskip
+
+First, the $n$ data sectors $d_{i,1},\ldots,d_{i,n}$ of the ecc block
+are read in. The CRC layer 
+sector $c_i$ is initialized, filled in with checksums 
+generated by processing the previous ecc block, and completed
+by calculating its own checksum {\em selfCRC}. Unused portions of $c_i$
+remain zero. Afterwards the
+CRC32 checksums of $d_{i,1},\ldots,d_{i,n}$ are calculated
+and stored away using the same buffering mechanism. Since the hand-over of
+CRC checksums between ecc blocks is the only place where RS03 does 
+not fully parallelize, data sector I/O and CRC32 caching needs to be 
+carefully thought out in multithreaded implementations. \medskip
+
+
+Once $d_{i,1},\ldots,d_{i,n}$ and $c_i$ have been prepared, 
+2048 sets of a  RS(255,k) code (with $k=255-n-1$) are calculated by 
+looping over the 2048 bytes of the ecc sectors. If $l$ denotes
+a certain byte position between $0,\ldots,2047$ in the ecc block
+sectors, then the {\em l-th} byte from $d_{i,1},\ldots,d_{i,n},c_i$
+is retrieved and fed into the RS(255,k) encoder. The resulting
+parity bytes $p_1,\ldots,p_m$ are stored in byte position $l$ of the
+ecc layer sectors $e_{i,1},\ldots,e_{i,m}$. When all 2048 bytes
+of the ecc block sectors have been processed the ecc layer sectors
+can be written out; either into the error correction file or into
+the RS03 augmented image. \medskip
+
+The RS(255,k) encoder is the same for RS01, RS02 and RS03. See
+appendix \ref{rs} for the parameters used in the encoder.
+
+\subsection{Encoding as a separate error correction file}
+\label{eccfile}
+
+If the image size is too close to the medium capacity, not enough
+space is left for augmenting the image with redundancy. dvdisaster
+will refuse to augment images when there is insufficient space
+for at least 8 roots. Creating images with less than 43 roots
+(20\% of redundancy) will trigger a warning that the error correction
+capacity may be too low. In those cases, storing the error correction
+information in a separate file comes as an alternative.
+
+\medskip
+
+RS03 error correction files (``ecc files'')
+contain the same error correction information
+and layout as in the augmented image case, with the following differences:
+
+\paragraph{Omittance of data padding sectors.} While the image format
+shown in figures \ref{layout-phy} and \ref{layout-logical}
+ may contain padding sectors between the ecc header and the CRC layer,
+those sectors are not written into the ecc file.
+The padding sectors are however required during encoding and
+decoding, e.g. they need to be virtually created in memory 
+when processing the respective ecc blocks. 
+Therefore an ecc file providing {\em nroots} of redundancy
+will contain {\em 2 + (nroots+1) * layer size} sectors.
+Physically it will contain the ecc header, then the CRC layer 
+and finally the {\em nroots} ecc layers. In contrast to the
+augmented image case, the ecc header {\em is not part of an ecc
+  block} and can therefore not be recovered
+by the error correction. If the ecc header is lost in an ecc file,
+its contents can be reconstructed from a still existing block
+in the CRC layer and then be rewritten accordingly.
+
+\paragraph{Freely chooseable redundancy.} In the augmented image case
+the redundancy is always chosen to fill up the medium completely.
+For ecc files the redundancy can be freely chosen by the user between
+ 8 roots (3.2\%) and 170 roots (200\%). Encoding with more than 170 roots
+is technically possible, but run-time requirements get out of proportion;
+hence the selectable redundancy is capped at 200\%.
+
+\medskip
+
+As a consequence of the variable redundancy the ecc file layout can only
+be determined by looking at the ecc header or CRC sectors. The strategy
+of experimentally evaluating the Reed-Solomon code (see sub 
+section \ref{recover-rs}) however can not be applied to ecc files since
+neither the size of the padding area nor the original size of the 
+possibly truncated image and ecc files can be determined. \medskip
+
+To see whether this is really a limiting factor we look
+at the typical outcome of recovering a single file from a defective
+medium:
+
+\begin{itemize}
+\item The ecc file is fully read, but random sectors are damaged.
+\item The ecc file is truncated to the position of the first read error.
+\end{itemize}
+
+In both scenarios it is highly likely that at least one CRC sector survives
+at the beginning of the file; in that case the error correction will not
+only recover the image but also repair the ecc file into its original state.
+
+\bigskip
+
+Although this gives RS03 ecc files good chances to remain functional even
+when being partly damaged, it is highly recommended to store ecc files 
+only on media which are themself being protected by dvdisaster. 
+ISO and UDF file systems
+do not have sufficient redundancy for their meta data (e.g. directory
+structures). If such meta data becomes unreadable a significant
+number of files may become completely inaccessible. 
+Please note that this is a
+general weakness of file-based data protection and recovery: The
+meta data is not part of any file and can therefore not be protected by
+any error correction data put inside the file(s). 
+\smallskip
+This is the also the simple reason why we did not use tools like PAR2 
+and developed dvdisaster instead; 
+the image-based approach of dvdisaster protects
+both files and meta data.

documentation/codec-specs/spiral-rs01.eps

@@ -0,0 +1,616 @@
+%!PS-Adobe-2.0 EPSF-2.0
+%%Title: spiral-rs01.fig
+%%Creator: fig2dev Version 3.2 Patchlevel 5c
+%%CreationDate: Sat May 12 18:37:13 2012
+%%BoundingBox: 0 0 342 424
+%Magnification: 1.0000
+%%EndComments
+%%BeginProlog
+/MyAppDict 100 dict dup begin def
+/$F2psDict 200 dict def
+$F2psDict begin
+$F2psDict /mtrx matrix put
+/col-1 {0 setgray} bind def
+/col0 {0.000 0.000 0.000 srgb} bind def
+/col1 {0.000 0.000 1.000 srgb} bind def
+/col2 {0.000 1.000 0.000 srgb} bind def
+/col3 {0.000 1.000 1.000 srgb} bind def
+/col4 {1.000 0.000 0.000 srgb} bind def
+/col5 {1.000 0.000 1.000 srgb} bind def
+/col6 {1.000 1.000 0.000 srgb} bind def
+/col7 {1.000 1.000 1.000 srgb} bind def
+/col8 {0.000 0.000 0.560 srgb} bind def
+/col9 {0.000 0.000 0.690 srgb} bind def
+/col10 {0.000 0.000 0.820 srgb} bind def
+/col11 {0.530 0.810 1.000 srgb} bind def
+/col12 {0.000 0.560 0.000 srgb} bind def
+/col13 {0.000 0.690 0.000 srgb} bind def
+/col14 {0.000 0.820 0.000 srgb} bind def
+/col15 {0.000 0.560 0.560 srgb} bind def
+/col16 {0.000 0.690 0.690 srgb} bind def
+/col17 {0.000 0.820 0.820 srgb} bind def
+/col18 {0.560 0.000 0.000 srgb} bind def
+/col19 {0.690 0.000 0.000 srgb} bind def
+/col20 {0.820 0.000 0.000 srgb} bind def
+/col21 {0.560 0.000 0.560 srgb} bind def
+/col22 {0.690 0.000 0.690 srgb} bind def
+/col23 {0.820 0.000 0.820 srgb} bind def
+/col24 {0.500 0.190 0.000 srgb} bind def
+/col25 {0.630 0.250 0.000 srgb} bind def
+/col26 {0.750 0.380 0.000 srgb} bind def
+/col27 {1.000 0.500 0.500 srgb} bind def
+/col28 {1.000 0.630 0.630 srgb} bind def
+/col29 {1.000 0.750 0.750 srgb} bind def
+/col30 {1.000 0.880 0.880 srgb} bind def
+/col31 {1.000 0.840 0.000 srgb} bind def
+
+end
+
+% This junk string is used by the show operators
+/PATsstr 1 string def
+/PATawidthshow { 	% cx cy cchar rx ry string
+  % Loop over each character in the string
+  {  % cx cy cchar rx ry char
+    % Show the character
+    dup				% cx cy cchar rx ry char char
+    PATsstr dup 0 4 -1 roll put	% cx cy cchar rx ry char (char)
+    false charpath		% cx cy cchar rx ry char
+    /clip load PATdraw
+    % Move past the character (charpath modified the
+    % current point)
+    currentpoint			% cx cy cchar rx ry char x y
+    newpath
+    moveto			% cx cy cchar rx ry char
+    % Reposition by cx,cy if the character in the string is cchar
+    3 index eq {			% cx cy cchar rx ry
+      4 index 4 index rmoveto
+    } if
+    % Reposition all characters by rx ry
+    2 copy rmoveto		% cx cy cchar rx ry
+  } forall
+  pop pop pop pop pop		% -
+  currentpoint
+  newpath
+  moveto
+} bind def
+/PATcg {
+  7 dict dup begin
+    /lw currentlinewidth def
+    /lc currentlinecap def
+    /lj currentlinejoin def
+    /ml currentmiterlimit def
+    /ds [ currentdash ] def
+    /cc [ currentrgbcolor ] def
+    /cm matrix currentmatrix def
+  end
+} bind def
+% PATdraw - calculates the boundaries of the object and
+% fills it with the current pattern
+/PATdraw {			% proc
+  save exch
+    PATpcalc			% proc nw nh px py
+    5 -1 roll exec		% nw nh px py
+    newpath
+    PATfill			% -
+  restore
+} bind def
+% PATfill - performs the tiling for the shape
+/PATfill { % nw nh px py PATfill -
+  PATDict /CurrentPattern get dup begin
+    setfont
+    % Set the coordinate system to Pattern Space
+    PatternGState PATsg
+    % Set the color for uncolored pattezns
+    PaintType 2 eq { PATDict /PColor get PATsc } if
+    % Create the string for showing
+    3 index string		% nw nh px py str
+    % Loop for each of the pattern sources
+    0 1 Multi 1 sub {		% nw nh px py str source
+	% Move to the starting location
+	3 index 3 index		% nw nh px py str source px py
+	moveto			% nw nh px py str source
+	% For multiple sources, set the appropriate color
+	Multi 1 ne { dup PC exch get PATsc } if
+	% Set the appropriate string for the source
+	0 1 7 index 1 sub { 2 index exch 2 index put } for pop
+	% Loop over the number of vertical cells
+	3 index 		% nw nh px py str nh
+	{			% nw nh px py str
+	  currentpoint		% nw nh px py str cx cy
+	  2 index oldshow	% nw nh px py str cx cy
+	  YStep add moveto	% nw nh px py str
+	} repeat		% nw nh px py str
+    } for
+    5 { pop } repeat
+  end
+} bind def
+
+% PATkshow - kshow with the current pattezn
+/PATkshow {			% proc string
+  exch bind			% string proc
+  1 index 0 get			% string proc char
+  % Loop over all but the last character in the string
+  0 1 4 index length 2 sub {
+				% string proc char idx
+    % Find the n+1th character in the string
+    3 index exch 1 add get	% string proc char char+1
+    exch 2 copy			% strinq proc char+1 char char+1 char
+    % Now show the nth character
+    PATsstr dup 0 4 -1 roll put	% string proc chr+1 chr chr+1 (chr)
+    false charpath		% string proc char+1 char char+1
+    /clip load PATdraw
+    % Move past the character (charpath modified the current point)
+    currentpoint newpath moveto
+    % Execute the user proc (should consume char and char+1)
+    mark 3 1 roll		% string proc char+1 mark char char+1
+    4 index exec		% string proc char+1 mark...
+    cleartomark			% string proc char+1
+  } for
+  % Now display the last character
+  PATsstr dup 0 4 -1 roll put	% string proc (char+1)
+  false charpath		% string proc
+  /clip load PATdraw
+  neewath
+  pop pop			% -
+} bind def
+% PATmp - the makepattern equivalent
+/PATmp {			% patdict patmtx PATmp patinstance
+  exch dup length 7 add		% We will add 6 new entries plus 1 FID
+  dict copy			% Create a new dictionary
+  begin
+    % Matrix to install when painting the pattern
+    TilingType PATtcalc
+    /PatternGState PATcg def
+    PatternGState /cm 3 -1 roll put
+    % Check for multi pattern sources (Level 1 fast color patterns)
+    currentdict /Multi known not { /Multi 1 def } if
+    % Font dictionary definitions
+    /FontType 3 def
+    % Create a dummy encoding vector
+    /Encoding 256 array def
+    3 string 0 1 255 {
+      Encoding exch dup 3 index cvs cvn put } for pop
+    /FontMatrix matrix def
+    /FontBBox BBox def
+    /BuildChar {
+	mark 3 1 roll		% mark dict char
+	exch begin
+	Multi 1 ne {PaintData exch get}{pop} ifelse  % mark [paintdata]
+	  PaintType 2 eq Multi 1 ne or
+	  { XStep 0 FontBBox aload pop setcachedevice }
+	  { XStep 0 setcharwidth } ifelse
+	  currentdict		% mark [paintdata] dict
+	  /PaintProc load	% mark [paintdata] dict paintproc
+	end
+	gsave
+	  false PATredef exec true PATredef
+	grestore
+	cleartomark		% -
+    } bind def
+    currentdict
+  end				% newdict
+  /foo exch			% /foo newlict
+  definefont			% newfont
+} bind def
+% PATpcalc - calculates the starting point and width/height
+% of the tile fill for the shape
+/PATpcalc {	% - PATpcalc nw nh px py
+  PATDict /CurrentPattern get begin
+    gsave
+	% Set up the coordinate system to Pattern Space
+	% and lock down pattern
+	PatternGState /cm get setmatrix
+	BBox aload pop pop pop translate
+	% Determine the bounding box of the shape
+	pathbbox			% llx lly urx ury
+    grestore
+    % Determine (nw, nh) the # of cells to paint width and height
+    PatHeight div ceiling		% llx lly urx qh
+    4 1 roll				% qh llx lly urx
+    PatWidth div ceiling		% qh llx lly qw
+    4 1 roll				% qw qh llx lly
+    PatHeight div floor			% qw qh llx ph
+    4 1 roll				% ph qw qh llx
+    PatWidth div floor			% ph qw qh pw
+    4 1 roll				% pw ph qw qh
+    2 index sub cvi abs			% pw ph qs qh-ph
+    exch 3 index sub cvi abs exch	% pw ph nw=qw-pw nh=qh-ph
+    % Determine the starting point of the pattern fill
+    %(px, py)
+    4 2 roll				% nw nh pw ph
+    PatHeight mul			% nw nh pw py
+    exch				% nw nh py pw
+    PatWidth mul exch			% nw nh px py
+  end
+} bind def
+
+% Save the original routines so that we can use them later on
+/oldfill	/fill load def
+/oldeofill	/eofill load def
+/oldstroke	/stroke load def
+/oldshow	/show load def
+/oldashow	/ashow load def
+/oldwidthshow	/widthshow load def
+/oldawidthshow	/awidthshow load def
+/oldkshow	/kshow load def
+
+% These defs are necessary so that subsequent procs don't bind in
+% the originals
+/fill	   { oldfill } bind def
+/eofill	   { oldeofill } bind def
+/stroke	   { oldstroke } bind def
+/show	   { oldshow } bind def
+/ashow	   { oldashow } bind def
+/widthshow { oldwidthshow } bind def
+/awidthshow { oldawidthshow } bind def
+/kshow 	   { oldkshow } bind def
+/PATredef {
+  MyAppDict begin
+    {
+    /fill { /clip load PATdraw newpath } bind def
+    /eofill { /eoclip load PATdraw newpath } bind def
+    /stroke { PATstroke } bind def
+    /show { 0 0 null 0 0 6 -1 roll PATawidthshow } bind def
+    /ashow { 0 0 null 6 3 roll PATawidthshow }
+    bind def
+    /widthshow { 0 0 3 -1 roll PATawidthshow }
+    bind def
+    /awidthshow { PATawidthshow } bind def
+    /kshow { PATkshow } bind def
+  } {
+    /fill   { oldfill } bind def
+    /eofill { oldeofill } bind def
+    /stroke { oldstroke } bind def
+    /show   { oldshow } bind def
+    /ashow  { oldashow } bind def
+    /widthshow { oldwidthshow } bind def
+    /awidthshow { oldawidthshow } bind def
+    /kshow  { oldkshow } bind def
+    } ifelse
+  end
+} bind def
+false PATredef
+% Conditionally define setcmykcolor if not available
+/setcmykcolor where { pop } {
+  /setcmykcolor {
+    1 sub 4 1 roll
+    3 {
+	3 index add neg dup 0 lt { pop 0 } if 3 1 roll
+    } repeat
+    setrgbcolor - pop
+  } bind def
+} ifelse
+/PATsc {		% colorarray
+  aload length		% c1 ... cn length
+    dup 1 eq { pop setgray } { 3 eq { setrgbcolor } { setcmykcolor
+  } ifelse } ifelse
+} bind def
+/PATsg {		% dict
+  begin
+    lw setlinewidth
+    lc setlinecap
+    lj setlinejoin
+    ml setmiterlimit
+    ds aload pop setdash
+    cc aload pop setrgbcolor
+    cm setmatrix
+  end
+} bind def
+
+/PATDict 3 dict def
+/PATsp {
+  true PATredef
+  PATDict begin
+    /CurrentPattern exch def
+    % If it's an uncolored pattern, save the color
+    CurrentPattern /PaintType get 2 eq {
+      /PColor exch def
+    } if
+    /CColor [ currentrgbcolor ] def
+  end
+} bind def
+% PATstroke - stroke with the current pattern
+/PATstroke {
+  countdictstack
+  save
+  mark
+  {
+    currentpoint strokepath moveto
+    PATpcalc				% proc nw nh px py
+    clip newpath PATfill
+    } stopped {
+	(*** PATstroke Warning: Path is too complex, stroking
+	  with gray) =
+    cleartomark
+    restore
+    countdictstack exch sub dup 0 gt
+	{ { end } repeat } { pop } ifelse
+    gsave 0.5 setgray oldstroke grestore
+  } { pop restore pop } ifelse
+  newpath
+} bind def
+/PATtcalc {		% modmtx tilingtype PATtcalc tilematrix
+  % Note: tiling types 2 and 3 are not supported
+  gsave
+    exch concat					% tilingtype
+    matrix currentmatrix exch			% cmtx tilingtype
+    % Tiling type 1 and 3: constant spacing
+    2 ne {
+	% Distort the pattern so that it occupies
+	% an integral number of device pixels
+	dup 4 get exch dup 5 get exch		% tx ty cmtx
+	XStep 0 dtransform
+	round exch round exch			% tx ty cmtx dx.x dx.y
+	XStep div exch XStep div exch		% tx ty cmtx a b
+	0 YStep dtransform
+	round exch round exch			% tx ty cmtx a b dy.x dy.y
+	YStep div exch YStep div exch		% tx ty cmtx a b c d
+	7 -3 roll astore			% { a b c d tx ty }
+    } if
+  grestore
+} bind def
+/PATusp {
+  false PATredef
+  PATDict begin
+    CColor PATsc
+  end
+} bind def
+
+% right45
+11 dict begin
+/PaintType 1 def
+/PatternType 1 def
+/TilingType 1 def
+/BBox [0 0 1 1] def
+/XStep 1 def
+/YStep 1 def
+/PatWidth 1 def
+/PatHeight 1 def
+/Multi 2 def
+/PaintData [
+  { clippath } bind
+  { 20 20 true [ 20 0 0 -20 0 20 ]
+	{<0040100080200100400200800401000802001004
+	0020080040100080200000401000802001004002
+	0080040100080200100400200800401000802000>}
+     imagemask } bind
+] def
+/PaintProc {
+	pop
+	exec fill
+} def
+currentdict
+end
+/P5 exch def
+
+% crosshatch45
+11 dict begin
+/PaintType 1 def
+/PatternType 1 def
+/TilingType 1 def
+/BBox [0 0 1 1] def
+/XStep 1 def
+/YStep 1 def
+/PatWidth 1 def
+/PatHeight 1 def
+/Multi 2 def
+/PaintData [
+  { clippath } bind
+  { 20 20 true [ 20 0 0 -20 0 20 ]
+	{<8020004050102088201104400a02800401000a02
+	8011044020882040501080200040501020882011
+	04400a02800401000a0280110440208820405010>}
+     imagemask } bind
+] def
+/PaintProc {
+	pop
+	exec fill
+} def
+currentdict
+end
+/P6 exch def
+
+/cp {closepath} bind def
+/ef {eofill} bind def
+/gr {grestore} bind def
+/gs {gsave} bind def
+/sa {save} bind def
+/rs {restore} bind def
+/l {lineto} bind def
+/m {moveto} bind def
+/rm {rmoveto} bind def
+/n {newpath} bind def
+/s {stroke} bind def
+/sh {show} bind def
+/slc {setlinecap} bind def
+/slj {setlinejoin} bind def
+/slw {setlinewidth} bind def
+/srgb {setrgbcolor} bind def
+/rot {rotate} bind def
+/sc {scale} bind def
+/sd {setdash} bind def
+/ff {findfont} bind def
+/sf {setfont} bind def
+/scf {scalefont} bind def
+/sw {stringwidth} bind def
+/tr {translate} bind def
+/tnt {dup dup currentrgbcolor
+  4 -2 roll dup 1 exch sub 3 -1 roll mul add
+  4 -2 roll dup 1 exch sub 3 -1 roll mul add
+  4 -2 roll dup 1 exch sub 3 -1 roll mul add srgb}
+  bind def
+/shd {dup dup currentrgbcolor 4 -2 roll mul 4 -2 roll mul
+  4 -2 roll mul srgb} bind def
+/reencdict 12 dict def /ReEncode { reencdict begin
+/newcodesandnames exch def /newfontname exch def /basefontname exch def
+/basefontdict basefontname findfont def /newfont basefontdict maxlength dict def
+basefontdict { exch dup /FID ne { dup /Encoding eq
+{ exch dup length array copy newfont 3 1 roll put }
+{ exch newfont 3 1 roll put } ifelse } { pop pop } ifelse } forall
+newfont /FontName newfontname put newcodesandnames aload pop
+128 1 255 { newfont /Encoding get exch /.notdef put } for
+newcodesandnames length 2 idiv { newfont /Encoding get 3 1 roll put } repeat
+newfontname newfont definefont pop end } def
+/isovec [
+8#055 /minus 8#200 /grave 8#201 /acute 8#202 /circumflex 8#203 /tilde
+8#204 /macron 8#205 /breve 8#206 /dotaccent 8#207 /dieresis
+8#210 /ring 8#211 /cedilla 8#212 /hungarumlaut 8#213 /ogonek 8#214 /caron
+8#220 /dotlessi 8#230 /oe 8#231 /OE
+8#240 /space 8#241 /exclamdown 8#242 /cent 8#243 /sterling
+8#244 /currency 8#245 /yen 8#246 /brokenbar 8#247 /section 8#250 /dieresis
+8#251 /copyright 8#252 /ordfeminine 8#253 /guillemotleft 8#254 /logicalnot
+8#255 /hyphen 8#256 /registered 8#257 /macron 8#260 /degree 8#261 /plusminus
+8#262 /twosuperior 8#263 /threesuperior 8#264 /acute 8#265 /mu 8#266 /paragraph
+8#267 /periodcentered 8#270 /cedilla 8#271 /onesuperior 8#272 /ordmasculine
+8#273 /guillemotright 8#274 /onequarter 8#275 /onehalf
+8#276 /threequarters 8#277 /questiondown 8#300 /Agrave 8#301 /Aacute
+8#302 /Acircumflex 8#303 /Atilde 8#304 /Adieresis 8#305 /Aring
+8#306 /AE 8#307 /Ccedilla 8#310 /Egrave 8#311 /Eacute
+8#312 /Ecircumflex 8#313 /Edieresis 8#314 /Igrave 8#315 /Iacute
+8#316 /Icircumflex 8#317 /Idieresis 8#320 /Eth 8#321 /Ntilde 8#322 /Ograve
+8#323 /Oacute 8#324 /Ocircumflex 8#325 /Otilde 8#326 /Odieresis 8#327 /multiply
+8#330 /Oslash 8#331 /Ugrave 8#332 /Uacute 8#333 /Ucircumflex
+8#334 /Udieresis 8#335 /Yacute 8#336 /Thorn 8#337 /germandbls 8#340 /agrave
+8#341 /aacute 8#342 /acircumflex 8#343 /atilde 8#344 /adieresis 8#345 /aring
+8#346 /ae 8#347 /ccedilla 8#350 /egrave 8#351 /eacute
+8#352 /ecircumflex 8#353 /edieresis 8#354 /igrave 8#355 /iacute
+8#356 /icircumflex 8#357 /idieresis 8#360 /eth 8#361 /ntilde 8#362 /ograve
+8#363 /oacute 8#364 /ocircumflex 8#365 /otilde 8#366 /odieresis 8#367 /divide
+8#370 /oslash 8#371 /ugrave 8#372 /uacute 8#373 /ucircumflex
+8#374 /udieresis 8#375 /yacute 8#376 /thorn 8#377 /ydieresis] def
+/Helvetica-Bold /Helvetica-Bold-iso isovec ReEncode
+/$F2psBegin {$F2psDict begin /$F2psEnteredState save def} def
+/$F2psEnd {$F2psEnteredState restore end} def
+
+/pageheader {
+save
+newpath 0 424 moveto 0 0 lineto 342 0 lineto 342 424 lineto closepath clip newpath
+-116.2 433.0 translate
+1 -1 scale
+$F2psBegin
+10 setmiterlimit
+0 slj 0 slc
+ 0.06299 0.06299 sc
+} bind def
+/pagefooter {
+$F2psEnd
+restore
+} bind def
+%%EndProlog
+pageheader
+%
+% Fig objects follow
+%
+% 
+% here starts figure with depth 51
+% Polyline
+0 slj
+0 slc
+7.500 slw
+n 5697 4365 m 5650 4567 l 5563 4752 l 5444 4923 l 5289 5062 l 5114 5176 l
+ 4923 5253 l 4716 5289 l 4504 5289 l 4298 5253 l 4102 5181 l
+ 3916 5073 l 3756 4933 l 3622 4768 l 3518 4582 l 3451 4381 l
+ 3415 4169 l 3931 4128 l 3973 4314 l 4060 4479 l 4184 4618 l
+ 4339 4716 l 4520 4768 l 4701 4763 l 4871 4711 l 5015 4613 l
+ 5124 4474 l 5176 4309 l
+ cp gs col7 0.80 shd ef gr gs col0 s gr 
+% Polyline
+n 5395 5613 m 5490 5558 l 5671 5424 l 5826 5269 l 5965 5093 l 6074 4902 l
+ 6156 4696 l 6208 4484 l 6229 4262 l 6213 4045 l 6172 3829 l
+ 6100 3622 l 5996 3426 l 5867 3250 l 5712 3090 l 5639 3031 l
+ 5339 3455 l 5485 3601 l 5594 3772 l 5671 3958 l 5702 4159 l
+ 5695 4365 l 5650 4571 l 5556 4770 l 5425 4938 l 5279 5070 l
+ 5110 5178 l
+ cp gs col7 0.80 shd ef gr gs col0 s gr 
+% Polyline
+n 5639 3031 m 5537 2961 l 5346 2858 l 5139 2786 l 4928 2745 l 4711 2739 l
+ 4494 2765 l 4288 2822 l 4086 2915 l 3911 3034 l 3751 3183 l
+ 3622 3354 l 3518 3545 l 3446 3746 l 3415 3958 l 3411 4170 l
+ 3933 4125 l 3942 3932 l 3999 3751 l 4097 3581 l 4231 3441 l
+ 4401 3338 l 4587 3276 l 4783 3256 l 4985 3281 l 5170 3349 l
+ 5341 3457 l
+ cp gs col7 0.80 shd ef gr gs col0 s gr 
+% Polyline
+n 4457 164 m 4465 164 l gs col0 s gr
+% Polyline
+n 3678 1960 m 3477 2074 l 3286 2208 l 3111 2357 l 2951 2528 l 2793 2734 l
+ 2347 2461 l 2491 2270 l 2646 2089 l 2816 1924 l 2997 1774 l
+ 3193 1640 l 3400 1521 l
+ cp gs col7 0.80 shd ef gr gs col0 s gr 
+% Polyline
+n 4221 6822 m 4476 6851 l 4687 6862 l 4936 6836 l 5155 6791 l 5387 6735 l
+ 5609 6657 l 5821 6559 l 6027 6446 l 6218 6311 l 6399 6162 l
+ 6569 5996 l
+ 6716 5828 l gs col0 s gr 
+% Polyline
+n 6719 5816 m 6853 5625 l 6972 5424 l 7070 5207 l 7147 4990 l 7209 4763 l
+ 7256 4505 l 7259 4283 l 7256 4061 l 7230 3829 l 7184 3601 l
+ 7116 3374 l
+ 7031 3160 l gs col0 s gr 
+% Polyline
+n 5191 1740 m 5496 1810 l 5712 1888 l 5924 1991 l 6125 2110 l 6316 2244 l
+ 6492 2399 l 6652 2569 l 6796 2755 l 6920 2951 l
+ 7029 3158 l gs col0 s gr 
+% Polyline
+n 5191 1734 m 5251 1227 l 4988 1193 l 4768 1186 l 4530 1191 l 4293 1222 l
+ 4060 1268 l 3938 1298 l 3703 1389 l 3400 1518 l 3682 1956 l
+ 3925 1845 l 4112 1790 l 4339 1738 l 4572 1707 l 4764 1699 l
+ 4953 1708 l
+ cp gs /PC [[1.00 1.00 1.00] [0.00 0.00 0.00]] def
+15.00 15.00 sc P6 [16 0 0 -16 226.67 79.07] PATmp PATsp ef gr PATusp gs col0 s gr 
+% Polyline
+n 2040 5074 m 1996 4943 l 1929 4716 l 1887 4484 l 1861 4252 l 1856 4014 l
+ 1867 3782 l 1903 3545 l 1954 3318 l 2027 3090 l 2114 2874 l
+ 2223 2662 l 2348 2459 l 2786 2737 l 2682 2905 l 2574 3111 l
+ 2491 3328 l 2429 3550 l 2388 3777 l 2372 4009 l 2378 4241 l
+ 2409 4474 l 2460 4696 l 2538 4918 l
+ cp gs col7 0.80 shd ef gr gs col0 s gr 
+% Polyline
+n 4226 6826 m 3988 6781 l 3761 6714 l 3544 6631 l 3327 6533 l 3126 6415 l
+ 2935 6275 l 2754 6126 l 2589 5955 l 2434 5775 l 2300 5584 l
+ 2181 5382 l 2078 5165 l 2040 5077 l 2539 4927 l 2631 5129 l
+ 2749 5325 l 2889 5511 l 3044 5687 l 3214 5836 l 3400 5976 l
+ 3601 6089 l 3813 6182 l 4030 6255 l 4257 6306 l 4484 6327 l
+ 4716 6332 l 4943 6306 l 5170 6260 l 5387 6187 l 5599 6095 l
+ 5800 5976 l 5981 5836 l 6151 5682 l 6301 5511 l 6435 5320 l
+ 6543 5119 l 6631 4907 l 6693 4685 l 6729 4463 l 6745 4231 l
+ 6734 4004 l 6693 3777 l 6631 3560 l 6543 3349 l 6435 3147 l
+ 6306 2961 l 6151 2791 l 5981 2641 l 5795 2512 l 5594 2404 l
+ 5382 2316 l 5160 2259 l 4938 2223 l 4711 2218 l 4484 2239 l
+ 4262 2285 l 4045 2357 l 3844 2456 l 3653 2579 l 3477 2724 l
+ 3322 2889 l 3188 3070 l 3075 3266 l 2987 3472 l 2930 3689 l
+ 2894 3916 l 2889 4138 l 2914 4365 l 2966 4582 l 3044 4794 l
+ 3152 4990 l 3281 5176 l 3431 5341 l 3601 5485 l 3792 5604 l
+ 3993 5697 l 4205 5764 l 4427 5805 l 4649 5816 l 4871 5795 l
+ 5088 5744 l 5294 5666 l
+ 5391 5617 l gs col0 s gr 
+/Helvetica-Bold-iso ff 317.50 scf sf
+3879 3551 m
+gs 1 -1 sc  30.0 rot (Data 2) col0 sh gr
+/Helvetica-Bold-iso ff 317.50 scf sf
+4195 5076 m
+gs 1 -1 sc (Data 1) col0 sh gr
+/Helvetica-Bold-iso ff 317.50 scf sf
+5809 3837 m
+gs 1 -1 sc  270.0 rot (Data 3) col0 sh gr
+/Helvetica-Bold-iso ff 317.50 scf sf
+2329 4449 m
+gs 1 -1 sc  90.0 rot (Data n-1) col0 sh gr
+/Helvetica-Bold-iso ff 317.50 scf sf
+4974 5562 m
+gs 1 -1 sc  20.0 rot (...) col0 sh gr
+/Helvetica-Bold-iso ff 317.50 scf sf
+2311 5075 m
+gs 1 -1 sc  295.0 rot (...) col0 sh gr
+/Helvetica-Bold-iso ff 317.50 scf sf
+2712 2589 m
+gs 1 -1 sc  42.0 rot (Data n) col0 sh gr
+/Helvetica-Bold-iso ff 254.00 scf sf
+3833 1677 m
+gs 1 -1 sc  10.0 rot (padding) col0 sh gr
+% here ends figure;
+pagefooter
+showpage
+%%Trailer
+end
+%EOF

documentation/codec-specs/spiral-rs01.fig

@@ -0,0 +1,77 @@
+#FIG 3.2  Produced by xfig version 3.2.5b
+Landscape
+Center
+Metric
+A4      
+100.00
+Single
+-2
+1200 2
+2 3 0 1 0 7 51 -1 16 0.000 0 0 -1 0 0 29
+	 5697 4365 5650 4567 5563 4752 5444 4923 5289 5062 5114 5176
+	 4923 5253 4716 5289 4504 5289 4298 5253 4102 5181 3916 5073
+	 3756 4933 3622 4768 3518 4582 3451 4381 3415 4169 3931 4128
+	 3973 4314 4060 4479 4184 4618 4339 4716 4520 4768 4701 4763
+	 4871 4711 5015 4613 5124 4474 5176 4309 5697 4365
+2 3 0 1 0 7 51 -1 16 0.000 0 0 -1 0 0 28
+	 5395 5613 5490 5558 5671 5424 5826 5269 5965 5093 6074 4902
+	 6156 4696 6208 4484 6229 4262 6213 4045 6172 3829 6100 3622
+	 5996 3426 5867 3250 5712 3090 5639 3031 5339 3455 5485 3601
+	 5594 3772 5671 3958 5702 4159 5695 4365 5650 4571 5556 4770
+	 5425 4938 5279 5070 5110 5178 5395 5613
+2 3 0 1 0 7 51 -1 16 0.000 0 0 -1 0 0 28
+	 5639 3031 5537 2961 5346 2858 5139 2786 4928 2745 4711 2739
+	 4494 2765 4288 2822 4086 2915 3911 3034 3751 3183 3622 3354
+	 3518 3545 3446 3746 3415 3958 3411 4170 3933 4125 3942 3932
+	 3999 3751 4097 3581 4231 3441 4401 3338 4587 3276 4783 3256
+	 4985 3281 5170 3349 5341 3457 5639 3031
+2 1 0 1 0 7 51 -1 45 0.000 0 0 -1 0 0 1
+	 4461 164
+2 3 0 1 0 7 51 -1 16 0.000 0 0 -1 0 0 14
+	 3678 1960 3477 2074 3286 2208 3111 2357 2951 2528 2793 2734
+	 2347 2461 2491 2270 2646 2089 2816 1924 2997 1774 3193 1640
+	 3400 1521 3678 1960
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 84
+	 4226 6826 3988 6781 3761 6714 3544 6631 3327 6533 3126 6415
+	 2935 6275 2754 6126 2589 5955 2434 5775 2300 5584 2181 5382
+	 2078 5165 2040 5077 2539 4927 2631 5129 2749 5325 2889 5511
+	 3044 5687 3214 5836 3400 5976 3601 6089 3813 6182 4030 6255
+	 4257 6306 4484 6327 4716 6332 4943 6306 5170 6260 5387 6187
+	 5599 6095 5800 5976 5981 5836 6151 5682 6301 5511 6435 5320
+	 6543 5119 6631 4907 6693 4685 6729 4463 6745 4231 6734 4004
+	 6693 3777 6631 3560 6543 3349 6435 3147 6306 2961 6151 2791
+	 5981 2641 5795 2512 5594 2404 5382 2316 5160 2259 4938 2223
+	 4711 2218 4484 2239 4262 2285 4045 2357 3844 2456 3653 2579
+	 3477 2724 3322 2889 3188 3070 3075 3266 2987 3472 2930 3689
+	 2894 3916 2889 4138 2914 4365 2966 4582 3044 4794 3152 4990
+	 3281 5176 3431 5341 3601 5485 3792 5604 3993 5697 4205 5764
+	 4427 5805 4649 5816 4871 5795 5088 5744 5294 5666 5391 5617
+2 1 0 1 0 7 51 -1 -1 0.000 0 0 -1 0 0 13
+	 4221 6822 4476 6851 4687 6862 4936 6836 5155 6791 5387 6735
+	 5609 6657 5821 6559 6027 6446 6218 6311 6399 6162 6569 5996
+	 6716 5828
+2 1 0 1 0 7 51 -1 -1 0.000 0 0 -1 0 0 13
+	 6719 5816 6853 5625 6972 5424 7070 5207 7147 4990 7209 4763
+	 7256 4505 7259 4283 7256 4061 7230 3829 7184 3601 7116 3374
+	 7031 3160
+2 1 0 1 0 7 51 -1 -1 0.000 0 0 -1 0 0 11
+	 5191 1740 5496 1810 5712 1888 5924 1991 6125 2110 6316 2244
+	 6492 2399 6652 2569 6796 2755 6920 2951 7029 3158
+2 3 0 1 0 7 51 -1 46 0.000 0 0 -1 0 0 18
+	 5191 1734 5251 1227 4988 1193 4768 1186 4530 1191 4293 1222
+	 4060 1268 3938 1298 3703 1389 3400 1518 3682 1956 3925 1845
+	 4112 1790 4339 1738 4572 1707 4764 1699 4953 1708 5191 1734
+2 3 0 1 0 7 51 -1 16 0.000 0 0 -1 0 0 25
+	 2040 5074 1996 4943 1929 4716 1887 4484 1861 4252 1856 4014
+	 1867 3782 1903 3545 1954 3318 2027 3090 2114 2874 2223 2662
+	 2348 2459 2786 2737 2682 2905 2574 3111 2491 3328 2429 3550
+	 2388 3777 2372 4009 2378 4241 2409 4474 2460 4696 2538 4918
+	 2040 5074
+4 0 0 50 -1 18 20 0.5236 4 240 975 3879 3551 Data 2\001
+4 0 0 50 -1 18 20 0.0000 4 240 975 4195 5076 Data 1\001
+4 0 0 50 -1 18 20 4.7124 4 240 975 5809 3837 Data 3\001
+4 0 0 50 -1 18 20 1.5708 4 240 1290 2329 4449 Data n-1\001
+4 0 0 50 -1 18 20 0.3491 4 45 270 4974 5562 ...\001
+4 0 0 50 -1 18 20 5.1487 4 45 270 2311 5075 ...\001
+4 0 0 50 -1 18 20 0.7330 4 240 1005 2712 2589 Data n\001
+4 0 0 50 -1 18 16 0.1745 4 270 1110 3833 1677 padding\001

documentation/codec-specs/spiral-rs02.fig

@@ -0,0 +1,521 @@
+#FIG 3.2  Produced by xfig version 3.2.5b
+Landscape
+Center
+Metric
+A4      
+100.00
+Single
+-2
+1200 2
+2 3 0 1 0 7 51 -1 15 0.000 0 0 -1 0 0 27
+	 5358 1886 5457 1897 5555 1911 5654 1928 5751 1948 5848 1972
+	 5944 1998 6039 2028 6133 2060 6226 2095 6318 2134 6409 2175
+	 6498 2219 6586 2266 6379 2609 6290 2562 6201 2520 6110 2480
+	 6017 2444 5923 2411 5828 2381 5732 2355 5635 2333 5537 2314
+	 5439 2298 5340 2286 5358 1886
+2 3 0 1 0 7 51 -1 44 0.000 0 0 -1 0 0 11
+	 7610 3989 7570 3898 7527 3808 7481 3720 7432 3633 7779 3433
+	 7828 3520 7874 3608 7918 3697 7959 3788 7610 3989
+2 3 0 1 0 7 51 -1 10 0.000 0 0 -1 0 0 35
+	 7785 3433 7733 3348 7678 3265 7621 3183 7562 3103 7499 3025
+	 7435 2949 7368 2876 7299 2804 7228 2734 7154 2667 7079 2602
+	 7001 2539 6922 2479 6840 2422 6757 2367 6672 2315 6586 2265
+	 6379 2608 6465 2657 6550 2709 6632 2765 6713 2823 6792 2884
+	 6868 2948 6942 3015 7013 3084 7082 3156 7148 3230 7212 3306
+	 7273 3385 7331 3466 7386 3549 7438 3633 7785 3433
+2 3 0 1 0 7 50 -1 15 0.000 0 0 -1 0 0 94
+	 3550 3820 3492 3900 3438 3983 3389 4069 3344 4157 3304 4247
+	 3269 4340 3239 4434 3214 4530 3194 4626 3179 4725 3170 4823
+	 3166 4922 3167 5020 3174 5119 3186 5217 3203 5315 3226 5411
+	 3254 5506 3287 5599 3325 5690 3368 5779 3415 5866 3468 5949
+	 3525 6030 3586 6107 3652 6181 3721 6252 3795 6318 3871 6380
+	 3952 6437 4035 6490 4121 6539 4210 6582 4301 6620 4394 6653
+	 4489 6681 4585 6703 4683 6720 4781 6732 4879 6737 4978 6737
+	 5076 6732 5175 6721 5272 6704 5368 6681 5463 6653 5556 6620
+	 5646 6582 5734 6538 5820 6489 5903 6435 5664 6113 5580 6165
+	 5494 6210 5405 6249 5312 6281 5217 6306 5121 6323 5024 6334
+	 4926 6337 4828 6333 4731 6322 4635 6304 4540 6279 4447 6247
+	 4357 6209 4271 6164 4187 6112 4107 6055 4032 5993 3961 5925
+	 3895 5852 3834 5775 3780 5694 3731 5609 3688 5521 3651 5429
+	 3621 5336 3597 5241 3580 5145 3570 5047 3566 4949 3570 4851
+	 3580 4753 3596 4656 3619 4561 3649 4467 3685 4376 3727 4287
+	 3775 4201 3828 4119 3887 4040 3550 3820
+2 3 0 1 0 7 51 -1 10 0.000 0 0 -1 0 0 87
+	 2452 6595 2399 6510 2348 6424 2301 6337 2257 6248 2215 6157
+	 2177 6065 2142 5972 2109 5878 2080 5783 2054 5687 2032 5590
+	 2012 5492 1996 5394 1983 5295 1973 5196 1967 5096 1963 4997
+	 1963 4897 1967 4798 1973 4698 1983 4599 1996 4501 2013 4403
+	 2032 4305 2055 4208 2081 4112 2110 4016 2142 3922 2177 3829
+	 2215 3737 2256 3646 2300 3557 2347 3469 2397 3383 2450 3298
+	 2505 3216 2563 3135 2624 3056 2687 2979 2752 2904 2820 2831
+	 2890 2760 2963 2692 3038 2626 3114 2563 3375 2866 3299 2930
+	 3224 2995 3152 3064 3083 3135 3016 3209 2952 3285 2891 3364
+	 2833 3445 2778 3528 2726 3612 2678 3699 2632 3788 2590 3878
+	 2552 3970 2517 4062 2485 4157 2457 4252 2432 4349 2412 4446
+	 2394 4544 2381 4642 2371 4741 2365 4841 2363 4940 2365 5040
+	 2370 5139 2379 5238 2392 5336 2408 5435 2429 5532 2453 5628
+	 2480 5724 2512 5818 2546 5911 2585 6003 2627 6093 2672 6182
+	 2720 6269 2772 6353 2452 6595
+2 3 0 1 0 7 51 -1 10 0.000 0 0 -1 0 0 57
+	 7491 6405 7536 6316 7578 6226 7617 6135 7652 6042 7685 5947
+	 7714 5852 7739 5756 7762 5659 7781 5561 7796 5463 7808 5364
+	 7816 5265 7821 5166 7823 5066 7821 4967 7815 4867 7806 4768
+	 7794 4670 7778 4571 7759 4474 7736 4377 7709 4281 7680 4186
+	 7647 4092 7611 3999 7960 3798 7998 3890 8033 3983 8065 4078
+	 8095 4173 8121 4269 8145 4366 8165 4463 8182 4561 8197 4660
+	 8208 4759 8216 4858 8221 4958 8223 5057 8222 5157 8218 5257
+	 8211 5356 8201 5455 8187 5554 8171 5652 8152 5750 8129 5847
+	 8104 5943 8076 6039 8045 6133 8010 6227 7974 6320 7934 6411
+	 7891 6501 7846 6590 7491 6405
+2 3 0 1 0 7 51 -1 15 0.000 0 0 -1 0 0 89
+	 7488 6415 7440 6502 7389 6588 7335 6671 7278 6753 7218 6833
+	 7156 6910 7090 6985 7023 7058 6952 7129 6880 7197 6805 7263
+	 6728 7325 6649 7386 6568 7443 6484 7498 6399 7550 6313 7599
+	 6224 7644 6134 7687 6043 7727 5950 7763 5857 7796 5762 7827
+	 5666 7853 5569 7877 5472 7897 5374 7914 5275 7927 5176 7938
+	 5077 7944 4977 7948 4878 7948 4778 7944 4679 7937 4580 7927
+	 4481 7914 4383 7897 4285 7877 4189 7853 4093 7827 3931 8196
+	 4027 8224 4123 8250 4220 8272 4318 8292 4416 8309 4515 8322
+	 4614 8333 4713 8341 4813 8346 4912 8348 5012 8347 5112 8343
+	 5211 8336 5310 8326 5409 8313 5507 8297 5605 8278 5702 8257
+	 5799 8232 5895 8204 5989 8174 6083 8141 6176 8105 6268 8066
+	 6359 8024 6448 7980 6536 7933 6622 7883 6707 7831 6790 7776
+	 6872 7719 6951 7659 7029 7597 7105 7532 7179 7466 7251 7397
+	 7321 7325 7388 7252 7454 7177 7517 7100 7578 7021 7636 6940
+	 7691 6857 7745 6773 7795 6687 7843 6600 7488 6415
+2 3 0 1 0 7 51 -1 10 0.000 0 0 -1 0 0 24
+	 1622 5563 1605 5465 1592 5366 1582 5267 1574 5168 1569 5068
+	 1568 4968 1569 4869 1573 4769 1580 4670 1590 4570 1603 4472
+	 2001 4511 1988 4609 1978 4708 1972 4808 1968 4907 1968 5007
+	 1972 5106 1978 5206 1988 5305 2001 5404 2017 5502 1622 5563
+2 3 0 1 0 7 51 -1 49 0.000 0 0 -1 0 0 12
+	 1627 5561 1646 5659 1667 5756 1692 5853 1727 5999 1722 6004
+	 2119 5886 2090 5791 2064 5695 2042 5598 2022 5500 1627 5561
+2 3 0 1 0 7 51 -1 10 0.000 0 0 -1 0 0 64
+	 2112 5875 2145 5969 2180 6062 2218 6154 2260 6245 2304 6334
+	 2351 6421 2402 6507 2455 6592 2510 6674 2569 6755 2630 6833
+	 2694 6910 2760 6984 2829 7056 2900 7126 2973 7193 3049 7258
+	 3127 7320 3206 7380 3288 7436 3372 7491 3457 7542 3544 7590
+	 3633 7636 3723 7678 3814 7717 3907 7754 4001 7787 4096 7817
+	 3934 8186 3840 8155 3746 8121 3653 8084 3562 8044 3471 8002
+	 3382 7957 3295 7910 3209 7860 3124 7807 3041 7752 2959 7695
+	 2880 7635 2802 7573 2726 7508 2652 7442 2580 7373 2510 7302
+	 2442 7229 2376 7154 2313 7077 2252 6998 2193 6918 2136 6836
+	 2082 6752 2031 6667 1982 6580 1935 6492 1891 6402 1850 6312
+	 1812 6220 1776 6127 1743 6033 2112 5875
+2 3 0 1 0 7 51 -1 10 0.000 0 0 -1 0 0 96
+	 5912 6437 5992 6378 6067 6315 6139 6248 6207 6176 6271 6101
+	 6330 6022 6384 5939 6434 5854 6478 5766 6516 5675 6550 5582
+	 6577 5488 6599 5392 6615 5295 6625 5196 6630 5098 6628 4999
+	 6620 4901 6607 4803 6587 4707 6562 4612 6531 4518 6494 4427
+	 6451 4338 6404 4252 6351 4169 6293 4089 6230 4013 6162 3941
+	 6091 3874 6014 3811 5935 3753 5852 3701 5766 3654 5676 3612
+	 5585 3575 5491 3545 5396 3521 5299 3503 5201 3491 5103 3486
+	 5005 3487 4906 3494 4809 3507 4713 3527 4618 3553 4525 3585
+	 4434 3623 4346 3667 4262 3717 4180 3772 4102 3832 4029 3898
+	 4318 4176 4393 4113 4472 4058 4555 4010 4644 3969 4736 3936
+	 4829 3912 4924 3895 5021 3887 5119 3887 5215 3896 5311 3913
+	 5405 3938 5497 3971 5585 4011 5669 4059 5750 4114 5826 4175
+	 5896 4242 5960 4315 6018 4393 6071 4476 6115 4562 6153 4652
+	 6183 4745 6206 4840 6221 4936 6228 5033 6228 5130 6220 5228
+	 6204 5324 6181 5419 6150 5511 6112 5602 6067 5688 6016 5771
+	 5958 5850 5894 5925 5826 5994 5752 6057 5673 6115 5912 6437
+2 3 0 1 0 7 51 -1 15 0.000 0 0 -1 0 0 99
+	 6221 4993 6223 5022 6223 5119 6215 5217 6199 5313 6176 5408
+	 6145 5500 6107 5591 6062 5677 6011 5760 5953 5839 5889 5914
+	 5821 5983 5747 6046 5668 6104 5584 6156 5498 6201 5409 6240
+	 5316 6272 5221 6297 5125 6314 5028 6325 4930 6328 4832 6324
+	 4735 6313 4639 6295 4544 6270 4451 6238 4361 6200 4275 6155
+	 4191 6103 4111 6046 4036 5984 3965 5916 3899 5843 3838 5766
+	 3784 5685 3735 5600 3692 5512 3655 5420 3625 5327 3601 5232
+	 3584 5136 3574 5038 3570 4940 3574 4842 3584 4744 3600 4647
+	 3623 4552 3653 4458 3689 4367 3731 4278 3779 4192 3832 4110
+	 3891 4031 3955 3956 4024 3887 4313 4165 4245 4234 4183 4309
+	 4129 4388 4082 4473 4042 4562 4011 4653 3989 4746 3976 4843
+	 3971 4940 3976 5036 3990 5130 4013 5225 4045 5316 4085 5404
+	 4133 5486 4190 5565 4253 5637 4324 5703 4399 5760 4482 5811
+	 4569 5853 4659 5886 4751 5909 4847 5923 4943 5927 5038 5921
+	 5132 5905 5225 5880 5314 5844 5398 5800 5477 5747 5551 5686
+	 5617 5616 5675 5541 5723 5460 5764 5373 5794 5283 5813 5190
+	 5822 5096 5820 5001 6221 4993
+2 3 0 1 0 7 51 -1 44 0.000 0 0 -1 0 0 11
+	 7857 2250 7786 2181 7713 2113 7638 2047 7562 1983 7834 1689
+	 7910 1753 7985 1819 8058 1887 8130 1957 7857 2250
+2 3 0 1 0 7 51 -1 10 0.000 0 0 -1 0 0 66
+	 4775 693 4875 688 4975 684 5074 684 5174 685 5274 689
+	 5373 695 5473 703 5572 714 5671 727 5770 742 5868 759
+	 5966 779 6063 801 6160 825 6256 851 6352 880 6447 911
+	 6541 944 6634 979 6727 1016 6819 1055 6909 1097 6999 1140
+	 7088 1186 7176 1234 7262 1283 7348 1335 7432 1388 7515 1444
+	 7597 1501 7677 1560 7756 1621 7834 1684 7562 1978 7484 1915
+	 7404 1855 7323 1797 7241 1741 7157 1687 7072 1635 6985 1585
+	 6897 1538 6808 1492 6719 1449 6627 1409 6535 1370 6442 1334
+	 6349 1300 6254 1269 6158 1240 6062 1213 5966 1189 5868 1167
+	 5770 1148 5672 1131 5573 1117 5474 1105 5375 1096 5275 1089
+	 5176 1085 5076 1084 4976 1085 4877 1088 4777 1094 4775 693
+2 3 0 1 0 7 51 -1 44 0.000 0 0 -1 0 0 11
+	 2900 8609 2813 8559 2728 8507 2644 8453 2562 8397 2798 8074
+	 2881 8130 2965 8183 3051 8235 3138 8283 2900 8609
+2 3 0 1 0 7 51 -1 15 0.000 0 0 -1 0 0 88
+	 4777 691 4678 699 4578 709 4479 721 4381 736 4282 753
+	 4184 772 4087 793 3990 817 3894 843 3798 871 3703 901
+	 3609 934 3515 968 3422 1005 3330 1044 3239 1085 3149 1129
+	 3061 1174 2973 1221 2886 1271 2800 1322 2716 1375 2633 1431
+	 2551 1488 2471 1547 2392 1608 2314 1671 2238 1735 2164 1802
+	 2091 1870 2019 1939 1950 2011 1881 2084 1815 2158 1751 2234
+	 1688 2312 1627 2391 1568 2471 1511 2553 1455 2636 1402 2720
+	 1351 2806 1301 2893 1254 2981 1209 3070 1593 3195 1640 3107
+	 1689 3020 1740 2935 1793 2850 1849 2767 1906 2686 1966 2606
+	 2028 2528 2091 2451 2157 2376 2224 2302 2294 2231 2365 2161
+	 2438 2093 2513 2027 2589 1963 2667 1901 2747 1840 2828 1782
+	 2910 1726 2994 1673 3080 1621 3166 1571 3254 1524 3343 1479
+	 3433 1437 3525 1396 3617 1358 3710 1323 3804 1289 3899 1258
+	 3994 1230 4091 1204 4188 1181 4285 1159 4383 1141 4482 1125
+	 4580 1111 4680 1100 4779 1092 4777 691
+2 3 0 1 0 7 51 -1 10 0.000 0 0 -1 0 0 87
+	 1457 7260 1403 7176 1352 7090 1302 7004 1254 6916 1209 6827
+	 1165 6738 1124 6647 1085 6555 1048 6462 1013 6369 981 6274
+	 951 6179 923 6083 897 5987 874 5890 853 5792 834 5694
+	 817 5596 803 5497 791 5398 782 5299 775 5199 770 5100
+	 768 5000 768 4900 770 4800 775 4701 782 4601 791 4502
+	 803 4403 817 4304 833 4206 852 4107 873 4010 896 3913
+	 922 3816 950 3721 980 3625 1012 3531 1046 3437 1083 3345
+	 1122 3253 1163 3162 1206 3072 1590 3197 1546 3287 1504 3377
+	 1465 3469 1427 3561 1392 3655 1360 3749 1330 3844 1303 3940
+	 1278 4037 1255 4134 1235 4232 1218 4330 1203 4428 1191 4527
+	 1181 4627 1174 4726 1170 4826 1168 4926 1168 5025 1172 5125
+	 1178 5225 1186 5324 1197 5423 1211 5522 1227 5620 1246 5718
+	 1267 5816 1291 5912 1317 6009 1346 6104 1378 6199 1412 6292
+	 1448 6385 1487 6477 1528 6568 1571 6658 1617 6746 1665 6834
+	 1716 6920 1768 7004 1457 7260
+2 3 0 1 0 7 51 -1 15 0.000 0 0 -1 0 0 56
+	 3131 8283 3219 8330 3308 8374 3399 8416 3490 8456 3583 8492
+	 3677 8527 3771 8559 3866 8589 3962 8615 4059 8640 4156 8662
+	 4254 8681 4352 8697 4451 8711 4550 8723 4650 8731 4749 8737
+	 4849 8741 4949 8741 5048 8739 5148 8735 5247 8727 5347 8717
+	 5446 8705 5544 8689 5592 9087 5493 9102 5394 9115 5295 9125
+	 5195 9133 5096 9138 4996 9141 4896 9141 4797 9139 4697 9135
+	 4597 9129 4498 9119 4399 9108 4300 9094 4202 9078 4104 9059
+	 4006 9038 3909 9015 3813 8989 3717 8961 3622 8931 3527 8899
+	 3434 8864 3341 8827 3250 8788 3159 8746 3069 8703 2980 8657
+	 2893 8609 3131 8283
+2 3 0 1 0 7 51 -1 15 0.000 0 0 -1 0 0 34
+	 2568 8394 2487 8336 2407 8276 2328 8214 2252 8151 2176 8085
+	 2103 8018 2030 7949 1960 7878 1891 7806 1824 7732 1759 7657
+	 1696 7579 1634 7501 1575 7421 1517 7340 1461 7257 1772 7001
+	 1827 7085 1884 7167 1944 7247 2005 7325 2068 7403 2134 7478
+	 2201 7551 2270 7623 2341 7693 2414 7761 2489 7827 2565 7891
+	 2643 7953 2723 8013 2804 8071 2568 8394
+2 1 0 1 0 7 51 -1 15 0.000 0 0 -1 0 0 39
+	 3201 2496 3282 2437 3365 2382 3449 2329 3535 2278 3622 2231
+	 3711 2186 3802 2144 3893 2105 3986 2070 4080 2037 4175 2007
+	 4271 1980 4368 1956 4465 1936 4563 1918 4662 1904 4761 1893
+	 4860 1884 4960 1880 4943 2281 4844 2287 4745 2297 4646 2310
+	 4548 2327 4451 2348 4354 2372 4259 2400 4164 2431 4071 2465
+	 3979 2504 3889 2545 3800 2590 3713 2637 3627 2689 3544 2743
+	 3463 2800 3383 2860 3122 2557
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 1518
+	 8976 7025 9019 6934 9060 6843 9098 6751 9135 6658 9169 6565
+	 9202 6470 9232 6375 9260 6279 9286 6183 9310 6086 9332 5989
+	 9351 5891 9368 5793 9383 5694 9396 5595 9407 5496 9415 5396
+	 9421 5297 9425 5197 9426 5097 9426 4997 9423 4897 9418 4798
+	 9410 4698 9401 4599 9389 4500 9375 4401 9358 4303 9340 4205
+	 9319 4107 9296 4010 9271 3913 9244 3817 9214 3722 9182 3627
+	 9149 3533 9113 3440 9075 3348 9035 3257 8992 3166 8948 3077
+	 8902 2988 8854 2901 8804 2815 8752 2729 8697 2646 8642 2563
+	 8584 2482 8524 2401 8463 2323 8399 2246 8335 2170 8268 2096
+	 8199 2023 8130 1952 8058 1882 7985 1814 7910 1748 7834 1684
+	 7756 1621 7677 1560 7597 1501 7515 1444 7432 1388 7348 1335
+	 7262 1283 7176 1234 7088 1186 6999 1140 6909 1097 6819 1055
+	 6727 1016 6634 979 6541 944 6447 911 6352 880 6256 851
+	 6160 825 6063 801 5966 779 5868 759 5770 742 5671 727
+	 5572 714 5473 703 5373 695 5274 689 5174 685 5074 684
+	 4975 684 4875 688 4775 693 4676 701 4576 711 4477 723
+	 4379 738 4280 755 4182 774 4085 795 3988 819 3892 845
+	 3796 873 3701 903 3607 936 3513 970 3420 1007 3328 1046
+	 3237 1087 3147 1131 3059 1176 2971 1223 2884 1273 2798 1324
+	 2714 1377 2631 1433 2549 1490 2469 1549 2390 1610 2312 1673
+	 2236 1737 2162 1804 2089 1872 2017 1941 1948 2013 1879 2086
+	 1813 2160 1749 2236 1686 2314 1625 2393 1566 2473 1509 2555
+	 1453 2638 1400 2722 1349 2808 1299 2895 1252 2983 1207 3072
+	 1164 3162 1123 3253 1084 3345 1047 3437 1013 3531 981 3625
+	 951 3721 923 3816 897 3913 874 4010 853 4107 834 4206
+	 818 4304 804 4403 792 4502 783 4601 776 4701 771 4800
+	 769 4900 769 5000 771 5100 776 5199 783 5299 792 5398
+	 804 5497 818 5596 835 5694 854 5792 875 5890 898 5987
+	 924 6083 952 6179 982 6274 1014 6369 1049 6462 1086 6555
+	 1125 6647 1166 6738 1210 6827 1255 6916 1303 7004 1353 7090
+	 1404 7176 1458 7260 1514 7343 1572 7424 1631 7504 1693 7582
+	 1756 7660 1821 7735 1888 7809 1957 7881 2027 7952 2100 8021
+	 2173 8088 2249 8154 2325 8217 2404 8279 2484 8339 2565 8397
+	 2647 8453 2731 8507 2816 8559 2903 8609 2990 8657 3079 8703
+	 3169 8746 3260 8788 3351 8827 3444 8864 3537 8899 3632 8931
+	 3727 8961 3823 8989 3919 9015 4016 9038 4114 9059 4212 9078
+	 4310 9094 4409 9108 4508 9119 4607 9129 4707 9135 4807 9139
+	 4906 9141 5006 9141 5106 9138 5205 9133 5305 9125 5404 9115
+	 5503 9102 5602 9087 5700 9070 5798 9050 5895 9028 5992 9003
+	 6088 8977 6183 8948 6278 8916 6372 8882 6465 8846 6557 8808
+	 6648 8768 6739 8725 6828 8680 6916 8633 7003 8584 7088 8533
+	 7173 8480 7256 8424 7337 8367 7417 8307 7496 8246 7573 8183
+	 7649 8118 7723 8051 7795 7982 7866 7912 7935 7840 8002 7766
+	 8068 7691 8131 7614 8193 7535 8252 7455 8310 7374 8365 7291
+	 8419 7207 8470 7121 8520 7035 8567 6947 8612 6858 8655 6768
+	 8696 6677 8734 6585 8770 6492 8804 6398 8835 6303 8865 6208
+	 8891 6112 8916 6015 8938 5917 8957 5820 8974 5721 8989 5623
+	 9002 5524 9011 5424 9019 5325 9024 5225 9026 5126 9026 5026
+	 9024 4926 9019 4826 9011 4727 9001 4628 8989 4529 8974 4430
+	 8957 4332 8937 4234 8915 4137 8891 4040 8864 3944 8835 3849
+	 8803 3754 8769 3660 8733 3567 8694 3475 8653 3384 8610 3294
+	 8564 3206 8517 3118 8467 3031 8415 2946 8361 2862 8305 2780
+	 8247 2699 8187 2619 8125 2541 8061 2465 7995 2390 7927 2317
+	 7857 2245 7786 2176 7713 2108 7638 2042 7562 1978 7484 1915
+	 7404 1855 7323 1797 7241 1741 7157 1687 7072 1635 6985 1585
+	 6897 1538 6808 1492 6719 1449 6627 1409 6535 1370 6442 1334
+	 6349 1300 6254 1269 6158 1240 6062 1213 5966 1189 5868 1167
+	 5770 1148 5672 1131 5573 1117 5474 1105 5375 1096 5275 1089
+	 5176 1085 5076 1084 4976 1085 4877 1088 4777 1094 4678 1102
+	 4578 1113 4480 1127 4381 1143 4283 1161 4186 1183 4089 1206
+	 3992 1232 3897 1260 3802 1291 3708 1325 3615 1360 3523 1398
+	 3431 1439 3341 1481 3252 1526 3164 1573 3078 1623 2992 1675
+	 2908 1728 2826 1784 2745 1842 2665 1903 2587 1965 2511 2029
+	 2436 2095 2363 2163 2292 2233 2222 2304 2155 2378 2089 2453
+	 2026 2530 1964 2608 1904 2688 1847 2769 1791 2852 1738 2937
+	 1687 3022 1638 3109 1591 3197 1547 3287 1505 3377 1466 3469
+	 1428 3561 1393 3655 1361 3749 1331 3844 1304 3940 1279 4037
+	 1256 4134 1236 4232 1219 4330 1204 4428 1192 4527 1182 4627
+	 1175 4726 1171 4826 1169 4926 1169 5025 1173 5125 1179 5225
+	 1187 5324 1198 5423 1212 5522 1228 5620 1247 5718 1268 5816
+	 1292 5912 1318 6009 1347 6104 1379 6199 1413 6292 1449 6385
+	 1488 6477 1529 6568 1572 6658 1618 6746 1666 6834 1717 6920
+	 1769 7004 1824 7088 1881 7170 1941 7250 2002 7328 2065 7406
+	 2131 7481 2198 7554 2267 7626 2338 7696 2411 7764 2486 7830
+	 2562 7894 2640 7956 2720 8016 2801 8074 2884 8130 2968 8183
+	 3054 8235 3141 8283 3229 8330 3318 8374 3409 8416 3500 8456
+	 3593 8492 3687 8527 3781 8559 3876 8589 3972 8615 4069 8640
+	 4166 8662 4264 8681 4362 8697 4461 8711 4560 8723 4660 8731
+	 4759 8737 4859 8741 4959 8741 5058 8739 5158 8735 5257 8727
+	 5357 8717 5456 8705 5554 8689 5652 8671 5750 8651 5847 8628
+	 5943 8602 6039 8574 6133 8543 6227 8509 6320 8473 6412 8435
+	 6503 8394 6593 8351 6682 8305 6769 8257 6855 8206 6940 8154
+	 7023 8099 7105 8041 7185 7982 7263 7920 7340 7857 7415 7791
+	 7488 7723 7559 7653 7629 7582 7696 7508 7761 7433 7825 7356
+	 7886 7277 7945 7197 8002 7115 8057 7032 8109 6947 8159 6861
+	 8207 6773 8252 6684 8295 6594 8335 6503 8373 6411 8408 6317
+	 8441 6223 8471 6128 8498 6032 8523 5936 8545 5839 8565 5741
+	 8582 5642 8596 5544 8608 5445 8616 5345 8622 5246 8626 5146
+	 8626 5047 8624 4947 8619 4847 8611 4748 8601 4649 8588 4550
+	 8572 4451 8554 4353 8532 4256 8508 4159 8482 4063 8453 3968
+	 8421 3873 8386 3780 8349 3687 8310 3596 8268 3505 8223 3416
+	 8176 3328 8127 3242 8075 3156 8021 3073 7964 2991 7905 2910
+	 7845 2831 7781 2754 7716 2678 7649 2605 7580 2533 7508 2464
+	 7435 2396 7360 2330 7283 2267 7204 2206 7124 2146 7042 2090
+	 6959 2035 6874 1983 6787 1933 6700 1886 6611 1841 6520 1799
+	 6429 1759 6336 1722 6243 1687 6149 1655 6053 1626 5957 1599
+	 5860 1575 5763 1554 5665 1536 5567 1520 5468 1507 5369 1497
+	 5269 1490 5169 1485 5070 1484 4970 1485 4871 1489 4771 1496
+	 4672 1505 4573 1518 4474 1533 4376 1551 4279 1572 4182 1595
+	 4086 1621 3990 1650 3896 1682 3802 1716 3710 1753 3618 1793
+	 3528 1835 3439 1880 3351 1927 3265 1977 3180 2029 3096 2084
+	 3015 2141 2935 2200 2856 2262 2780 2325 2705 2391 2632 2459
+	 2561 2529 2492 2602 2425 2676 2361 2752 2299 2829 2238 2909
+	 2181 2990 2125 3073 2072 3157 2021 3243 1973 3330 1928 3419
+	 1885 3509 1844 3600 1807 3692 1772 3786 1739 3880 1710 3975
+	 1683 4071 1659 4168 1638 4265 1619 4363 1604 4462 1591 4560
+	 1581 4660 1574 4759 1570 4859 1569 4958 1570 5058 1575 5158
+	 1583 5257 1593 5356 1606 5455 1623 5553 1642 5651 1663 5748
+	 1688 5845 1716 5941 1746 6036 1779 6130 1815 6223 1853 6315
+	 1894 6405 1938 6495 1985 6583 2034 6670 2085 6755 2139 6839
+	 2196 6921 2255 7001 2316 7080 2379 7157 2445 7232 2513 7305
+	 2583 7376 2655 7445 2729 7511 2805 7576 2883 7638 2962 7698
+	 3044 7755 3127 7810 3212 7863 3298 7913 3385 7960 3474 8005
+	 3565 8047 3656 8087 3749 8124 3843 8158 3937 8189 4033 8217
+	 4129 8243 4226 8265 4324 8285 4422 8302 4521 8315 4620 8326
+	 4719 8334 4819 8339 4918 8341 5018 8340 5118 8336 5217 8329
+	 5316 8319 5415 8306 5513 8290 5611 8271 5708 8250 5805 8225
+	 5901 8197 5995 8167 6089 8134 6182 8098 6274 8059 6365 8017
+	 6454 7973 6542 7926 6628 7876 6713 7824 6796 7769 6878 7712
+	 6957 7652 7035 7590 7111 7525 7185 7459 7257 7390 7327 7318
+	 7394 7245 7460 7170 7523 7093 7584 7014 7642 6933 7697 6850
+	 7751 6766 7801 6680 7849 6593 7894 6504 7937 6414 7977 6323
+	 8013 6230 8048 6136 8079 6042 8107 5946 8132 5850 8155 5753
+	 8174 5655 8190 5557 8204 5458 8214 5359 8221 5260 8225 5160
+	 8226 5060 8224 4961 8219 4861 8211 4762 8200 4663 8185 4564
+	 8168 4466 8148 4369 8124 4272 8098 4176 8068 4081 8036 3986
+	 8001 3893 7963 3801 7922 3710 7878 3621 7832 3533 7783 3446
+	 7731 3361 7676 3278 7619 3196 7560 3116 7497 3038 7433 2962
+	 7366 2889 7297 2817 7226 2747 7152 2680 7077 2615 6999 2552
+	 6920 2492 6838 2435 6755 2380 6670 2328 6584 2278 6496 2231
+	 6407 2187 6316 2146 6224 2107 6131 2072 6037 2040 5942 2010
+	 5846 1984 5749 1960 5652 1940 5553 1923 5455 1909 5356 1898
+	 5257 1890 5157 1885 5057 1884 4958 1886 4858 1890 4759 1899
+	 4660 1910 4561 1924 4463 1942 4366 1962 4269 1986 4173 2013
+	 4078 2043 3984 2076 3891 2111 3800 2150 3709 2192 3620 2237
+	 3533 2284 3447 2335 3363 2388 3280 2443 3199 2502 3120 2563
+	 3044 2626 2969 2692 2896 2760 2826 2831 2758 2904 2693 2979
+	 2630 3056 2569 3135 2511 3216 2456 3298 2403 3383 2353 3469
+	 2306 3557 2262 3646 2221 3737 2183 3829 2148 3922 2116 4016
+	 2087 4112 2061 4208 2038 4305 2019 4403 2002 4501 1989 4599
+	 1979 4698 1973 4798 1969 4897 1969 4997 1973 5096 1979 5196
+	 1989 5295 2002 5394 2018 5492 2038 5590 2060 5687 2086 5783
+	 2115 5878 2148 5972 2183 6065 2221 6157 2263 6248 2307 6337
+	 2354 6424 2405 6510 2458 6595 2513 6677 2572 6758 2633 6836
+	 2697 6913 2763 6987 2832 7059 2903 7129 2976 7196 3052 7261
+	 3130 7323 3209 7383 3291 7439 3375 7494 3460 7545 3547 7593
+	 3636 7639 3726 7681 3817 7720 3910 7757 4004 7790 4099 7820
+	 4195 7846 4291 7870 4389 7890 4487 7907 4586 7920 4685 7930
+	 4784 7937 4884 7941 4983 7941 5083 7937 5182 7931 5281 7920
+	 5380 7907 5478 7890 5575 7870 5672 7846 5768 7820 5863 7789
+	 5956 7756 6049 7720 6140 7680 6230 7637 6319 7592 6405 7543
+	 6490 7491 6574 7436 6655 7379 6734 7318 6811 7256 6886 7190
+	 6958 7122 7029 7051 7096 6978 7162 6903 7224 6826 7284 6746
+	 7341 6664 7395 6581 7446 6495 7494 6408 7539 6319 7581 6229
+	 7620 6138 7655 6045 7688 5950 7717 5855 7742 5759 7765 5662
+	 7784 5564 7799 5466 7811 5367 7819 5268 7824 5169 7826 5069
+	 7824 4970 7818 4870 7809 4771 7797 4673 7781 4574 7762 4477
+	 7739 4380 7712 4284 7683 4189 7650 4095 7614 4002 7574 3911
+	 7531 3821 7485 3733 7436 3646 7384 3562 7329 3479 7271 3398
+	 7210 3319 7146 3243 7080 3169 7011 3097 6940 3028 6866 2961
+	 6790 2897 6711 2836 6630 2778 6548 2722 6463 2670 6377 2621
+	 6288 2574 6199 2532 6108 2492 6015 2456 5921 2423 5826 2393
+	 5730 2367 5633 2345 5535 2326 5437 2310 5338 2298 5239 2290
+	 5140 2285 5040 2284 4941 2287 4842 2293 4743 2303 4644 2316
+	 4546 2333 4449 2354 4352 2378 4257 2406 4162 2437 4069 2471
+	 3977 2510 3887 2551 3798 2596 3711 2643 3625 2695 3542 2749
+	 3461 2806 3381 2866 3305 2930 3230 2995 3158 3064 3089 3135
+	 3022 3209 2958 3285 2897 3364 2839 3445 2784 3528 2732 3612
+	 2684 3699 2638 3788 2596 3878 2558 3970 2523 4062 2491 4157
+	 2463 4252 2438 4349 2418 4446 2400 4544 2387 4642 2377 4741
+	 2371 4841 2369 4940 2371 5040 2376 5139 2385 5238 2398 5336
+	 2414 5435 2435 5532 2459 5628 2486 5724 2518 5818 2552 5911
+	 2591 6003 2633 6093 2678 6182 2726 6269 2778 6353 2833 6436
+	 2892 6517 2953 6595 3017 6671 3084 6744 3154 6815 3227 6883
+	 3302 6948 3379 7010 3459 7069 3541 7125 3626 7178 3712 7227
+	 3800 7274 3890 7316 3981 7355 4074 7391 4168 7422 4264 7451
+	 4360 7475 4457 7496 4555 7512 4654 7525 4753 7534 4852 7539
+	 4952 7541 5051 7538 5150 7532 5249 7521 5347 7507 5445 7488
+	 5542 7466 5638 7441 5733 7411 5826 7377 5918 7340 6009 7300
+	 6098 7255 6185 7208 6270 7156 6354 7102 6434 7044 6513 6983
+	 6589 6919 6662 6852 6733 6782 6800 6709 6865 6634 6927 6556
+	 6985 6475 7040 6393 7092 6308 7140 6221 7185 6132 7226 6042
+	 7264 5950 7297 5856 7327 5762 7353 5666 7375 5569 7393 5471
+	 7408 5373 7418 5274 7424 5175 7426 5076 7424 4976 7418 4877
+	 7407 4778 7393 4680 7375 4582 7353 4485 7326 4390 7296 4295
+	 7262 4202 7224 4110 7183 4020 7137 3931 7088 3845 7036 3760
+	 6980 3679 6921 3599 6858 3522 6792 3447 6724 3376 6652 3307
+	 6577 3241 6500 3179 6421 3119 6338 3064 6254 3011 6167 2963
+	 6079 2918 5989 2876 5897 2839 5803 2805 5708 2776 5612 2750
+	 5515 2729 5418 2712 5319 2699 5220 2690 5121 2685 5022 2685
+	 4923 2688 4824 2697 4725 2709 4627 2725 4530 2746 4434 2771
+	 4339 2800 4245 2833 4153 2869 4063 2910 3974 2955 3887 3004
+	 3803 3056 3721 3112 3641 3171 3564 3234 3491 3300 3419 3369
+	 3351 3441 3286 3516 3225 3594 3167 3675 3112 3758 3061 3843
+	 3015 3930 2971 4020 2932 4111 2897 4204 2866 4298 2839 4394
+	 2817 4491 2799 4588 2785 4686 2775 4785 2770 4884 2770 4983
+	 2773 5082 2782 5181 2794 5280 2811 5378 2832 5474 2858 5570
+	 2888 5665 2922 5758 2960 5849 3003 5939 3049 6027 3100 6113
+	 3154 6196 3212 6276 3273 6354 3338 6429 3406 6501 3477 6570
+	 3552 6636 3629 6698 3709 6756 3792 6811 3878 6861 3965 6908
+	 4054 6951 4146 6990 4239 7024 4333 7054 4429 7080 4526 7101
+	 4624 7118 4722 7130 4821 7137 4920 7140 5019 7139 5118 7132
+	 5216 7122 5315 7106 5412 7086 5508 7061 5602 7032 5696 6999
+	 5787 6961 5877 6919 5965 6873 6050 6822 6133 6768 6213 6709
+	 6290 6648 6365 6582 6436 6513 6504 6440 6568 6365 6628 6286
+	 6685 6205 6737 6121 6786 6035 6830 5946 6870 5855 6906 5763
+	 6937 5669 6964 5573 6986 5477 7003 5379 7015 5281 7023 5182
+	 7025 5083 7023 4984 7016 4885 7005 4787 6988 4689 6967 4592
+	 6941 4497 6910 4403 6874 4310 6835 4219 6790 4131 6742 4045
+	 6689 3961 6632 3880 6571 3802 6506 3727 6437 3655 6366 3587
+	 6290 3523 6212 3462 6131 3406 6047 3354 5960 3306 5871 3262
+	 5780 3223 5687 3189 5593 3159 5497 3134 5400 3115 5302 3100
+	 5204 3090 5105 3085 5006 3086 4907 3091 4809 3101 4711 3117
+	 4614 3137 4518 3163 4424 3193 4332 3229 4241 3269 4153 3313
+	 4067 3363 3984 3416 3904 3474 3827 3536 3753 3602 3683 3672
+	 3617 3746 3554 3822 3496 3902 3442 3985 3393 4071 3348 4159
+	 3308 4249 3273 4342 3243 4436 3218 4532 3198 4628 3183 4727
+	 3174 4825 3170 4924 3171 5022 3178 5121 3190 5219 3207 5317
+	 3230 5413 3258 5508 3291 5601 3329 5692 3372 5781 3419 5868
+	 3472 5951 3529 6032 3590 6109 3656 6183 3725 6254 3799 6320
+	 3875 6382 3956 6439 4039 6492 4125 6541 4214 6584 4305 6622
+	 4398 6655 4493 6683 4589 6705 4687 6722 4785 6734 4883 6739
+	 4982 6739 5080 6734 5179 6723 5276 6706 5372 6683 5467 6655
+	 5560 6622 5650 6584 5738 6540 5824 6491 5907 6437 5987 6378
+	 6062 6315 6134 6248 6202 6176 6266 6101 6325 6022 6379 5939
+	 6429 5854 6473 5766 6511 5675 6545 5582 6572 5488 6594 5392
+	 6610 5295 6620 5196 6625 5098 6623 4999 6615 4901 6602 4803
+	 6582 4707 6557 4612 6526 4518 6489 4427 6446 4338 6399 4252
+	 6346 4169 6288 4089 6225 4013 6157 3941 6086 3874 6009 3811
+	 5930 3753 5847 3701 5761 3654 5671 3612 5580 3575 5486 3545
+	 5391 3521 5294 3503 5196 3491 5098 3486 5000 3487 4901 3494
+	 4804 3507 4708 3527 4613 3553 4520 3585 4429 3623 4341 3667
+	 4257 3717 4175 3772 4097 3832 4024 3898 3955 3967 3891 4042
+	 3832 4121 3779 4203 3731 4289 3689 4378 3653 4469 3623 4563
+	 3600 4658 3584 4755 3574 4853 3570 4951 3574 5049 3584 5147
+	 3601 5243 3625 5338 3655 5431 3692 5523 3735 5611 3784 5696
+	 3838 5777 3899 5854 3965 5927 4036 5995 4111 6057 4191 6114
+	 4275 6166 4361 6211 4451 6249 4544 6281 4639 6306 4735 6324
+	 4832 6335 4930 6339 5028 6336 5125 6325 5221 6308 5316 6283
+	 5409 6251 5498 6212 5584 6167 5668 6115 5747 6057 5821 5994
+	 5889 5925 5953 5850 6011 5771 6062 5688 6107 5602 6145 5511
+	 6176 5419 6199 5324 6215 5228 6223 5130 6223 5033 6216 4936
+	 6201 4840 6178 4745 6148 4652 6110 4562 6066 4476 6013 4393
+	 5955 4315 5891 4242 5821 4175 5745 4114 5664 4059 5580 4011
+	 5492 3971 5400 3938 5306 3913 5210 3896 5114 3887 5016 3887
+	 4919 3895 4824 3912 4731 3936 4639 3969 4550 4010 4467 4058
+	 4388 4113 4313 4176 4245 4245 4183 4320 4129 4399 4082 4484
+	 4042 4573 4011 4664 3989 4757 3976 4854 3971 4951 3976 5047
+	 3990 5141 4013 5236 4045 5327 4085 5415 4133 5497 4190 5576
+	 4253 5648 4324 5714 4399 5771 4482 5822 4569 5864 4659 5897
+	 4751 5920 4847 5934 4943 5938 5038 5932 5132 5916 5225 5891
+	 5314 5855 5398 5811 5477 5758 5551 5697 5617 5627 5675 5552
+	 5723 5471 5764 5384 5794 5294 5813 5201 5822 5107 5820 5012
+2 3 0 1 0 7 51 -1 15 0.000 0 0 -1 0 0 87
+	 8610 6858 8653 6768 8694 6677 8732 6585 8768 6492 8802 6398
+	 8833 6303 8863 6208 8889 6112 8914 6015 8936 5917 8955 5820
+	 8972 5721 8987 5623 9000 5524 9009 5424 9017 5325 9022 5225
+	 9024 5126 9024 5026 9022 4926 9017 4826 9009 4727 8999 4628
+	 8987 4529 8972 4430 8955 4332 8935 4234 8913 4137 8889 4040
+	 8862 3944 8833 3849 8801 3754 8767 3660 8731 3567 8692 3475
+	 8651 3384 8608 3294 8562 3206 8515 3118 8465 3031 8802 2815
+	 8852 2901 8900 2988 8946 3077 8990 3166 9033 3257 9073 3348
+	 9111 3440 9147 3533 9180 3627 9212 3722 9242 3817 9269 3913
+	 9294 4010 9317 4107 9338 4205 9356 4303 9373 4401 9387 4500
+	 9399 4599 9408 4698 9416 4798 9421 4897 9424 4997 9424 5097
+	 9423 5197 9419 5297 9413 5396 9405 5496 9394 5595 9381 5694
+	 9366 5793 9349 5891 9330 5989 9308 6086 9284 6183 9258 6279
+	 9230 6375 9200 6470 9167 6565 9133 6658 9096 6751 9058 6843
+	 9017 6934 8974 7025 8610 6858
+2 3 0 1 0 7 51 -1 10 0.000 0 0 -1 0 0 24
+	 7857 2229 7927 2301 7995 2374 8061 2449 8125 2525 8187 2603
+	 8247 2683 8305 2764 8361 2846 8415 2930 8467 3015 8804 2799
+	 8752 2713 8697 2630 8642 2547 8584 2466 8524 2385 8463 2307
+	 8399 2230 8335 2154 8268 2080 8199 2007 8130 1936 7857 2229
+2 3 0 1 0 7 51 -1 15 0.000 0 0 -1 0 0 11
+	 5358 1880 5259 1872 5159 1867 5059 1866 4960 1868 4943 2269
+	 5042 2266 5142 2267 5241 2272 5340 2280 5358 1880
+4 0 0 50 -1 18 18 5.6723 4 210 855 3887 5718 Data 1\001
+4 0 0 50 -1 18 18 0.3665 4 210 870 3644 2548 Data n\001
+4 0 0 50 -1 18 16 6.2308 4 210 375 4959 2160 EH\001
+4 0 0 50 -1 18 16 5.9341 4 210 615 5634 2205 CRC\001
+4 0 0 50 -1 18 16 5.2185 4 210 375 7519 3590 EH\001
+4 0 0 50 -1 18 18 5.5152 4 210 840 6802 2753 ECC 1\001
+4 0 0 50 -1 18 18 4.7997 4 210 840 7857 4388 ECC 1\001
+4 0 0 50 -1 18 18 5.2360 4 210 855 5927 4128 Data 2\001
+4 0 0 50 -1 18 18 5.4629 4 210 855 3407 5683 Data 3\001
+4 0 0 50 -1 18 18 0.8727 4 45 225 3812 3853 ...\001
+4 0 0 50 -1 18 18 2.1817 4 45 225 2837 6736 ...\001
+4 0 0 50 -1 18 18 1.3963 4 210 1110 2235 5070 Data n-1\001
+4 0 0 50 -1 18 18 0.4712 4 210 840 5957 8108 ECC 2\001
+4 0 0 50 -1 18 16 4.9742 4 210 375 1734 5575 EH\001
+4 0 0 50 -1 18 18 5.5152 4 210 840 2332 6982 ECC 3\001
+4 0 0 50 -1 18 18 4.7124 4 210 840 1679 4545 ECC 3\001
+4 0 0 50 -1 18 18 1.3439 4 45 225 1878 4355 ...\001
+4 0 0 50 -1 18 18 4.7997 4 210 840 9090 4500 ECC k\001
+4 0 0 50 -1 18 16 5.5327 4 210 375 7656 1911 EH\001
+4 0 0 50 -1 18 14 5.3756 4 180 930 7980 2175 ECC k-1\001
+4 0 0 50 -1 18 16 5.9341 4 210 1080 5928 1059 ECC k-1\001
+4 0 0 50 -1 18 16 5.6549 4 210 375 2652 8329 EH\001
+4 0 0 50 -1 18 18 0.5760 4 210 1080 2366 2008 ECC k-2\001
+4 0 0 50 -1 18 18 4.7997 4 210 1080 857 4629 ECC k-3\001
+4 0 0 50 -1 18 18 0.2618 4 45 225 5681 8920 ...\001
+4 0 0 50 -1 18 18 6.1087 4 210 1080 3569 8844 ECC k-4\001
+4 0 0 50 -1 18 18 5.5327 4 210 1080 1612 7378 ECC k-4\001