Skip to content

Commit

Permalink
Documented support of STD-GEN-BD profile.
Browse files Browse the repository at this point in the history
Added explicit documentation on the support for the General Purpose
Interchange on BD Media (STD-GEN-BD) Media Storage Application Profile.
The implementation did not change since the requirements for this
profile are identical to those of STD-GEN-CD and STD-GEN-DVD-RAM, apart
from the storage medium.
  • Loading branch information
jriesmeier committed Aug 5, 2024
1 parent e24d122 commit 9412b21
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 15 deletions.
5 changes: 3 additions & 2 deletions dcmdata/apps/dcmgpdir.cc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
*
* Copyright (C) 1994-2017, OFFIS e.V.
* Copyright (C) 1994-2024, OFFIS e.V.
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation were developed by
Expand All @@ -20,6 +20,7 @@
* Profiles. Supports the following profiles:
* - General Purpose CD-R Interchange (STD-GEN-CD)
* - General Purpose Interchange on DVD-RAM Media (STD-GEN-DVD-RAM)
* - General Purpose Interchange on BD Media (STD-GEN-BD)
* If build with 'BUILD_DCMGPDIR_AS_DCMMKDIR' it also supports:
* - General Purpose DVD Interchange with JPEG (STD-GEN-DVD-JPEG)
* - General Purpose DVD Interchange with JPEG 2000 (STD-GEN-DVD-J2K)
Expand Down Expand Up @@ -192,7 +193,7 @@ DCMTK_MAIN_FUNCTION
"generate specific DICOMDIR file\n(default: " DEFAULT_DICOMDIR_NAME " in current directory)");
#ifdef BUILD_DCMGPDIR_AS_DCMMKDIR
cmd.addSubGroup("profiles:");
cmd.addOption("--general-purpose", "-Pgp", "General Purpose Interchange on CD-R or\nDVD-RAM Media (STD-GEN-CD/DVD-RAM, default)");
cmd.addOption("--general-purpose", "-Pgp", "General Purpose Interchange on CD-R, DVD-RAM\nor BD Media (STD-GEN-CD/DVD-RAM/BD, default)");
cmd.addOption("--general-dvd-jpeg", "-Pdv", "General Purpose DVD Interchange with JPEG\n(STD-GEN-DVD-JPEG)");
cmd.addOption("--general-dvd-j2k", "-Pd2", "General Purpose DVD Interchange with JPEG\n2000 (STD-GEN-DVD-J2K)");
cmd.addOption("--general-bd-jpeg", "-Pbd", "General Purpose BD Interchange with JPEG\n(STD-GEN-BD-JPEG)");
Expand Down
12 changes: 7 additions & 5 deletions dcmdata/docs/dcmgpdir.man
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,10 @@ Currently, the following profiles are supported:

- General Purpose Interchange on DVD-RAM Media (STD-GEN-DVD-RAM)

- General Purpose Interchange on BD Media (STD-GEN-BD)

\b dcmmkdir is an extended version of this tool which also supports other
Media Storage Application Profiles than the general purpose one (e.g. the
Media Storage Application Profiles than the general purpose ones (e.g. the
cardio profiles require the use of icon images).

\section dcmgpdir_parameters PARAMETERS
Expand Down Expand Up @@ -201,9 +203,9 @@ length encoding in sequences and items:

All files specified on the command line (or discovered by recursively examining
the contents of directories with the \e +r option) are first evaluated for
their compatibility with the General Purpose CD-R Image Interchange Profile
(Supplement 19). Only appropriate files encoded using the Explicit VR Little
Endian Uncompressed Transfer Syntax will be accepted. Files having invalid
their compatibility with the supported general purpose Media Storage Application
Profiles (Part 11). Only appropriate files encoded using the Explicit VR Little
Endian Transfer Syntax (uncompressed) will be accepted. Files having invalid
filenames will be rejected (the rules can be relaxed via the \e +m option).
Files missing required attributes will be rejected (the \e +I option can relax
this behavior).
Expand Down Expand Up @@ -297,6 +299,6 @@ It is an error if no data dictionary can be loaded.

\section dcmgpdir_copyright COPYRIGHT

Copyright (C) 1996-2023 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
Copyright (C) 1996-2024 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.

*/
8 changes: 4 additions & 4 deletions dcmdata/include/dcmtk/dcmdata/dcddirif.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
*
* Copyright (C) 2002-2023, OFFIS e.V.
* Copyright (C) 2002-2024, OFFIS e.V.
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation were developed by
Expand Down Expand Up @@ -113,9 +113,9 @@ class DCMTK_DCMDATA_EXPORT DicomDirInterface
*/
enum E_ApplicationProfile
{
/// General Purpose Interchange on CD-R or DVD-RAM Media (STD-GEN-CD/DVD-RAM)
/// General Purpose Interchange on CD-R, DVD-RAM or BD Media (STD-GEN-CD/DVD-RAM/BD)
AP_GeneralPurpose,
/// default application profile: General Purpose Interchange on CD-R or DVD-RAM Media
/// default application profile: General Purpose Interchange on CD-R, DVD-RAM or BD Media
AP_Default = AP_GeneralPurpose,
/// General Purpose DVD Interchange with JPEG (STD-GEN-DVD-JPEG)
AP_GeneralPurposeDVDJPEG,
Expand Down Expand Up @@ -583,7 +583,7 @@ class DCMTK_DCMDATA_EXPORT DicomDirInterface

/** get name/identifier associated with the given application profile
* @param profile media storage application profile
* @return name of the application profile (e.g. "STD-GEN-CD/DVD-RAM")
* @return name of the application profile (e.g. "STD-GEN-CD/DVD-RAM/BD")
*/
static const char *getProfileName(const E_ApplicationProfile profile);

Expand Down
2 changes: 1 addition & 1 deletion dcmdata/libsrc/dcddirif.cc
Original file line number Diff line number Diff line change
Expand Up @@ -5335,7 +5335,7 @@ const char *DicomDirInterface::getProfileName(const E_ApplicationProfile profile
switch(profile)
{
case AP_GeneralPurpose:
result = "STD-GEN-CD/DVD-RAM";
result = "STD-GEN-CD/DVD-RAM/BD";
break;
case AP_GeneralPurposeDVDJPEG:
result = "STD-GEN-DVD-JPEG";
Expand Down
8 changes: 5 additions & 3 deletions dcmjpeg/docs/dcmmkdir.man
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ Currently the following profiles are supported (others might be added later):

- General Purpose Interchange on DVD-RAM Media (STD-GEN-DVD-RAM)

- General Purpose Interchange on BD Media (STD-GEN-BD)

- General Purpose DVD Interchange with JPEG (STD-GEN-DVD-JPEG)

- General Purpose DVD Interchange with JPEG 2000 (STD-GEN-DVD-J2K)
Expand Down Expand Up @@ -243,8 +245,8 @@ DICOMDIR file:
profiles:

-Pgp --general-purpose
General Purpose Interchange on CD-R or DVD-RAM Media
(STD-GEN-CD/DVD-RAM, default)
General Purpose Interchange on CD-R, DVD-RAM or BD Media
(STD-GEN-CD/DVD-RAM/BD, default)

-Pdv --general-dvd-jpeg
General Purpose DVD Interchange with JPEG
Expand Down Expand Up @@ -506,6 +508,6 @@ It is an error if no data dictionary can be loaded.

\section dcmmkdir_copyright COPYRIGHT

Copyright (C) 2001-2023 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.
Copyright (C) 2001-2024 by OFFIS e.V., Escherweg 2, 26121 Oldenburg, Germany.

*/

0 comments on commit 9412b21

Please sign in to comment.