[med-svn] r12754 - in trunk/packages/dicom3tools/trunk/debian: . patches

Wed Jan 9 11:09:45 UTC 2013

Author: malat
Date: 2013-01-09 11:09:45 +0000 (Wed, 09 Jan 2013)
New Revision: 12754

Added:
   trunk/packages/dicom3tools/trunk/debian/patches/fixkdu.patch
Modified:
   trunk/packages/dicom3tools/trunk/debian/changelog
   trunk/packages/dicom3tools/trunk/debian/patches/bmpdump.man.patch
   trunk/packages/dicom3tools/trunk/debian/patches/codeblockstylefix.patch
   trunk/packages/dicom3tools/trunk/debian/patches/jpegdump.man.patch
   trunk/packages/dicom3tools/trunk/debian/patches/project.tmpl.patch
   trunk/packages/dicom3tools/trunk/debian/patches/pvrg_naming.patch
   trunk/packages/dicom3tools/trunk/debian/patches/series
   trunk/packages/dicom3tools/trunk/debian/patches/strip.patch
Log:
Minor fixes

Modified: trunk/packages/dicom3tools/trunk/debian/changelog
===================================================================

--- trunk/packages/dicom3tools/trunk/debian/changelog	2013-01-09 10:51:59 UTC (rev 12753)
+++ trunk/packages/dicom3tools/trunk/debian/changelog	2013-01-09 11:09:45 UTC (rev 12754)
@@ -3,6 +3,7 @@
   * New upstream
   * Switch Std-Vers to 3.9.4, no changes needed
   * Use upstream bzip2 tarball directly
+  * Fix dcj2k with no option (lossless was lossy)
 
  -- Mathieu Malaterre <malat at debian.org>  Wed, 09 Jan 2013 11:50:45 +0100
 

Modified: trunk/packages/dicom3tools/trunk/debian/patches/bmpdump.man.patch
===================================================================
--- trunk/packages/dicom3tools/trunk/debian/patches/bmpdump.man.patch	2013-01-09 10:51:59 UTC (rev 12753)
+++ trunk/packages/dicom3tools/trunk/debian/patches/bmpdump.man.patch	2013-01-09 11:09:45 UTC (rev 12754)
@@ -1,5 +1,5 @@
 Description: the bmpdump.man file was empty. We need to provide a minimal one instead.
-Author: Mathieu Malaterre <mathieu.malaterre at gmail.com>
+Author: Mathieu Malaterre <malat at debian.org>
 Forwarded: not-needed
 Last-Update: 2012-03-05
 
@@ -20,5 +20,5 @@
 +dumps a BMP file, it will display the structure and values contained in the specified BMP file
 +
 +This manual page was written by Mathieu Malaterre
-+<mathieu.malaterre at gmail.com> for the Debian GNU/Linux system (but may be used by others).
++<malat at debian.org> for the Debian GNU/Linux system (but may be used by others).
 +

Modified: trunk/packages/dicom3tools/trunk/debian/patches/codeblockstylefix.patch
===================================================================
--- trunk/packages/dicom3tools/trunk/debian/patches/codeblockstylefix.patch	2013-01-09 10:51:59 UTC (rev 12753)
+++ trunk/packages/dicom3tools/trunk/debian/patches/codeblockstylefix.patch	2013-01-09 11:09:45 UTC (rev 12754)
@@ -1,6 +1,7 @@
 Description: Invalid Code-block style for the SPcod and SPcoc parameters
 Author: Mathieu Malaterre <malat at debian.org>
 Bug-Debian: http://bugs.debian.org/668629
+
 Index: dicom3tools-1.0~20120505/appsrc/misc/jpegdump.cc
 ===================================================================
 --- dicom3tools-1.0~20120505.orig/appsrc/misc/jpegdump.cc	2012-05-20 19:00:02.000000000 +0200

Added: trunk/packages/dicom3tools/trunk/debian/patches/fixkdu.patch
===================================================================
--- trunk/packages/dicom3tools/trunk/debian/patches/fixkdu.patch	                        (rev 0)
+++ trunk/packages/dicom3tools/trunk/debian/patches/fixkdu.patch	2013-01-09 11:09:45 UTC (rev 12754)
@@ -0,0 +1,35 @@
+Description: dcj2k would not compress losslessly (as-advertized)
+ since kdu_compress is lossy by default (no option)
+Author: Mathieu Malaterre <malat at debian.org>
+Forwarded: not-needed
+Last-Update: 2013-01-09
+
+Index: dicom3tools_1.00.snapshot.20121227/appsrc/dcfile/dcj2k.script
+===================================================================
+--- dicom3tools_1.00.snapshot.20121227.orig/appsrc/dcfile/dcj2k.script	2013-01-09 11:53:47.551006855 +0100
++++ dicom3tools_1.00.snapshot.20121227/appsrc/dcfile/dcj2k.script	2013-01-09 12:04:52.751010805 +0100
+@@ -13,6 +13,7 @@
+ DCKEY=dckey
+ DCENCAP=dcencap
+ J2KCOMPRESS=kdu_compress
++j2kcompress_rev=yes
+ 
+ infile="$1"
+ shift
+@@ -30,6 +31,7 @@
+ 		transfersyntax="1.2.840.10008.1.2.4.91"
+ 		compressionattributes="-r LossyImageCompression 01 -r LossyImageCompressionMethod ISO_15444_1"
+ 		addcompressionratio="yes"
++		j2kcompress_rev=no
+ 	else
+ 		transfersyntax="1.2.840.10008.1.2.4.90"
+ 	fi
+@@ -61,7 +63,7 @@
+ $DCCP "${infile}" "${TMPROOT}.big.dcm" -endian big -vr explicit
+ $DCTORAW -quiet "${TMPROOT}.big.dcm" "${TMPROOT}.big.raw"
+ rm "${TMPROOT}.big.dcm"
+-$J2KCOMPRESS -i "${TMPROOT}.big.raw" -o "${TMPROOT}.j2c" Sdims=\{"${height}","${width}"\} Sprecision="${precision}" Ssigned="${signed}" $* 	# creates $TMPROOT.big.raw.jpg
++$J2KCOMPRESS Creversible=${j2kcompress_rev} -i "${TMPROOT}.big.raw" -o "${TMPROOT}.j2c" Sdims=\{"${height}","${width}"\} Sprecision="${precision}" Ssigned="${signed}" $* 	# creates $TMPROOT.big.raw.jpg
+ if [ "${addcompressionratio}" = "yes" ]
+ then
+ 	uncompressedfilesize=`ls -l "${TMPROOT}.big.raw" | awk '{print $5}'`

