Project

General

Profile

Bug #408 » 0001-trial-patch-to-fix-Bug-408.patch

Jan Schlamelcher, 2012-11-19 17:48

View differences:

dcmsr/include/dcmtk/dcmsr/dsrtlist.h
if (gotoItemPos(idx, iterator))
return *iterator;
else
return EmptyItem;
return emptyItem();
}
/** get copy of the specified item
......
}
/// default item which is returned in getItem() if the index is invalid.
/// This static member variable needs to be defined (not only declared)
/// in each derived class.
static const T EmptyItem;
/// Implemented using Meyers Singleton so no explicit instatiation is
/// necessary.
static const T& emptyItem()
{
//initialize EmptyItem to zero, no matter what kind of thing it is.
static const T EmptyItem( 0 );
return EmptyItem;
}
protected:
dcmsr/libsrc/dsrimgfr.cc
#define INCLUDE_CSTDIO
#include "dcmtk/ofstd/ofstdinc.h"
#ifdef HAVE_EXPLICIT_TEMPLATE_SPECIALIZATION
#define EXPLICIT_SPECIALIZATION template<>
#else
#define EXPLICIT_SPECIALIZATION
#endif
/* declared in class DSRListOfItems<T> */
EXPLICIT_SPECIALIZATION const Sint32 DSRListOfItems<Sint32>::EmptyItem = 0;
DSRImageFrameList::DSRImageFrameList()
: DSRListOfItems<Sint32>()
{
dcmsr/libsrc/dsrsc3gr.cc
#include "dcmtk/dcmsr/dsrsc3gr.h"
#include "dcmtk/ofstd/ofstd.h"
#ifdef HAVE_EXPLICIT_TEMPLATE_SPECIALIZATION
#define EXPLICIT_SPECIALIZATION template<>
#else
#define EXPLICIT_SPECIALIZATION
#endif
/* declared in class DSRListOfItems<T> */
EXPLICIT_SPECIALIZATION const DSRGraphicData3DItem DSRListOfItems<DSRGraphicData3DItem>::EmptyItem(0, 0, 0);
DSRGraphicData3DList::DSRGraphicData3DList()
: DSRListOfItems<DSRGraphicData3DItem>()
dcmsr/libsrc/dsrscogr.cc
#include "dcmtk/dcmsr/dsrscogr.h"
#include "dcmtk/ofstd/ofstd.h"
#ifdef HAVE_EXPLICIT_TEMPLATE_SPECIALIZATION
#define EXPLICIT_SPECIALIZATION template<>
#else
#define EXPLICIT_SPECIALIZATION
#endif
/* declared in class DSRListOfItems<T> */
EXPLICIT_SPECIALIZATION const DSRGraphicDataItem DSRListOfItems<DSRGraphicDataItem>::EmptyItem(0, 0);
DSRGraphicDataList::DSRGraphicDataList()
: DSRListOfItems<DSRGraphicDataItem>()
dcmsr/libsrc/dsrtcodt.cc
#include "dcmtk/dcmsr/dsrtcodt.h"
#ifdef HAVE_EXPLICIT_TEMPLATE_SPECIALIZATION
#define EXPLICIT_SPECIALIZATION template<>
#else
#define EXPLICIT_SPECIALIZATION
#endif
/* declared in class DSRListOfItems<T> */
EXPLICIT_SPECIALIZATION const OFString DSRListOfItems<OFString>::EmptyItem;
DSRReferencedDateTimeList::DSRReferencedDateTimeList()
: DSRListOfItems<OFString>()
dcmsr/libsrc/dsrtcosp.cc
#define INCLUDE_CSTDIO
#include "dcmtk/ofstd/ofstdinc.h"
#ifdef HAVE_EXPLICIT_TEMPLATE_SPECIALIZATION
#define EXPLICIT_SPECIALIZATION template<>
#else
#define EXPLICIT_SPECIALIZATION
#endif
/* declared in class DSRListOfItems<T> */
EXPLICIT_SPECIALIZATION const Uint32 DSRListOfItems<Uint32>::EmptyItem = 0;
DSRReferencedSamplePositionList::DSRReferencedSamplePositionList()
: DSRListOfItems<Uint32>()
dcmsr/libsrc/dsrtcoto.cc
#define INCLUDE_CSTDIO
#include "dcmtk/ofstd/ofstdinc.h"
#ifdef HAVE_EXPLICIT_TEMPLATE_SPECIALIZATION
#define EXPLICIT_SPECIALIZATION template<>
#else
#define EXPLICIT_SPECIALIZATION
#endif
/* declared in class DSRListOfItems<T> */
EXPLICIT_SPECIALIZATION const Float64 DSRListOfItems<Float64>::EmptyItem = 0;
DSRReferencedTimeOffsetList::DSRReferencedTimeOffsetList()
: DSRListOfItems<Float64>()
dcmsr/libsrc/dsrwavch.cc
#define INCLUDE_CSTDIO
#include "dcmtk/ofstd/ofstdinc.h"
#ifdef HAVE_EXPLICIT_TEMPLATE_SPECIALIZATION
#define EXPLICIT_SPECIALIZATION template<>
#else
#define EXPLICIT_SPECIALIZATION
#endif
/* declared in class DSRListOfItems<T> */
EXPLICIT_SPECIALIZATION const DSRWaveformChannelItem DSRListOfItems<DSRWaveformChannelItem>::EmptyItem(0, 0);
DSRWaveformChannelList::DSRWaveformChannelList()
: DSRListOfItems<DSRWaveformChannelItem>()
(1-1/2)