mxe-octave: src/dcmtk-1-fixes.patch annotate

annotate src/dcmtk-1-fixes.patch @ 3725:2acaa9943159

qscintilla: update 2.8.4 * src/qscintilla.mk: update to version and checksum for 2.8.4

author	John Donoghue
date	Mon, 20 Oct 2014 11:01:00 -0400
parents	99516e73b368
children	fb000475ca16

rev	line source
2333 f653602a0500 Rebrand to new project name MXE Volker Grabsch <vog@notjusthosting.com> parents: 2324 diff changeset	1 This file is part of MXE.
2353 99516e73b368 Move doc/index.html -> index.html Volker Grabsch <vog@notjusthosting.com> parents: 2333 diff changeset	2 See index.html for further information.
2304 e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	3
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	4 Contains ad hoc patches for cross building.
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	5
2324 31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	6 From ac29986df03482c61dbd7271554e6bc453228bd6 Mon Sep 17 00:00:00 2001
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	7 From: Joerg Riesmeier <dicom@offis.de>
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	8 Date: Thu, 17 Nov 2011 16:13:14 +0000
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	9 Subject: [PATCH] Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	10 compiler) quiet.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	11
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	12 (cherry picked from commit dbadc0d8f3760f65504406c8b2cb8633f868a258)
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	13
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	14 Conflicts:
2304 e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	15
2324 31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	16 CHANGES.361
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	17 ofstd/libsrc/ofchrenc.cc
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	18 ---
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	19 dcmimage/include/dcmtk/dcmimage/diargpxt.h \| 25 ++++++++++++++-----------
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	20 dcmimage/include/dcmtk/dcmimage/dicmypxt.h \| 11 +++++++----
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	21 dcmimage/include/dcmtk/dcmimage/dicocpt.h \| 11 +++++++----
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	22 dcmimage/include/dcmtk/dcmimage/dicoflt.h \| 17 ++++++++++-------
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	23 dcmimage/include/dcmtk/dcmimage/dicorot.h \| 17 ++++++++++-------
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	24 dcmimage/include/dcmtk/dcmimage/dicosct.h \| 13 ++++++++-----
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	25 dcmimage/include/dcmtk/dcmimage/dihsvpxt.h \| 11 +++++++----
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	26 dcmimage/include/dcmtk/dcmimage/dipalpxt.h \| 11 +++++++----
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	27 dcmimage/include/dcmtk/dcmimage/dirgbpxt.h \| 15 +++++++++------
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	28 dcmimage/include/dcmtk/dcmimage/diybrpxt.h \| 15 +++++++++------
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	29 dcmimage/include/dcmtk/dcmimage/diyf2pxt.h \| 11 +++++++----
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	30 dcmimage/include/dcmtk/dcmimage/diyp2pxt.h \| 11 +++++++----
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	31 dcmimgle/include/dcmtk/dcmimgle/diflipt.h \| 11 +++++++----
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	32 dcmimgle/include/dcmtk/dcmimgle/dimoflt.h \| 15 +++++++++------
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	33 dcmimgle/include/dcmtk/dcmimgle/dimoipxt.h \| 13 ++++++++-----
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	34 dcmimgle/include/dcmtk/dcmimgle/dimorot.h \| 15 +++++++++------
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	35 dcmimgle/include/dcmtk/dcmimgle/dimosct.h \| 11 +++++++----
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	36 dcmimgle/include/dcmtk/dcmimgle/dirotat.h \| 11 +++++++----
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	37 dcmimgle/include/dcmtk/dcmimgle/discalet.h \| 19 +++++++++++--------
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	38 ofstd/include/dcmtk/ofstd/ofoset.h \| 13 ++++++++-----
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	39 20 files changed, 168 insertions(+), 108 deletions(-)
2304 e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	40
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	41 diff --git a/dcmimage/include/dcmtk/dcmimage/diargpxt.h b/dcmimage/include/dcmtk/dcmimage/diargpxt.h
2324 31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	42 index 7e3894d..1ed9291 100644
2304 e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	43 --- a/dcmimage/include/dcmtk/dcmimage/diargpxt.h
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	44 +++ b/dcmimage/include/dcmtk/dcmimage/diargpxt.h
2324 31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	45 @@ -1,6 +1,6 @@
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	46 /*
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	47 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	48 - * Copyright (C) 1996-2010, OFFIS e.V.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	49 + * Copyright (C) 1996-2011, OFFIS e.V.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	50 * All rights reserved. See COPYRIGHT file for details.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	51 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	52 * This software and supporting documentation were developed by
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	53 @@ -18,8 +18,8 @@
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	54 * Purpose: DicomARGBPixelTemplate (Header) - UNTESTED !!!
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	55 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	56 * Last Update: $Author: joergr $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	57 - * Update Date: $Date: 2010-10-14 13:16:29 $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	58 - * CVS/RCS Revision: $Revision: 1.21 $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	59 + * Update Date: $Date: 2011-11-17 16:13:14 $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	60 + * CVS/RCS Revision: $Revision: 1.22 $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	61 * Status: $State: Exp $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	62 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	63 * CVS/RCS Log at end of file
2304 e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	64 @@ -91,7 +91,7 @@ class DiARGBPixelTemplate
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	65 const unsigned long planeSize,
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	66 const int bits)
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	67 { // not very much optimized, but no one really uses ARGB !!
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	68 - if (Init(pixel))
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	69 + if (this->Init(pixel))
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	70 {
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	71 register T2 value;
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	72 const T1 offset = OFstatic_cast(T1, DicomImageClass::maxval(bits - 1));
2324 31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	73 @@ -103,9 +103,9 @@ class DiARGBPixelTemplate
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	74 /*
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	75 register const T1 *a = pixel; // points to alpha plane
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	76 const T1 *rgb[3];
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	77 - rgb[0] = a + this->InputCount; // points to red plane
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	78 - rgb[1] = rgb[0] + this->InputCount; // points to green plane
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	79 - rgb[2] = rgb[1] + this->InputCount; // points to blue plane
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	80 + rgb[0] = a + this->InputCount; // points to red plane
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	81 + rgb[1] = rgb[0] + this->InputCount; // points to green plane
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	82 + rgb[2] = rgb[1] + this->InputCount; // points to blue plane
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	83 for (i = 0; i < count; ++i)
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	84 {
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	85 value = OFstatic_cast(T2, *(a++)); // get alpha value
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	86 @@ -141,10 +141,10 @@ class DiARGBPixelTemplate
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	87 /* convert a single frame */
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	88 for (l = planeSize; (l != 0) && (i < count); --l, ++i)
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	89 {
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	90 - value = OFstatic_cast(T2, *(a++)); // get alpha value
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	91 + value = OFstatic_cast(T2, *(a++)); // get alpha value
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	92 if (value > 0)
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	93 {
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	94 - for (int j = 0; j < 3; ++j) // set palette color
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	95 + for (int j = 0; j < 3; ++j) // set palette color
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	96 {
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	97 if (value <= palette[j]->getFirstEntry(value))
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	98 this->Data[j][i] = OFstatic_cast(T3, palette[j]->getFirstValue());
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	99 @@ -152,12 +152,12 @@ class DiARGBPixelTemplate
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	100 this->Data[j][i] = OFstatic_cast(T3, palette[j]->getLastValue());
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	101 else
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	102 this->Data[j][i] = OFstatic_cast(T3, palette[j]->getValue(value));
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	103 - ++rgb[j]; // skip RGB values
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	104 + ++rgb[j]; // skip RGB values
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	105 }
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	106 }
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	107 else
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	108 {
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	109 - for (int j = 0; j < 3; ++j) // copy RGB values
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	110 + for (int j = 0; j < 3; ++j) // copy RGB values
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	111 this->Data[j][i] = OFstatic_cast(T3, removeSign(*(rgb[j]++), offset));
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	112 }
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	113 }
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	114 @@ -204,6 +204,9 @@ class DiARGBPixelTemplate
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	115 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	116 * CVS/RCS Log:
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	117 * $Log: diargpxt.h,v $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	118 + * Revision 1.22 2011-11-17 16:13:14 joergr
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	119 + * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	120 + *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	121 * Revision 1.21 2010-10-14 13:16:29 joergr
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	122 * Updated copyright header. Added reference to COPYRIGHT file.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	123 *
2304 e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	124 diff --git a/dcmimage/include/dcmtk/dcmimage/dicmypxt.h b/dcmimage/include/dcmtk/dcmimage/dicmypxt.h
2324 31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	125 index 5357780..bf1161e 100644
2304 e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	126 --- a/dcmimage/include/dcmtk/dcmimage/dicmypxt.h
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	127 +++ b/dcmimage/include/dcmtk/dcmimage/dicmypxt.h
2324 31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	128 @@ -1,6 +1,6 @@
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	129 /*
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	130 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	131 - * Copyright (C) 1996-2010, OFFIS e.V.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	132 + * Copyright (C) 1996-2011, OFFIS e.V.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	133 * All rights reserved. See COPYRIGHT file for details.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	134 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	135 * This software and supporting documentation were developed by
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	136 @@ -18,8 +18,8 @@
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	137 * Purpose: DicomCMYKPixelTemplate (Header)
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	138 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	139 * Last Update: $Author: joergr $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	140 - * Update Date: $Date: 2010-10-14 13:16:29 $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	141 - * CVS/RCS Revision: $Revision: 1.20 $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	142 + * Update Date: $Date: 2011-11-17 16:13:14 $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	143 + * CVS/RCS Revision: $Revision: 1.21 $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	144 * Status: $State: Exp $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	145 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	146 * CVS/RCS Log at end of file
2304 e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	147 @@ -87,7 +87,7 @@ class DiCMYKPixelTemplate
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	148 const unsigned long planeSize,
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	149 const int bits)
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	150 {
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	151 - if (Init(pixel))
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	152 + if (this->Init(pixel))
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	153 {
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	154 // use the number of input pixels derived from the length of the 'PixelData'
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	155 // attribute), but not more than the size of the intermediate buffer
2324 31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	156 @@ -157,6 +157,9 @@ class DiCMYKPixelTemplate
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	157 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	158 * CVS/RCS Log:
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	159 * $Log: dicmypxt.h,v $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	160 + * Revision 1.21 2011-11-17 16:13:14 joergr
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	161 + * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	162 + *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	163 * Revision 1.20 2010-10-14 13:16:29 joergr
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	164 * Updated copyright header. Added reference to COPYRIGHT file.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	165 *
2304 e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	166 diff --git a/dcmimage/include/dcmtk/dcmimage/dicocpt.h b/dcmimage/include/dcmtk/dcmimage/dicocpt.h
2324 31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	167 index 0c06de7..3f03b6b 100644
2304 e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	168 --- a/dcmimage/include/dcmtk/dcmimage/dicocpt.h
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	169 +++ b/dcmimage/include/dcmtk/dcmimage/dicocpt.h
2324 31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	170 @@ -1,6 +1,6 @@
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	171 /*
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	172 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	173 - * Copyright (C) 1998-2010, OFFIS e.V.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	174 + * Copyright (C) 1998-2011, OFFIS e.V.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	175 * All rights reserved. See COPYRIGHT file for details.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	176 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	177 * This software and supporting documentation were developed by
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	178 @@ -18,8 +18,8 @@
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	179 * Purpose: DicomColorCopyTemplate (Header)
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	180 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	181 * Last Update: $Author: joergr $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	182 - * Update Date: $Date: 2010-10-14 13:16:29 $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	183 - * CVS/RCS Revision: $Revision: 1.12 $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	184 + * Update Date: $Date: 2011-11-17 16:13:14 $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	185 + * CVS/RCS Revision: $Revision: 1.13 $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	186 * Status: $State: Exp $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	187 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	188 * CVS/RCS Log at end of file
2304 e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	189 @@ -86,7 +86,7 @@ class DiColorCopyTemplate
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	190 inline void copy(const T *pixel[3],
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	191 const unsigned long offset)
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	192 {
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	193 - if (Init(pixel))
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	194 + if (this->Init(pixel))
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	195 {
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	196 for (int j = 0; j < 3; j++)
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	197 OFBitmanipTemplate<T>::copyMem(pixel[j] + offset, this->Data[j], this->getCount());
2324 31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	198 @@ -102,6 +102,9 @@ class DiColorCopyTemplate
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	199 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	200 * CVS/RCS Log:
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	201 * $Log: dicocpt.h,v $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	202 + * Revision 1.13 2011-11-17 16:13:14 joergr
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	203 + * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	204 + *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	205 * Revision 1.12 2010-10-14 13:16:29 joergr
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	206 * Updated copyright header. Added reference to COPYRIGHT file.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	207 *
2304 e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	208 diff --git a/dcmimage/include/dcmtk/dcmimage/dicoflt.h b/dcmimage/include/dcmtk/dcmimage/dicoflt.h
2324 31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	209 index a5bed81..bc809ab 100644
2304 e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	210 --- a/dcmimage/include/dcmtk/dcmimage/dicoflt.h
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	211 +++ b/dcmimage/include/dcmtk/dcmimage/dicoflt.h
2324 31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	212 @@ -1,6 +1,6 @@
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	213 /*
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	214 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	215 - * Copyright (C) 1998-2010, OFFIS e.V.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	216 + * Copyright (C) 1998-2011, OFFIS e.V.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	217 * All rights reserved. See COPYRIGHT file for details.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	218 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	219 * This software and supporting documentation were developed by
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	220 @@ -18,8 +18,8 @@
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	221 * Purpose: DicomColorFlipTemplate (Header)
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	222 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	223 * Last Update: $Author: joergr $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	224 - * Update Date: $Date: 2010-10-14 13:16:29 $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	225 - * CVS/RCS Revision: $Revision: 1.15 $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	226 + * Update Date: $Date: 2011-11-17 16:13:14 $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	227 + * CVS/RCS Revision: $Revision: 1.16 $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	228 * Status: $State: Exp $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	229 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	230 * CVS/RCS Log at end of file
2304 e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	231 @@ -98,14 +98,14 @@ class DiColorFlipTemplate
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	232 const int horz,
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	233 const int vert)
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	234 {
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	235 - if (Init(pixel))
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	236 + if (this->Init(pixel))
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	237 {
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	238 if (horz && vert)
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	239 - flipHorzVert(pixel, this->Data);
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	240 + this->flipHorzVert(pixel, this->Data);
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	241 else if (horz)
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	242 - flipHorz(pixel, this->Data);
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	243 + this->flipHorz(pixel, this->Data);
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	244 else if (vert)
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	245 - flipVert(pixel, this->Data);
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	246 + this->flipVert(pixel, this->Data);
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	247 }
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	248 }
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	249 };
2324 31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	250 @@ -118,6 +118,9 @@ class DiColorFlipTemplate
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	251 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	252 * CVS/RCS Log:
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	253 * $Log: dicoflt.h,v $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	254 + * Revision 1.16 2011-11-17 16:13:14 joergr
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	255 + * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	256 + *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	257 * Revision 1.15 2010-10-14 13:16:29 joergr
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	258 * Updated copyright header. Added reference to COPYRIGHT file.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	259 *
2304 e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	260 diff --git a/dcmimage/include/dcmtk/dcmimage/dicorot.h b/dcmimage/include/dcmtk/dcmimage/dicorot.h
2324 31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	261 index 2bcd71e..c8afd70 100644
2304 e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	262 --- a/dcmimage/include/dcmtk/dcmimage/dicorot.h
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	263 +++ b/dcmimage/include/dcmtk/dcmimage/dicorot.h
2324 31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	264 @@ -1,6 +1,6 @@
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	265 /*
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	266 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	267 - * Copyright (C) 1998-2010, OFFIS e.V.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	268 + * Copyright (C) 1998-2011, OFFIS e.V.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	269 * All rights reserved. See COPYRIGHT file for details.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	270 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	271 * This software and supporting documentation were developed by
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	272 @@ -18,8 +18,8 @@
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	273 * Purpose: DicomColorRotateTemplate (Header)
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	274 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	275 * Last Update: $Author: joergr $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	276 - * Update Date: $Date: 2010-10-14 13:16:29 $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	277 - * CVS/RCS Revision: $Revision: 1.15 $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	278 + * Update Date: $Date: 2011-11-17 16:13:14 $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	279 + * CVS/RCS Revision: $Revision: 1.16 $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	280 * Status: $State: Exp $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	281 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	282 * CVS/RCS Log at end of file
2304 e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	283 @@ -98,14 +98,14 @@ class DiColorRotateTemplate
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	284 inline void rotate(const T *pixel[3],
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	285 const int degree)
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	286 {
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	287 - if (Init(pixel))
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	288 + if (this->Init(pixel))
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	289 {
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	290 if (degree == 90)
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	291 - rotateRight(pixel, this->Data);
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	292 + this->rotateRight(pixel, this->Data);
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	293 else if (degree == 180)
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	294 - rotateTopDown(pixel, this->Data);
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	295 + this->rotateTopDown(pixel, this->Data);
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	296 else if (degree == 270)
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	297 - rotateLeft(pixel, this->Data);
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	298 + this->rotateLeft(pixel, this->Data);
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	299 }
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	300 }
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	301 };
2324 31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	302 @@ -118,6 +118,9 @@ class DiColorRotateTemplate
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	303 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	304 * CVS/RCS Log:
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	305 * $Log: dicorot.h,v $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	306 + * Revision 1.16 2011-11-17 16:13:14 joergr
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	307 + * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	308 + *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	309 * Revision 1.15 2010-10-14 13:16:29 joergr
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	310 * Updated copyright header. Added reference to COPYRIGHT file.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	311 *
2304 e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	312 diff --git a/dcmimage/include/dcmtk/dcmimage/dicosct.h b/dcmimage/include/dcmtk/dcmimage/dicosct.h
2324 31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	313 index 006a829..3bccc45 100644
2304 e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	314 --- a/dcmimage/include/dcmtk/dcmimage/dicosct.h
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	315 +++ b/dcmimage/include/dcmtk/dcmimage/dicosct.h
2324 31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	316 @@ -1,6 +1,6 @@
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	317 /*
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	318 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	319 - * Copyright (C) 1996-2010, OFFIS e.V.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	320 + * Copyright (C) 1996-2011, OFFIS e.V.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	321 * All rights reserved. See COPYRIGHT file for details.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	322 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	323 * This software and supporting documentation were developed by
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	324 @@ -18,8 +18,8 @@
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	325 * Purpose: DicomColorScaleTemplate (Header)
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	326 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	327 * Last Update: $Author: joergr $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	328 - * Update Date: $Date: 2010-10-14 13:16:29 $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	329 - * CVS/RCS Revision: $Revision: 1.21 $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	330 + * Update Date: $Date: 2011-11-17 16:13:14 $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	331 + * CVS/RCS Revision: $Revision: 1.22 $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	332 * Status: $State: Exp $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	333 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	334 * CVS/RCS Log at end of file
2304 e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	335 @@ -107,8 +107,8 @@ class DiColorScaleTemplate
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	336 inline void scale(const T *pixel[3],
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	337 const int interpolate)
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	338 {
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	339 - if (Init(pixel))
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	340 - scaleData(pixel, this->Data, interpolate);
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	341 + if (this->Init(pixel))
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	342 + this->scaleData(pixel, this->Data, interpolate);
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	343 }
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	344 };
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	345
2324 31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	346 @@ -120,6 +120,9 @@ class DiColorScaleTemplate
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	347 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	348 * CVS/RCS Log:
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	349 * $Log: dicosct.h,v $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	350 + * Revision 1.22 2011-11-17 16:13:14 joergr
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	351 + * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	352 + *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	353 * Revision 1.21 2010-10-14 13:16:29 joergr
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	354 * Updated copyright header. Added reference to COPYRIGHT file.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	355 *
2304 e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	356 diff --git a/dcmimage/include/dcmtk/dcmimage/dihsvpxt.h b/dcmimage/include/dcmtk/dcmimage/dihsvpxt.h
2324 31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	357 index 10d8b70..52580ec 100644
2304 e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	358 --- a/dcmimage/include/dcmtk/dcmimage/dihsvpxt.h
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	359 +++ b/dcmimage/include/dcmtk/dcmimage/dihsvpxt.h
2324 31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	360 @@ -1,6 +1,6 @@
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	361 /*
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	362 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	363 - * Copyright (C) 1996-2010, OFFIS e.V.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	364 + * Copyright (C) 1996-2011, OFFIS e.V.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	365 * All rights reserved. See COPYRIGHT file for details.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	366 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	367 * This software and supporting documentation were developed by
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	368 @@ -18,8 +18,8 @@
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	369 * Purpose: DicomHSVPixelTemplate (Header)
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	370 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	371 * Last Update: $Author: joergr $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	372 - * Update Date: $Date: 2010-10-14 13:16:29 $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	373 - * CVS/RCS Revision: $Revision: 1.25 $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	374 + * Update Date: $Date: 2011-11-17 16:13:14 $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	375 + * CVS/RCS Revision: $Revision: 1.26 $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	376 * Status: $State: Exp $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	377 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	378 * CVS/RCS Log at end of file
2304 e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	379 @@ -87,7 +87,7 @@ class DiHSVPixelTemplate
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	380 const unsigned long planeSize,
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	381 const int bits)
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	382 {
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	383 - if (Init(pixel))
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	384 + if (this->Init(pixel))
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	385 {
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	386 register T2 *r = this->Data[0];
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	387 register T2 *g = this->Data[1];
2324 31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	388 @@ -221,6 +221,9 @@ class DiHSVPixelTemplate
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	389 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	390 * CVS/RCS Log:
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	391 * $Log: dihsvpxt.h,v $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	392 + * Revision 1.26 2011-11-17 16:13:14 joergr
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	393 + * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	394 + *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	395 * Revision 1.25 2010-10-14 13:16:29 joergr
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	396 * Updated copyright header. Added reference to COPYRIGHT file.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	397 *
2304 e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	398 diff --git a/dcmimage/include/dcmtk/dcmimage/dipalpxt.h b/dcmimage/include/dcmtk/dcmimage/dipalpxt.h
2324 31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	399 index 2e5eef7..1ae2352 100644
2304 e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	400 --- a/dcmimage/include/dcmtk/dcmimage/dipalpxt.h
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	401 +++ b/dcmimage/include/dcmtk/dcmimage/dipalpxt.h
2324 31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	402 @@ -1,6 +1,6 @@
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	403 /*
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	404 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	405 - * Copyright (C) 1996-2010, OFFIS e.V.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	406 + * Copyright (C) 1996-2011, OFFIS e.V.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	407 * All rights reserved. See COPYRIGHT file for details.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	408 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	409 * This software and supporting documentation were developed by
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	410 @@ -18,8 +18,8 @@
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	411 * Purpose: DicomPalettePixelTemplate (Header)
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	412 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	413 * Last Update: $Author: joergr $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	414 - * Update Date: $Date: 2010-10-14 13:16:29 $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	415 - * CVS/RCS Revision: $Revision: 1.24 $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	416 + * Update Date: $Date: 2011-11-17 16:13:14 $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	417 + * CVS/RCS Revision: $Revision: 1.25 $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	418 * Status: $State: Exp $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	419 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	420 * CVS/RCS Log at end of file
2304 e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	421 @@ -92,7 +92,7 @@ class DiPalettePixelTemplate
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	422 void convert(const T1 *pixel,
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	423 DiLookupTable *palette[3])
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	424 { // can be optimized if necessary !
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	425 - if (Init(pixel))
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	426 + if (this->Init(pixel))
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	427 {
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	428 register const T1 *p = pixel;
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	429 register T2 value = 0;
2324 31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	430 @@ -126,6 +126,9 @@ class DiPalettePixelTemplate
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	431 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	432 * CVS/RCS Log:
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	433 * $Log: dipalpxt.h,v $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	434 + * Revision 1.25 2011-11-17 16:13:14 joergr
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	435 + * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	436 + *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	437 * Revision 1.24 2010-10-14 13:16:29 joergr
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	438 * Updated copyright header. Added reference to COPYRIGHT file.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	439 *
2304 e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	440 diff --git a/dcmimage/include/dcmtk/dcmimage/dirgbpxt.h b/dcmimage/include/dcmtk/dcmimage/dirgbpxt.h
2324 31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	441 index 85f973d..d9cc7ed 100644
2304 e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	442 --- a/dcmimage/include/dcmtk/dcmimage/dirgbpxt.h
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	443 +++ b/dcmimage/include/dcmtk/dcmimage/dirgbpxt.h
2324 31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	444 @@ -1,6 +1,6 @@
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	445 /*
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	446 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	447 - * Copyright (C) 1996-2010, OFFIS e.V.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	448 + * Copyright (C) 1996-2011, OFFIS e.V.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	449 * All rights reserved. See COPYRIGHT file for details.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	450 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	451 * This software and supporting documentation were developed by
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	452 @@ -18,8 +18,8 @@
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	453 * Purpose: DicomRGBPixelTemplate (Header)
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	454 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	455 * Last Update: $Author: joergr $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	456 - * Update Date: $Date: 2010-10-14 13:16:30 $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	457 - * CVS/RCS Revision: $Revision: 1.18 $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	458 + * Update Date: $Date: 2011-11-17 16:13:14 $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	459 + * CVS/RCS Revision: $Revision: 1.19 $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	460 * Status: $State: Exp $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	461 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	462 * CVS/RCS Log at end of file
2304 e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	463 @@ -87,7 +87,7 @@ class DiRGBPixelTemplate
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	464 const unsigned long planeSize,
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	465 const int bits)
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	466 {
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	467 - if (Init(pixel))
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	468 + if (this->Init(pixel))
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	469 {
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	470 // use the number of input pixels derived from the length of the 'PixelData'
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	471 // attribute), but not more than the size of the intermediate buffer
2324 31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	472 @@ -129,9 +129,9 @@ class DiRGBPixelTemplate
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	473 {
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	474 register int j;
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	475 register unsigned long i;
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	476 - for (i = 0; i < count; ++i) /* for all pixel ... */
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	477 + for (i = 0; i < count; ++i) /* for all pixel ... */
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	478 for (j = 0; j < 3; ++j)
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	479 - this->Data[j][i] = removeSign((p++), offset); / ... copy planes */
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	480 + this->Data[j][i] = removeSign((p++), offset); / ... copy planes */
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	481 }
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	482 }
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	483 }
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	484 @@ -145,6 +145,9 @@ class DiRGBPixelTemplate
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	485 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	486 * CVS/RCS Log:
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	487 * $Log: dirgbpxt.h,v $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	488 + * Revision 1.19 2011-11-17 16:13:14 joergr
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	489 + * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	490 + *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	491 * Revision 1.18 2010-10-14 13:16:30 joergr
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	492 * Updated copyright header. Added reference to COPYRIGHT file.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	493 *
2304 e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	494 diff --git a/dcmimage/include/dcmtk/dcmimage/diybrpxt.h b/dcmimage/include/dcmtk/dcmimage/diybrpxt.h
2324 31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	495 index 6b523fb..ecd2038 100644
2304 e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	496 --- a/dcmimage/include/dcmtk/dcmimage/diybrpxt.h
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	497 +++ b/dcmimage/include/dcmtk/dcmimage/diybrpxt.h
2324 31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	498 @@ -1,6 +1,6 @@
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	499 /*
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	500 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	501 - * Copyright (C) 1998-2010, OFFIS e.V.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	502 + * Copyright (C) 1998-2011, OFFIS e.V.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	503 * All rights reserved. See COPYRIGHT file for details.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	504 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	505 * This software and supporting documentation were developed by
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	506 @@ -18,8 +18,8 @@
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	507 * Purpose: DicomYBRPixelTemplate (Header)
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	508 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	509 * Last Update: $Author: joergr $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	510 - * Update Date: $Date: 2010-10-14 13:16:30 $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	511 - * CVS/RCS Revision: $Revision: 1.19 $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	512 + * Update Date: $Date: 2011-11-17 16:13:14 $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	513 + * CVS/RCS Revision: $Revision: 1.20 $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	514 * Status: $State: Exp $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	515 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	516 * CVS/RCS Log at end of file
2304 e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	517 @@ -91,7 +91,7 @@ class DiYBRPixelTemplate
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	518 const int bits,
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	519 const OFBool rgb)
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	520 {
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	521 - if (Init(pixel))
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	522 + if (this->Init(pixel))
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	523 {
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	524 const T1 offset = OFstatic_cast(T1, DicomImageClass::maxval(bits - 1));
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	525 // use the number of input pixels derived from the length of the 'PixelData'
2324 31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	526 @@ -266,9 +266,9 @@ class DiYBRPixelTemplate
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	527 {
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	528 register int j;
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	529 register unsigned long i;
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	530 - for (i = 0; i < count; ++i) /* for all pixel ... */
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	531 + for (i = 0; i < count; ++i) /* for all pixel ... */
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	532 for (j = 0; j < 3; ++j)
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	533 - this->Data[j][i] = removeSign((p++), offset); / ... copy planes */
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	534 + this->Data[j][i] = removeSign((p++), offset); / ... copy planes */
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	535 }
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	536 }
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	537 }
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	538 @@ -295,6 +295,9 @@ class DiYBRPixelTemplate
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	539 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	540 * CVS/RCS Log:
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	541 * $Log: diybrpxt.h,v $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	542 + * Revision 1.20 2011-11-17 16:13:14 joergr
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	543 + * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	544 + *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	545 * Revision 1.19 2010-10-14 13:16:30 joergr
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	546 * Updated copyright header. Added reference to COPYRIGHT file.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	547 *
2304 e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	548 diff --git a/dcmimage/include/dcmtk/dcmimage/diyf2pxt.h b/dcmimage/include/dcmtk/dcmimage/diyf2pxt.h
2324 31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	549 index ed27796..93d28cc 100644
2304 e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	550 --- a/dcmimage/include/dcmtk/dcmimage/diyf2pxt.h
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	551 +++ b/dcmimage/include/dcmtk/dcmimage/diyf2pxt.h
2324 31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	552 @@ -1,6 +1,6 @@
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	553 /*
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	554 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	555 - * Copyright (C) 1998-2010, OFFIS e.V.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	556 + * Copyright (C) 1998-2011, OFFIS e.V.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	557 * All rights reserved. See COPYRIGHT file for details.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	558 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	559 * This software and supporting documentation were developed by
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	560 @@ -18,8 +18,8 @@
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	561 * Purpose: DicomYBR422PixelTemplate (Header)
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	562 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	563 * Last Update: $Author: joergr $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	564 - * Update Date: $Date: 2010-10-14 13:16:30 $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	565 - * CVS/RCS Revision: $Revision: 1.25 $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	566 + * Update Date: $Date: 2011-11-17 16:13:14 $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	567 + * CVS/RCS Revision: $Revision: 1.26 $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	568 * Status: $State: Exp $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	569 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	570 * CVS/RCS Log at end of file
2304 e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	571 @@ -95,7 +95,7 @@ class DiYBR422PixelTemplate
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	572 const int bits,
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	573 const OFBool rgb)
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	574 {
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	575 - if (Init(pixel))
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	576 + if (this->Init(pixel))
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	577 {
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	578 const T1 offset = OFstatic_cast(T1, DicomImageClass::maxval(bits - 1));
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	579 register unsigned long i;
2324 31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	580 @@ -167,6 +167,9 @@ class DiYBR422PixelTemplate
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	581 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	582 * CVS/RCS Log:
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	583 * $Log: diyf2pxt.h,v $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	584 + * Revision 1.26 2011-11-17 16:13:14 joergr
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	585 + * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	586 + *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	587 * Revision 1.25 2010-10-14 13:16:30 joergr
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	588 * Updated copyright header. Added reference to COPYRIGHT file.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	589 *
2304 e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	590 diff --git a/dcmimage/include/dcmtk/dcmimage/diyp2pxt.h b/dcmimage/include/dcmtk/dcmimage/diyp2pxt.h
2324 31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	591 index 518fed7..0dd9d5b 100644
2304 e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	592 --- a/dcmimage/include/dcmtk/dcmimage/diyp2pxt.h
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	593 +++ b/dcmimage/include/dcmtk/dcmimage/diyp2pxt.h
2324 31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	594 @@ -1,6 +1,6 @@
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	595 /*
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	596 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	597 - * Copyright (C) 1998-2010, OFFIS e.V.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	598 + * Copyright (C) 1998-2011, OFFIS e.V.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	599 * All rights reserved. See COPYRIGHT file for details.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	600 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	601 * This software and supporting documentation were developed by
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	602 @@ -18,8 +18,8 @@
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	603 * Purpose: DicomYBRPart422PixelTemplate (Header)
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	604 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	605 * Last Update: $Author: joergr $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	606 - * Update Date: $Date: 2010-10-14 13:16:30 $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	607 - * CVS/RCS Revision: $Revision: 1.23 $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	608 + * Update Date: $Date: 2011-11-17 16:13:14 $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	609 + * CVS/RCS Revision: $Revision: 1.24 $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	610 * Status: $State: Exp $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	611 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	612 * CVS/RCS Log at end of file
2304 e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	613 @@ -91,7 +91,7 @@ class DiYBRPart422PixelTemplate
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	614 void convert(const T1 *pixel,
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	615 const int bits)
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	616 {
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	617 - if (Init(pixel))
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	618 + if (this->Init(pixel))
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	619 {
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	620 register T2 *r = this->Data[0];
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	621 register T2 *g = this->Data[1];
2324 31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	622 @@ -147,6 +147,9 @@ class DiYBRPart422PixelTemplate
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	623 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	624 * CVS/RCS Log:
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	625 * $Log: diyp2pxt.h,v $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	626 + * Revision 1.24 2011-11-17 16:13:14 joergr
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	627 + * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	628 + *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	629 * Revision 1.23 2010-10-14 13:16:30 joergr
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	630 * Updated copyright header. Added reference to COPYRIGHT file.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	631 *
2304 e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	632 diff --git a/dcmimgle/include/dcmtk/dcmimgle/diflipt.h b/dcmimgle/include/dcmtk/dcmimgle/diflipt.h
2324 31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	633 index 4933fe1..05c198c 100644
2304 e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	634 --- a/dcmimgle/include/dcmtk/dcmimgle/diflipt.h
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	635 +++ b/dcmimgle/include/dcmtk/dcmimgle/diflipt.h
2324 31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	636 @@ -1,6 +1,6 @@
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	637 /*
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	638 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	639 - * Copyright (C) 1996-2010, OFFIS e.V.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	640 + * Copyright (C) 1996-2011, OFFIS e.V.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	641 * All rights reserved. See COPYRIGHT file for details.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	642 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	643 * This software and supporting documentation were developed by
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	644 @@ -18,8 +18,8 @@
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	645 * Purpose: DicomFlipTemplate (Header)
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	646 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	647 * Last Update: $Author: joergr $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	648 - * Update Date: $Date: 2010-10-14 13:16:26 $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	649 - * CVS/RCS Revision: $Revision: 1.23 $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	650 + * Update Date: $Date: 2011-11-17 16:13:16 $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	651 + * CVS/RCS Revision: $Revision: 1.24 $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	652 * Status: $State: Exp $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	653 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	654 * CVS/RCS Log at end of file
2304 e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	655 @@ -129,7 +129,7 @@ class DiFlipTemplate
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	656 else if (vert)
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	657 flipVert(src, dest);
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	658 else
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	659 - copyPixel(src, dest);
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	660 + this->copyPixel(src, dest);
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	661 }
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	662 }
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	663
2324 31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	664 @@ -345,6 +345,9 @@ class DiFlipTemplate
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	665 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	666 * CVS/RCS Log:
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	667 * $Log: diflipt.h,v $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	668 + * Revision 1.24 2011-11-17 16:13:16 joergr
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	669 + * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	670 + *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	671 * Revision 1.23 2010-10-14 13:16:26 joergr
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	672 * Updated copyright header. Added reference to COPYRIGHT file.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	673 *
2304 e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	674 diff --git a/dcmimgle/include/dcmtk/dcmimgle/dimoflt.h b/dcmimgle/include/dcmtk/dcmimgle/dimoflt.h
2324 31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	675 index a88ab9d..52d71a3 100644
2304 e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	676 --- a/dcmimgle/include/dcmtk/dcmimgle/dimoflt.h
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	677 +++ b/dcmimgle/include/dcmtk/dcmimgle/dimoflt.h
2324 31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	678 @@ -1,6 +1,6 @@
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	679 /*
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	680 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	681 - * Copyright (C) 1996-2010, OFFIS e.V.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	682 + * Copyright (C) 1996-2011, OFFIS e.V.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	683 * All rights reserved. See COPYRIGHT file for details.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	684 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	685 * This software and supporting documentation were developed by
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	686 @@ -18,8 +18,8 @@
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	687 * Purpose: DicomMonochromeFlipTemplate (Header)
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	688 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	689 * Last Update: $Author: joergr $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	690 - * Update Date: $Date: 2010-10-14 13:16:26 $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	691 - * CVS/RCS Revision: $Revision: 1.15 $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	692 + * Update Date: $Date: 2011-11-17 16:13:16 $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	693 + * CVS/RCS Revision: $Revision: 1.16 $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	694 * Status: $State: Exp $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	695 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	696 * CVS/RCS Log at end of file
2304 e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	697 @@ -106,11 +106,11 @@ class DiMonoFlipTemplate
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	698 if (this->Data != NULL)
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	699 {
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	700 if (horz && vert)
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	701 - flipHorzVert(&pixel, &this->Data);
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	702 + this->flipHorzVert(&pixel, &this->Data);
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	703 else if (horz)
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	704 - flipHorz(&pixel, &this->Data);
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	705 + this->flipHorz(&pixel, &this->Data);
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	706 else if (vert)
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	707 - flipVert(&pixel, &this->Data);
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	708 + this->flipVert(&pixel, &this->Data);
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	709 }
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	710 }
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	711 }
2324 31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	712 @@ -124,6 +124,9 @@ class DiMonoFlipTemplate
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	713 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	714 * CVS/RCS Log:
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	715 * $Log: dimoflt.h,v $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	716 + * Revision 1.16 2011-11-17 16:13:16 joergr
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	717 + * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	718 + *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	719 * Revision 1.15 2010-10-14 13:16:26 joergr
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	720 * Updated copyright header. Added reference to COPYRIGHT file.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	721 *
2304 e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	722 diff --git a/dcmimgle/include/dcmtk/dcmimgle/dimoipxt.h b/dcmimgle/include/dcmtk/dcmimgle/dimoipxt.h
2324 31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	723 index e815e90..c190dd6 100644
2304 e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	724 --- a/dcmimgle/include/dcmtk/dcmimgle/dimoipxt.h
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	725 +++ b/dcmimgle/include/dcmtk/dcmimgle/dimoipxt.h
2324 31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	726 @@ -1,6 +1,6 @@
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	727 /*
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	728 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	729 - * Copyright (C) 1996-2010, OFFIS e.V.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	730 + * Copyright (C) 1996-2011, OFFIS e.V.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	731 * All rights reserved. See COPYRIGHT file for details.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	732 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	733 * This software and supporting documentation were developed by
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	734 @@ -18,8 +18,8 @@
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	735 * Purpose: DicomMonochromeInputPixelTemplate (Header)
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	736 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	737 * Last Update: $Author: joergr $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	738 - * Update Date: $Date: 2010-10-14 13:16:26 $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	739 - * CVS/RCS Revision: $Revision: 1.40 $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	740 + * Update Date: $Date: 2011-11-17 16:13:16 $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	741 + * CVS/RCS Revision: $Revision: 1.41 $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	742 * Status: $State: Exp $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	743 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	744 * CVS/RCS Log at end of file
2304 e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	745 @@ -76,10 +76,10 @@ class DiMonoInputPixelTemplate
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	746 else if ((this->Modality != NULL) && this->Modality->hasRescaling())
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	747 {
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	748 rescale(pixel, this->Modality->getRescaleSlope(), this->Modality->getRescaleIntercept());
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	749 - determineMinMax(OFstatic_cast(T3, this->Modality->getMinValue()), OFstatic_cast(T3, this->Modality->getMaxValue()));
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	750 + this->determineMinMax(OFstatic_cast(T3, this->Modality->getMinValue()), OFstatic_cast(T3, this->Modality->getMaxValue()));
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	751 } else {
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	752 rescale(pixel); // "copy" or reference pixel data
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	753 - determineMinMax(OFstatic_cast(T3, this->Modality->getMinValue()), OFstatic_cast(T3, this->Modality->getMaxValue()));
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	754 + this->determineMinMax(OFstatic_cast(T3, this->Modality->getMinValue()), OFstatic_cast(T3, this->Modality->getMaxValue()));
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	755 }
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	756 }
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	757 }
2324 31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	758 @@ -280,6 +280,9 @@ class DiMonoInputPixelTemplate
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	759 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	760 * CVS/RCS Log:
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	761 * $Log: dimoipxt.h,v $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	762 + * Revision 1.41 2011-11-17 16:13:16 joergr
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	763 + * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	764 + *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	765 * Revision 1.40 2010-10-14 13:16:26 joergr
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	766 * Updated copyright header. Added reference to COPYRIGHT file.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	767 *
2304 e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	768 diff --git a/dcmimgle/include/dcmtk/dcmimgle/dimorot.h b/dcmimgle/include/dcmtk/dcmimgle/dimorot.h
2324 31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	769 index 4ef277d..e729424 100644
2304 e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	770 --- a/dcmimgle/include/dcmtk/dcmimgle/dimorot.h
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	771 +++ b/dcmimgle/include/dcmtk/dcmimgle/dimorot.h
2324 31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	772 @@ -1,6 +1,6 @@
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	773 /*
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	774 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	775 - * Copyright (C) 1996-2010, OFFIS e.V.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	776 + * Copyright (C) 1996-2011, OFFIS e.V.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	777 * All rights reserved. See COPYRIGHT file for details.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	778 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	779 * This software and supporting documentation were developed by
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	780 @@ -18,8 +18,8 @@
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	781 * Purpose: DicomMonochromeRotateTemplate (Header)
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	782 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	783 * Last Update: $Author: joergr $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	784 - * Update Date: $Date: 2010-10-14 13:16:26 $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	785 - * CVS/RCS Revision: $Revision: 1.16 $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	786 + * Update Date: $Date: 2011-11-17 16:13:16 $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	787 + * CVS/RCS Revision: $Revision: 1.17 $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	788 * Status: $State: Exp $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	789 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	790 * CVS/RCS Log at end of file
2304 e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	791 @@ -105,11 +105,11 @@ class DiMonoRotateTemplate
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	792 if (this->Data != NULL)
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	793 {
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	794 if (degree == 90)
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	795 - rotateRight(&pixel, &(this->Data));
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	796 + this->rotateRight(&pixel, &(this->Data));
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	797 else if (degree == 180)
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	798 - rotateTopDown(&pixel, &(this->Data));
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	799 + this->rotateTopDown(&pixel, &(this->Data));
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	800 else if (degree == 270)
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	801 - rotateLeft(&pixel, &(this->Data));
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	802 + this->rotateLeft(&pixel, &(this->Data));
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	803 }
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	804 }
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	805 }
2324 31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	806 @@ -123,6 +123,9 @@ class DiMonoRotateTemplate
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	807 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	808 * CVS/RCS Log:
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	809 * $Log: dimorot.h,v $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	810 + * Revision 1.17 2011-11-17 16:13:16 joergr
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	811 + * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	812 + *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	813 * Revision 1.16 2010-10-14 13:16:26 joergr
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	814 * Updated copyright header. Added reference to COPYRIGHT file.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	815 *
2304 e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	816 diff --git a/dcmimgle/include/dcmtk/dcmimgle/dimosct.h b/dcmimgle/include/dcmtk/dcmimgle/dimosct.h
2324 31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	817 index 60c9abb..8f89855 100644
2304 e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	818 --- a/dcmimgle/include/dcmtk/dcmimgle/dimosct.h
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	819 +++ b/dcmimgle/include/dcmtk/dcmimgle/dimosct.h
2324 31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	820 @@ -1,6 +1,6 @@
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	821 /*
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	822 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	823 - * Copyright (C) 1996-2010, OFFIS e.V.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	824 + * Copyright (C) 1996-2011, OFFIS e.V.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	825 * All rights reserved. See COPYRIGHT file for details.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	826 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	827 * This software and supporting documentation were developed by
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	828 @@ -18,8 +18,8 @@
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	829 * Purpose: DicomMonochromeScaleTemplate (Header)
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	830 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	831 * Last Update: $Author: joergr $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	832 - * Update Date: $Date: 2010-10-14 13:16:26 $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	833 - * CVS/RCS Revision: $Revision: 1.20 $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	834 + * Update Date: $Date: 2011-11-17 16:13:16 $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	835 + * CVS/RCS Revision: $Revision: 1.21 $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	836 * Status: $State: Exp $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	837 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	838 * CVS/RCS Log at end of file
2304 e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	839 @@ -124,7 +124,7 @@ class DiMonoScaleTemplate
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	840 {
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	841 const T value = OFstatic_cast(T, OFstatic_cast(double, DicomImageClass::maxval(bits)) *
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	842 OFstatic_cast(double, pvalue) / OFstatic_cast(double, DicomImageClass::maxval(WIDTH_OF_PVALUES)));
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	843 - scaleData(&pixel, &this->Data, interpolate, value);
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	844 + this->scaleData(&pixel, &this->Data, interpolate, value);
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	845 }
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	846 }
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	847 }
2324 31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	848 @@ -138,6 +138,9 @@ class DiMonoScaleTemplate
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	849 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	850 * CVS/RCS Log:
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	851 * $Log: dimosct.h,v $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	852 + * Revision 1.21 2011-11-17 16:13:16 joergr
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	853 + * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	854 + *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	855 * Revision 1.20 2010-10-14 13:16:26 joergr
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	856 * Updated copyright header. Added reference to COPYRIGHT file.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	857 *
2304 e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	858 diff --git a/dcmimgle/include/dcmtk/dcmimgle/dirotat.h b/dcmimgle/include/dcmtk/dcmimgle/dirotat.h
2324 31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	859 index edb452e..2e7e3a0 100644
2304 e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	860 --- a/dcmimgle/include/dcmtk/dcmimgle/dirotat.h
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	861 +++ b/dcmimgle/include/dcmtk/dcmimgle/dirotat.h
2324 31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	862 @@ -1,6 +1,6 @@
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	863 /*
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	864 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	865 - * Copyright (C) 1996-2010, OFFIS e.V.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	866 + * Copyright (C) 1996-2011, OFFIS e.V.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	867 * All rights reserved. See COPYRIGHT file for details.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	868 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	869 * This software and supporting documentation were developed by
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	870 @@ -18,8 +18,8 @@
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	871 * Purpose: DicomRotateTemplate (Header)
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	872 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	873 * Last Update: $Author: joergr $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	874 - * Update Date: $Date: 2010-10-14 13:16:27 $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	875 - * CVS/RCS Revision: $Revision: 1.21 $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	876 + * Update Date: $Date: 2011-11-17 16:13:16 $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	877 + * CVS/RCS Revision: $Revision: 1.22 $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	878 * Status: $State: Exp $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	879 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	880 * CVS/RCS Log at end of file
2304 e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	881 @@ -132,7 +132,7 @@ class DiRotateTemplate
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	882 else if (degree == 270)
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	883 rotateLeft(src, dest);
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	884 else
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	885 - copyPixel(src, dest);
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	886 + this->copyPixel(src, dest);
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	887 }
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	888
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	889
2324 31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	890 @@ -358,6 +358,9 @@ class DiRotateTemplate
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	891 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	892 * CVS/RCS Log:
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	893 * $Log: dirotat.h,v $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	894 + * Revision 1.22 2011-11-17 16:13:16 joergr
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	895 + * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	896 + *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	897 * Revision 1.21 2010-10-14 13:16:27 joergr
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	898 * Updated copyright header. Added reference to COPYRIGHT file.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	899 *
2304 e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	900 diff --git a/dcmimgle/include/dcmtk/dcmimgle/discalet.h b/dcmimgle/include/dcmtk/dcmimgle/discalet.h
2324 31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	901 index 758dde2..0bcbc70 100644
2304 e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	902 --- a/dcmimgle/include/dcmtk/dcmimgle/discalet.h
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	903 +++ b/dcmimgle/include/dcmtk/dcmimgle/discalet.h
2324 31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	904 @@ -1,6 +1,6 @@
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	905 /*
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	906 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	907 - * Copyright (C) 1996-2010, OFFIS e.V.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	908 + * Copyright (C) 1996-2011, OFFIS e.V.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	909 * All rights reserved. See COPYRIGHT file for details.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	910 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	911 * This software and supporting documentation were developed by
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	912 @@ -18,8 +18,8 @@
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	913 * Purpose: DicomScaleTemplates (Header)
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	914 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	915 * Last Update: $Author: joergr $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	916 - * Update Date: $Date: 2010-10-14 13:16:27 $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	917 - * CVS/RCS Revision: $Revision: 1.35 $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	918 + * Update Date: $Date: 2011-11-17 16:13:16 $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	919 + * CVS/RCS Revision: $Revision: 1.36 $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	920 * Status: $State: Exp $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	921 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	922 * CVS/RCS Log at end of file
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	923 @@ -206,12 +206,12 @@ class DiScaleTemplate
2304 e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	924 (Left >= OFstatic_cast(signed long, Columns)) \|\| (Top >= OFstatic_cast(signed long, Rows)))
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	925 { // no image to be displayed
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	926 DCMIMGLE_DEBUG("clipping area is fully outside the image boundaries");
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	927 - fillPixel(dest, value); // ... fill bitmap
2324 31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	928 + this->fillPixel(dest, value); // ... fill bitmap
2304 e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	929 }
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	930 else if ((this->Src_X == this->Dest_X) && (this->Src_Y == this->Dest_Y)) // no scaling
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	931 {
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	932 if ((Left == 0) && (Top == 0) && (Columns == this->Src_X) && (Rows == this->Src_Y))
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	933 - copyPixel(src, dest); // copying
2324 31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	934 + this->copyPixel(src, dest); // copying
2304 e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	935 else if ((Left >= 0) && (OFstatic_cast(Uint16, Left + this->Src_X) <= Columns) &&
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	936 (Top >= 0) && (OFstatic_cast(Uint16, Top + this->Src_Y) <= Rows))
2324 31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	937 clipPixel(src, dest); // clipping
2304 e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	938 @@ -567,7 +567,7 @@ class DiScaleTemplate
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	939 if ((xtemp == NULL) \|\| (xvalue == NULL))
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	940 {
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	941 DCMIMGLE_ERROR("can't allocate temporary buffers for interpolation scaling");
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	942 - clearPixel(dest);
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	943 + this->clearPixel(dest);
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	944 } else {
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	945 for (int j = 0; j < this->Planes; ++j)
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	946 {
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	947 @@ -905,7 +905,7 @@ class DiScaleTemplate
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	948 if (pTemp == NULL)
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	949 {
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	950 DCMIMGLE_ERROR("can't allocate temporary buffer for interpolation scaling");
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	951 - clearPixel(dest);
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	952 + this->clearPixel(dest);
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	953 } else {
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	954
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	955 /*
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	956 @@ -1029,7 +1029,7 @@ class DiScaleTemplate
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	957 if (pTemp == NULL)
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	958 {
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	959 DCMIMGLE_ERROR("can't allocate temporary buffer for interpolation scaling");
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	960 - clearPixel(dest);
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	961 + this->clearPixel(dest);
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	962 } else {
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	963
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	964 /*
2324 31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	965 @@ -1190,6 +1190,9 @@ class DiScaleTemplate
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	966 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	967 * CVS/RCS Log:
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	968 * $Log: discalet.h,v $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	969 + * Revision 1.36 2011-11-17 16:13:16 joergr
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	970 + * Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	971 + *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	972 * Revision 1.35 2010-10-14 13:16:27 joergr
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	973 * Updated copyright header. Added reference to COPYRIGHT file.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	974 *
2304 e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	975 diff --git a/ofstd/include/dcmtk/ofstd/ofoset.h b/ofstd/include/dcmtk/ofstd/ofoset.h
2324 31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	976 index 1a7f208..a534ebf 100644
2304 e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	977 --- a/ofstd/include/dcmtk/ofstd/ofoset.h
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	978 +++ b/ofstd/include/dcmtk/ofstd/ofoset.h
2324 31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	979 @@ -1,6 +1,6 @@
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	980 /*
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	981 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	982 - * Copyright (C) 2002-2010, OFFIS e.V.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	983 + * Copyright (C) 2002-2011, OFFIS e.V.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	984 * All rights reserved. See COPYRIGHT file for details.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	985 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	986 * This software and supporting documentation were developed by
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	987 @@ -19,8 +19,8 @@
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	988 * of an arbitrary type.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	989 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	990 * Last Update: $Author: joergr $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	991 - * Update Date: $Date: 2010-10-14 13:15:50 $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	992 - * CVS/RCS Revision: $Revision: 1.11 $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	993 + * Update Date: $Date: 2011-11-17 16:13:18 $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	994 + * CVS/RCS Revision: $Revision: 1.12 $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	995 * Status: $State: Exp $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	996 *
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	997 * CVS/RCS Log at end of file
2304 e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	998 @@ -146,7 +146,7 @@ template <class T> class OFOrderedSet : public OFSet<T>
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	999 {
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1000 // if size equals num, we need more space
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1001 if( this->size == this->num )
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1002 - Resize( this->size * 2 );
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1003 + this->Resize( this->size * 2 );
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1004
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1005 // copy item
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1006 T *newItem = new T( item );
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1007 @@ -189,7 +189,7 @@ template <class T> class OFOrderedSet : public OFSet<T>
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1008 {
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1009 // if size equals num, we need more space
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1010 if( this->size == this->num )
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1011 - Resize( this->size * 2 );
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1012 + this->Resize( this->size * 2 );
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1013
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1014 // copy item
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1015 T *newItem = new T( item );
2324 31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	1016 @@ -508,6 +508,9 @@ template <class T> class OFOrderedSet : public OFSet<T>
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	1017 /*
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	1018 ** CVS/RCS Log:
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	1019 ** $Log: ofoset.h,v $
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	1020 +** Revision 1.12 2011-11-17 16:13:18 joergr
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	1021 +** Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	1022 +**
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	1023 ** Revision 1.11 2010-10-14 13:15:50 joergr
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	1024 ** Updated copyright header. Added reference to COPYRIGHT file.
31f5cbd108a2 package dcmtk: replace patch with cherry-picked commit Mark Brand <mabrand@mabrand.nl> parents: 2304 diff changeset	1025 **
2304 e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1026 --
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1027 1.7.9.2
e2767e842034 package dcmtk: gcc 4.7.0 compatibility fixes Mark Brand <mabrand@mabrand.nl> parents: diff changeset	1028

Mercurial > mxe-octave

annotate src/dcmtk-1-fixes.patch @ 3725:2acaa9943159