Modified: trunk/packages/dicom3tools/trunk/debian/patches/jpegdump.man.patch
===================================================================
--- trunk/packages/dicom3tools/trunk/debian/patches/jpegdump.man.patch	2013-01-09 10:51:59 UTC (rev 12753)
+++ trunk/packages/dicom3tools/trunk/debian/patches/jpegdump.man.patch	2013-01-09 11:09:45 UTC (rev 12754)
@@ -1,5 +1,5 @@
 Description: the jpegdump.man file was empty. We need to provide a minimal one instead.
-Author: Mathieu Malaterre <mathieu.malaterre at gmail.com>
+Author: Mathieu Malaterre <malat at debian.org>
 Forwarded: not-needed
 Last-Update: 2012-03-05
 
@@ -20,5 +20,5 @@
 +dumps a JPEG file, it will display the structure and values contained in the specified JPEG file
 +
 +This manual page was written by Mathieu Malaterre
-+<mathieu.malaterre at gmail.com> for the Debian GNU/Linux system (but may be used by others).
++<malat at debian.org> for the Debian GNU/Linux system (but may be used by others).
 +

Modified: trunk/packages/dicom3tools/trunk/debian/patches/project.tmpl.patch
===================================================================
--- trunk/packages/dicom3tools/trunk/debian/patches/project.tmpl.patch	2013-01-09 10:51:59 UTC (rev 12753)
+++ trunk/packages/dicom3tools/trunk/debian/patches/project.tmpl.patch	2013-01-09 11:09:45 UTC (rev 12754)
@@ -1,5 +1,5 @@
 Description: This is a patch to install in /usr/bin instead of /local
-Author: Mathieu Malaterre <mathieu.malaterre at gmail.com>
+Author: Mathieu Malaterre <malat at debian.org>
 Forwarded: not-needed
 Last-Update: 2012-03-05
 

Modified: trunk/packages/dicom3tools/trunk/debian/patches/pvrg_naming.patch
===================================================================
--- trunk/packages/dicom3tools/trunk/debian/patches/pvrg_naming.patch	2013-01-09 10:51:59 UTC (rev 12753)
+++ trunk/packages/dicom3tools/trunk/debian/patches/pvrg_naming.patch	2013-01-09 11:09:45 UTC (rev 12754)
@@ -1,5 +1,5 @@
 Description: Use debian convention for pvrg naming
-Author: Mathieu Malaterre <mathieu.malaterre at gmail.com>
+Author: Mathieu Malaterre <malat at debian.org>
 Forwarded: not-needed
 Last-Update: 2012-03-05
 

Modified: trunk/packages/dicom3tools/trunk/debian/patches/series
===================================================================
--- trunk/packages/dicom3tools/trunk/debian/patches/series	2013-01-09 10:51:59 UTC (rev 12753)
+++ trunk/packages/dicom3tools/trunk/debian/patches/series	2013-01-09 11:09:45 UTC (rev 12754)
@@ -1,3 +1,4 @@
+fixkdu.patch
 project.tmpl.patch
 #20_gcc4.3.patch
 strip.patch

Modified: trunk/packages/dicom3tools/trunk/debian/patches/strip.patch
===================================================================
--- trunk/packages/dicom3tools/trunk/debian/patches/strip.patch	2013-01-09 10:51:59 UTC (rev 12753)
+++ trunk/packages/dicom3tools/trunk/debian/patches/strip.patch	2013-01-09 11:09:45 UTC (rev 12754)
@@ -1,7 +1,7 @@
 Description: Remove hard-coded strip call, instead rely on dh_strip to do the work
  so that we respect DEB_BUILD_OPTION=nostrip
  We also need to remove the -s from the 'install' command (InstPgmFlags)
-Author: Mathieu Malaterre <mathieu.malaterre at gmail.com>
+Author: Mathieu Malaterre <malat at debian.org>
 Forwarded: not-needed
 Last-Update: 2012-03-05
 


