* Major rewrite of CVT code to unify TIFF and JPEG2000 region

export. Region compositing now in TileManager->getRegion with modified getRegion Kakadu function. Changes also to View class and ColourTransforms code to enable greater modularity for image processing to regions. ColourTransforms renamed to Transforms. Thanks to The National Library of Wales, who will be using iipsrv & iipmooviewer to deliver their Historic Newspapers in 2012.
klokantech · Apr 19, 2012 · 0af895a · 0af895a
1 parent 962f24b
commit 0af895a
Show file tree

Hide file tree

Showing 27 changed files with 930 additions and 893 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,15 @@
+18/04/2012:
+	- Major rewrite of CVT code to unify TIFF and JPEG2000 region
+	  export. Region compositing now in TileManager->getRegion with
+	  modified getRegion Kakadu function. Changes also to View class
+	  and ColourTransforms code to enable greater modularity for
+	  image processing to regions. ColourTransforms renamed to
+	  Transforms.
+	  Thanks to The National Library of Wales, who will be using
+	  iipsrv & iipmooviewer to deliver their Historic Newspapers
+	  in 2012.
+
+
 21/03/2012:
 	- Fix to TPTImage.c to force RGB conversion for YCbCr compressed
 	  JPEG TIFFs, which is now the default in VIPS. Thanks to John

diff --git a/TODO b/TODO
@@ -7,6 +7,7 @@ TODO:
 * ICC profile integration via lcms library
 * Lossless Rotation / transposition support for JPEG tiles
 * JPEG source image support
-* Move all contrast adjustments, colour space changes etc into new Filter class
-* Clean up CVT code
-* Standardize tile cropping
+* Look into using malloc_usable_size to trace real allocated space
+* Lanczos, bilinear etc interpolation for CVT
+* Copy EXIF, IPTC data for CVT exports
+* Optimize FIF code for very large files
diff --git a/configure b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for iipsrv 0.9.9.
+# Generated by GNU Autoconf 2.68 for iipsrv 1.0.
 #
 # Report bugs to <ruven@users.sourceforge.net>.
 #
@@ -570,8 +570,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='iipsrv'
 PACKAGE_TARNAME='iipsrv'
-PACKAGE_VERSION='0.9.9'
-PACKAGE_STRING='iipsrv 0.9.9'
+PACKAGE_VERSION='1.0'
+PACKAGE_STRING='iipsrv 1.0'
 PACKAGE_BUGREPORT='ruven@users.sourceforge.net'
 PACKAGE_URL=''
 
