Merge pull request #1 from Debian/patches-from-debian

Patches from debian

configuration/aconfiguration-gconf.cpp

@@ -27,6 +27,7 @@
 */
 
 #include <gconfmm.h>
+#include <cstdio>
 #include <iostream>
 
 namespace Aeskulap {

imagepool/dicomdir.cpp

@@ -151,21 +151,21 @@ namespace ImagePool {
             DcmDataset study;
             DcmElement *el;
 
-            if ( studyRec->findAndCopyElement(DCM_SpecificCharacterSet, el) == ECC_Normal )
+            if ( studyRec->findAndGetElement(DCM_SpecificCharacterSet, el, OFFalse, OFTrue) == ECC_Normal )
                 study.insert(el);
-            if ( studyRec->findAndCopyElement(DCM_StudyInstanceUID, el) == ECC_Normal )
+            if ( studyRec->findAndGetElement(DCM_StudyInstanceUID, el, OFFalse, OFTrue) == ECC_Normal )
                 study.insert(el);
-            if ( studyRec->findAndCopyElement(DCM_StudyDate, el) == ECC_Normal )
+            if ( studyRec->findAndGetElement(DCM_StudyDate, el, OFFalse, OFTrue) == ECC_Normal )
                 study.insert(el);
-            if ( studyRec->findAndCopyElement(DCM_StudyTime, el) == ECC_Normal )
+            if ( studyRec->findAndGetElement(DCM_StudyTime, el, OFFalse, OFTrue) == ECC_Normal )
                 study.insert(el);
-            if ( studyRec->findAndCopyElement(DCM_StudyDescription, el) == ECC_Normal )
+            if ( studyRec->findAndGetElement(DCM_StudyDescription, el, OFFalse, OFTrue) == ECC_Normal )
                 study.insert(el);
-            if ( patRec->findAndCopyElement(DCM_PatientsName, el) == ECC_Normal )
+            if ( patRec->findAndGetElement(DCM_PatientName, el, OFFalse, OFTrue) == ECC_Normal )
                 study.insert(el);
-            if ( patRec->findAndCopyElement(DCM_PatientsBirthDate, el) == ECC_Normal )
+            if ( patRec->findAndGetElement(DCM_PatientBirthDate, el, OFFalse, OFTrue) == ECC_Normal )
                 study.insert(el);
-            if ( patRec->findAndCopyElement(DCM_PatientsSex, el) == ECC_Normal )
+            if ( patRec->findAndGetElement(DCM_PatientSex, el, OFFalse, OFTrue) == ECC_Normal )
                 study.insert(el);
             resultslot(create_query_study(&study, std::string("DICOMDIR:") + dicomdir));
         }
@@ -221,21 +221,21 @@ namespace ImagePool {
             DcmDataset series;
             DcmElement *el;
 
-            if ( seriesRec->findAndCopyElement(DCM_SpecificCharacterSet, el) == ECC_Normal )
+            if ( seriesRec->findAndGetElement(DCM_SpecificCharacterSet, el, OFFalse, OFTrue) == ECC_Normal )
                 series.insert(el);
-            if ( seriesRec->findAndCopyElement(DCM_SeriesDescription, el) == ECC_Normal )
+            if ( seriesRec->findAndGetElement(DCM_SeriesDescription, el, OFFalse, OFTrue) == ECC_Normal )
                 series.insert(el);
-            if ( seriesRec->findAndCopyElement(DCM_SeriesInstanceUID, el) == ECC_Normal )
+            if ( seriesRec->findAndGetElement(DCM_SeriesInstanceUID, el, OFFalse, OFTrue) == ECC_Normal )
                 series.insert(el);
-            if ( seriesRec->findAndCopyElement(DCM_Modality, el) == ECC_Normal )
+            if ( seriesRec->findAndGetElement(DCM_Modality, el, OFFalse, OFTrue) == ECC_Normal )
                 series.insert(el);
-            if ( seriesRec->findAndCopyElement(DCM_SeriesDate, el) == ECC_Normal )
+            if ( seriesRec->findAndGetElement(DCM_SeriesDate, el, OFFalse, OFTrue) == ECC_Normal )
                 series.insert(el);
-            if ( seriesRec->findAndCopyElement(DCM_SeriesTime, el) == ECC_Normal )
+            if ( seriesRec->findAndGetElement(DCM_SeriesTime, el, OFFalse, OFTrue) == ECC_Normal )
                 series.insert(el);
-            if ( studyRec->findAndCopyElement(DCM_StudyDescription, el) == ECC_Normal )
+            if ( studyRec->findAndGetElement(DCM_StudyDescription, el, OFFalse, OFTrue) == ECC_Normal )
                 series.insert(el);
-            if ( studyRec->findAndCopyElement(DCM_StationName, el) == ECC_Normal )
+            if ( studyRec->findAndGetElement(DCM_StationName, el, OFFalse, OFTrue) == ECC_Normal )
                 series.insert(el);
 
             // Count Related SOP Instances

imagepool/netloader.cpp

@@ -112,7 +112,7 @@ bool NetLoader::run() {
 		e->putString("STUDY");
 		query.insert(e);
 
-		e = newDicomElement(DCM_PatientsName);
+		e = newDicomElement(DCM_PatientName);
 		query.insert(e);
 
 		e = newDicomElement(DCM_PatientID);

imagepool/netquery.cpp

@@ -210,7 +210,7 @@ void query_from_net(
 	e->putString(dicom_enc.c_str());
 	query.insert(e);
 
-	e = newDicomElement(DCM_PatientsName);
+	e = newDicomElement(DCM_PatientName);
 	e->putString(patientsname.c_str());
 	query.insert(e);
 
@@ -225,10 +225,10 @@ void query_from_net(
 	e->putString(modality.c_str());
 	query.insert(e);
 
-	e = newDicomElement(DCM_PatientsBirthDate);
+	e = newDicomElement(DCM_PatientBirthDate);
 	query.insert(e);
 
-	e = newDicomElement(DCM_PatientsSex);
+	e = newDicomElement(DCM_PatientSex);
 	query.insert(e);
 
 	e = newDicomElement(DCM_StudyDate);

imagepool/poolassociation.h

@@ -115,9 +115,7 @@ class Association
 
 		if(value != NULL) {
 			if (strlen(value) > 0) {
-				elem->putString(value);
-
-				if (elem->error() != EC_Normal) {
+				if( elem->putString(value) != EC_Normal) {
 					printf("cannot put tag value: (%04x,%04x)=\"%s\"", g, e, value);
 					return false;
 				}

imagepool/poolfindassociation.cpp

@@ -26,7 +26,7 @@
     Status:           $State$
 */
 
-#include "dcmtk/dcmdata/dcdebug.h"
+//#include "dcmtk/dcmdata/dcdebug.h"
 #include "poolfindassociation.h"
 
 

imagepool/poolinstance.cpp

@@ -527,7 +527,7 @@ Glib::RefPtr<ImagePool::Instance> Instance::create(DcmDataset* dset) {
 	}
 
 	// set ManufacturersModelName
-	if(dset->findAndGetOFString(DCM_ManufacturersModelName, ofstr).good()) {
+	if(dset->findAndGetOFString(DCM_ManufacturerModelName, ofstr).good()) {
 		r->m_model = ofstr.c_str();
 	}
 
@@ -587,12 +587,12 @@ Glib::RefPtr<ImagePool::Instance> Instance::create(DcmDataset* dset) {
 	//std::cout << "intercept: " << r->m_intercept << std::endl;
 
 	// study params
-	if(dset->findAndGetOFString(DCM_PatientsName, ofstr).good()) {
+	if(dset->findAndGetOFString(DCM_PatientName, ofstr).good()) {
 		r->m_patientsname = r->convert_string(ofstr.c_str());
 	}
-	dset->findAndGetOFString(DCM_PatientsBirthDate, ofstr);
+	dset->findAndGetOFString(DCM_PatientBirthDate, ofstr);
 	r->m_patientsbirthdate = ofstr.c_str();
-	dset->findAndGetOFString(DCM_PatientsSex, ofstr);
+	dset->findAndGetOFString(DCM_PatientSex, ofstr);
     r->m_patientssex = ofstr.c_str();
 	if(dset->findAndGetOFString(DCM_StudyDescription, ofstr).good()) {
 		r->m_studydescription = r->convert_string(ofstr.c_str());

imagepool/poolmoveassociation.cpp

@@ -34,7 +34,6 @@
 #include "dcmtk/dcmnet/dimse.h"
 #include "dcmtk/dcmnet/diutil.h"
 #include "dcmtk/dcmdata/dcfilefo.h"
-#include "dcmtk/dcmdata/dcdebug.h"
 #include "dcmtk/dcmdata/dcuid.h"
 #include "dcmtk/dcmdata/dcdict.h"
 #include "dcmtk/dcmdata/cmdlnarg.h"

pixmaps/Makefile.am

@@ -1,4 +1,4 @@
-icondir = $(datadir)/icons/hicolor/48x48/apps
+icondir = $(datadir)/icons/hicolor/64x64/apps
 icon_DATA = aeskulap.png
 svgicondir = $(datadir)/icons/hicolor/scalable/apps
 svgicon_DATA = aeskulap.svg