Skip to content

Commit c12c0dc

Browse files
committed
COMP: Add explicit QByteArray to "const char*" conversion for DCMTK compatibility
This change ensures backward compatibility while preparing for future updates to DCMTK, specifically commit DCMTK/dcmtk@1ebac2d0f ("Replaced the data type of parameter 'filename'.", 2024-02-20). In this update, the parameter type changes from `const char *` to `const OFFilename`. QByteArray only provides an explicit conversion to `const char *`, but not directly to `const OFFilename` (which can be constructed from `const char *`). This explicit conversion allows seamless integration with both the current and updated DCMTK codebase.
1 parent 234145a commit c12c0dc

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

Libs/DICOM/Core/ctkDICOMDatabase.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2433,7 +2433,7 @@ bool ctkDICOMDatabase::storeThumbnailFile(const QString &originalFilePath,
24332433
}
24342434
else
24352435
{
2436-
DicomImage dcmImage(QDir::toNativeSeparators(originalFilePath).toUtf8());
2436+
DicomImage dcmImage(QDir::toNativeSeparators(originalFilePath).toUtf8().data());
24372437
return d->ThumbnailGenerator->generateThumbnail(&dcmImage, thumbnailPath, backgroundColor);
24382438
}
24392439
}

Libs/DICOM/Core/ctkDICOMThumbnailGenerator.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ bool ctkDICOMThumbnailGenerator::generateThumbnail(DicomImage *dcmImage, QImage&
176176
/* create output buffer for DicomImage class */
177177
QByteArray buffer;
178178
/* copy header to output buffer and resize it for pixel data */
179-
buffer.append(header.toUtf8());
179+
buffer.append(header.toUtf8().data());
180180
buffer.resize(length);
181181

182182
/* render pixel data to buffer */
@@ -211,14 +211,14 @@ bool ctkDICOMThumbnailGenerator::generateThumbnail(DicomImage *dcmImage, const Q
211211
//------------------------------------------------------------------------------
212212
bool ctkDICOMThumbnailGenerator::generateThumbnail(const QString& dcmImagePath, QImage& image)
213213
{
214-
DicomImage dcmImage(QDir::toNativeSeparators(dcmImagePath).toUtf8());
214+
DicomImage dcmImage(QDir::toNativeSeparators(dcmImagePath).toUtf8().data());
215215
return this->generateThumbnail(&dcmImage, image);
216216
}
217217

218218
//------------------------------------------------------------------------------
219219
bool ctkDICOMThumbnailGenerator::generateThumbnail(const QString& dcmImagePath, const QString& thumbnailPath)
220220
{
221-
DicomImage dcmImage(QDir::toNativeSeparators(dcmImagePath).toUtf8());
221+
DicomImage dcmImage(QDir::toNativeSeparators(dcmImagePath).toUtf8().data());
222222
return this->generateThumbnail(&dcmImage, thumbnailPath);
223223
}
224224

Libs/DICOM/Widgets/Testing/Cpp/ctkDICOMImageTest1.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ int ctkDICOMImageTest1( int argc, char * argv [] )
5454

5555
QString dicomFilePath(arguments.at(0));
5656

57-
DicomImage dcmtkImage(QDir::toNativeSeparators(dicomFilePath).toUtf8());
57+
DicomImage dcmtkImage(QDir::toNativeSeparators(dicomFilePath).toUtf8().data());
5858
ctkDICOMImage ctkImage(&dcmtkImage);
5959

6060
QLabel qtImage;

Libs/DICOM/Widgets/Testing/Cpp/ctkDICOMItemViewTest1.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ int ctkDICOMItemViewTest1( int argc, char * argv [] )
5555

5656
QString dicomFilePath(arguments.at(0));
5757

58-
DicomImage img(QDir::toNativeSeparators(dicomFilePath).toUtf8());
58+
DicomImage img(QDir::toNativeSeparators(dicomFilePath).toUtf8().data());
5959
QImage image;
6060
QImage image2(200, 200, QImage::Format_RGB32);
6161

0 commit comments

Comments
 (0)