@@ -1323,7 +1323,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures iipsrv 0.9.9 to adapt to many kinds of systems.
+\`configure' configures iipsrv 1.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1393,7 +1393,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of iipsrv 0.9.9:";;
+     short | recursive ) echo "Configuration of iipsrv 1.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1504,7 +1504,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-iipsrv configure 0.9.9
+iipsrv configure 1.0
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2048,7 +2048,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by iipsrv $as_me 0.9.9, which was
+It was created by iipsrv $as_me 1.0, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -2864,7 +2864,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='iipsrv'
- VERSION='0.9.9'
+ VERSION='1.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -17344,7 +17344,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by iipsrv $as_me 0.9.9, which was
+This file was extended by iipsrv $as_me 1.0, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -17401,7 +17401,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-iipsrv config.status 0.9.9
+iipsrv config.status 1.0
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 

diff --git a/configure.in b/configure.in
@@ -1,6 +1,6 @@
 # Process this file with autoconf to produce a configure script.
 
-AC_INIT(iipsrv,0.9.9,ruven@users.sourceforge.net)
+AC_INIT(iipsrv,1.0,ruven@users.sourceforge.net)
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE
 

diff --git a/libtool b/libtool
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 # libtool - Provide generalized library-building support services.
-# Generated automatically by config.status (iipsrv) 0.9.9
+# Generated automatically by config.status (iipsrv) 1.0
 # Libtool was configured on host AgentSmith:
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
 #
@@ -237,10 +237,10 @@ finish_eval=""
 hardcode_into_libs=yes
 
 # Compile-time system search path for libraries.
-sys_lib_search_path_spec="/usr/lib/gcc/x86_64-pc-linux-gnu/4.4.5 /usr/lib64 /lib64 /usr/x86_64-pc-linux-gnu/lib "
+sys_lib_search_path_spec="/usr/lib/gcc/x86_64-pc-linux-gnu/4.5.3 /usr/lib64 /lib64 /usr/x86_64-pc-linux-gnu/lib "
 
 # Run-time system search path for libraries.
-sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/local/lib /usr/x86_64-pc-linux-gnu/lib //usr/lib32/opengl/nvidia/lib //usr/lib64/opengl/nvidia/lib /lib64 /usr/lib64 /usr/local/lib64 /lib32 /usr/lib32 /usr/local/lib32 /lib /usr/lib /usr/lib/gcc/x86_64-pc-linux-gnu/4.4.5 /usr/lib/gcc/x86_64-pc-linux-gnu/4.4.5/32 //usr/lib64/xulrunner-1.9.2 /usr/lib64/qt4 /usr/lib32/qt4 /usr/lib/qt4 /opt/xulrunner /usr/games/lib64 /usr/games/lib32 /usr/games/lib /usr/lib32/libstdc++-v3/ "
+sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/local/lib /usr/x86_64-pc-linux-gnu/lib /usr/lib32/opengl/nvidia/lib /usr/lib64/opengl/nvidia/lib /lib64 /usr/lib64 /usr/local/lib64 /lib32 /usr/lib32 /usr/local/lib32 /lib /usr/lib /usr/lib/gcc/x86_64-pc-linux-gnu/4.5.3 /usr/lib/gcc/x86_64-pc-linux-gnu/4.5.3/32 /usr/lib/gcc/x86_64-pc-linux-gnu/4.4.5 /usr/lib/gcc/x86_64-pc-linux-gnu/4.4.5/32 //usr/lib64/xulrunner-1.9.2 /usr/lib64/qt4 /usr/lib32/qt4 /usr/lib/qt4 /opt/xulrunner /usr/games/lib64 /usr/games/lib32 /usr/games/lib /opt/cuda/lib64 /usr/lib32/libstdc++-v3/ "
 
 # Whether dlopen is supported.
 dlopen_support=unknown
@@ -9390,17 +9390,17 @@ file_list_spec=""
 hardcode_action=immediate
 
 # The directories searched by this compiler when creating a shared library.
-compiler_lib_search_dirs="/usr/lib/gcc/x86_64-pc-linux-gnu/4.4.5 /usr/lib/gcc/x86_64-pc-linux-gnu/4.4.5 /usr/lib/gcc/x86_64-pc-linux-gnu/4.4.5/../../../../lib64 /lib/../lib64 /usr/lib/../lib64 /usr/lib/gcc/x86_64-pc-linux-gnu/4.4.5/../../../../x86_64-pc-linux-gnu/lib /usr/lib/gcc/x86_64-pc-linux-gnu/4.4.5/../../.."
+compiler_lib_search_dirs="/usr/lib/gcc/x86_64-pc-linux-gnu/4.5.3 /usr/lib/gcc/x86_64-pc-linux-gnu/4.5.3/../../../../lib64 /lib/../lib64 /usr/lib/../lib64 /usr/lib/gcc/x86_64-pc-linux-gnu/4.5.3/../../../../x86_64-pc-linux-gnu/lib /usr/lib/gcc/x86_64-pc-linux-gnu/4.5.3/../../.."
 
 # Dependencies to place before and after the objects being linked to
 # create a shared library.
-predep_objects="/usr/lib/gcc/x86_64-pc-linux-gnu/4.4.5/../../../../lib64/crti.o /usr/lib/gcc/x86_64-pc-linux-gnu/4.4.5/crtbeginS.o"
-postdep_objects="/usr/lib/gcc/x86_64-pc-linux-gnu/4.4.5/crtendS.o /usr/lib/gcc/x86_64-pc-linux-gnu/4.4.5/../../../../lib64/crtn.o"
+predep_objects="/usr/lib/gcc/x86_64-pc-linux-gnu/4.5.3/../../../../lib64/crti.o /usr/lib/gcc/x86_64-pc-linux-gnu/4.5.3/crtbeginS.o"
+postdep_objects="/usr/lib/gcc/x86_64-pc-linux-gnu/4.5.3/crtendS.o /usr/lib/gcc/x86_64-pc-linux-gnu/4.5.3/../../../../lib64/crtn.o"
 predeps=""
 postdeps="-lstdc++ -lm -lgcc_s -lc -lgcc_s"
 
 # The library search path used internally by the compiler when linking
 # a shared library.
-compiler_lib_search_path="-L/usr/lib/gcc/x86_64-pc-linux-gnu/4.4.5 -L/usr/lib/gcc/x86_64-pc-linux-gnu/4.4.5 -L/usr/lib/gcc/x86_64-pc-linux-gnu/4.4.5/../../../../lib64 -L/lib/../lib64 -L/usr/lib/../lib64 -L/usr/lib/gcc/x86_64-pc-linux-gnu/4.4.5/../../../../x86_64-pc-linux-gnu/lib -L/usr/lib/gcc/x86_64-pc-linux-gnu/4.4.5/../../.."
+compiler_lib_search_path="-L/usr/lib/gcc/x86_64-pc-linux-gnu/4.5.3 -L/usr/lib/gcc/x86_64-pc-linux-gnu/4.5.3/../../../../lib64 -L/lib/../lib64 -L/usr/lib/../lib64 -L/usr/lib/gcc/x86_64-pc-linux-gnu/4.5.3/../../../../x86_64-pc-linux-gnu/lib -L/usr/lib/gcc/x86_64-pc-linux-gnu/4.5.3/../../.."
 
 # ### END LIBTOOL TAG CONFIG: CXX