From e5d368553b47a566a83d4edce0a8f166db9509e6 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 27 Jan 2014 12:27:06 +0000 Subject: [PATCH] More tidying. --- Doxyfile | 236 ++++++++++++++++++++++--------- src/certificates.h | 1 - src/content.cc | 14 +- src/kdm.h | 4 +- src/lut_cache.h | 2 +- src/mono_picture_mxf_writer.h | 6 +- src/object.h | 3 +- src/signer.h | 2 +- src/sound_frame.h | 5 +- src/sound_mxf.cc | 14 +- src/stereo_picture_frame.cc | 6 +- src/stereo_picture_frame.h | 10 +- src/stereo_picture_mxf_writer.cc | 4 +- src/text.h | 6 +- src/xml.h | 2 +- src/xyz_frame.cc | 12 ++ src/xyz_frame.h | 11 +- 17 files changed, 231 insertions(+), 107 deletions(-) diff --git a/Doxyfile b/Doxyfile index 7e9dd59b..0d6514fc 100644 --- a/Doxyfile +++ b/Doxyfile @@ -1,8 +1,10 @@ -# Doxyfile 1.8.1.2 +# Doxyfile 1.8.4 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project. # +# All text after a double hash (##) is considered a comment and is placed +# in front of the TAG it is preceding . # All text after a hash (#) is considered a comment and will be ignored. # The format is: # TAG = value [value, ...] @@ -70,9 +72,9 @@ CREATE_SUBDIRS = NO # Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, # Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German, # Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English -# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, -# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak, -# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese. +# messages), Korean, Korean-en, Latvian, Lithuanian, Norwegian, Macedonian, +# Persian, Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrillic, +# Slovak, Slovene, Spanish, Swedish, Ukrainian, and Vietnamese. OUTPUT_LANGUAGE = English @@ -126,7 +128,9 @@ FULL_PATH_NAMES = YES # only done if one of the specified strings matches the left-hand part of # the path. The tag can be used to show relative paths in the file list. # If left blank the directory from which doxygen is run is used as the -# path to strip. +# path to strip. Note that you specify absolute paths here, but also +# relative paths, which will be relative from the directory where doxygen is +# started. STRIP_FROM_PATH = @@ -229,14 +233,15 @@ OPTIMIZE_FOR_FORTRAN = NO OPTIMIZE_OUTPUT_VHDL = NO # Doxygen selects the parser to use depending on the extension of the files it -# parses. With this tag you can assign which parser to use for a given extension. -# Doxygen has a built-in mapping, but you can override or extend it using this -# tag. The format is ext=language, where ext is a file extension, and language -# is one of the parsers supported by doxygen: IDL, Java, Javascript, CSharp, C, -# C++, D, PHP, Objective-C, Python, Fortran, VHDL, C, C++. For instance to make -# doxygen treat .inc files as Fortran files (default is PHP), and .f files as C -# (default is Fortran), use: inc=Fortran f=C. Note that for custom extensions -# you also need to set FILE_PATTERNS otherwise the files are not read by doxygen. +# parses. With this tag you can assign which parser to use for a given +# extension. Doxygen has a built-in mapping, but you can override or extend it +# using this tag. The format is ext=language, where ext is a file extension, +# and language is one of the parsers supported by doxygen: IDL, Java, +# Javascript, CSharp, C, C++, D, PHP, Objective-C, Python, Fortran, VHDL, C, +# C++. For instance to make doxygen treat .inc files as Fortran files (default +# is PHP), and .f files as C (default is Fortran), use: inc=Fortran f=C. Note +# that for custom extensions you also need to set FILE_PATTERNS otherwise the +# files are not read by doxygen. EXTENSION_MAPPING = @@ -249,6 +254,13 @@ EXTENSION_MAPPING = MARKDOWN_SUPPORT = YES +# When enabled doxygen tries to link words that correspond to documented +# classes, or namespaces to their corresponding documentation. Such a link can +# be prevented in individual cases by by putting a % sign in front of the word +# or globally by setting AUTOLINK_SUPPORT to NO. + +AUTOLINK_SUPPORT = YES + # If you use STL classes (i.e. std::string, std::vector, etc.) but do not want # to include (a tag file for) the STL sources as input, then you should # set this tag to YES in order to let doxygen match functions declarations and @@ -269,10 +281,10 @@ CPP_CLI_SUPPORT = NO SIP_SUPPORT = NO -# For Microsoft's IDL there are propget and propput attributes to indicate getter -# and setter methods for a property. Setting this option to YES (the default) -# will make doxygen replace the get and set methods by a property in the -# documentation. This will only work if the methods are indeed getting or +# For Microsoft's IDL there are propget and propput attributes to indicate +# getter and setter methods for a property. Setting this option to YES (the +# default) will make doxygen replace the get and set methods by a property in +# the documentation. This will only work if the methods are indeed getting or # setting a simple type. If this is not the case, or you want to show the # methods anyway, you should set this option to NO. @@ -301,11 +313,11 @@ SUBGROUPING = YES INLINE_GROUPED_CLASSES = NO # When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and -# unions with only public data fields will be shown inline in the documentation -# of the scope in which they are defined (i.e. file, namespace, or group -# documentation), provided this scope is documented. If set to NO (the default), -# structs, classes, and unions are shown on a separate page (for HTML and Man -# pages) or section (for LaTeX and RTF). +# unions with only public data fields or simple typedef fields will be shown +# inline in the documentation of the scope in which they are defined (i.e. file, +# namespace, or group documentation), provided this scope is documented. If set +# to NO (the default), structs, classes, and unions are shown on a separate +# page (for HTML and Man pages) or section (for LaTeX and RTF). INLINE_SIMPLE_STRUCTS = NO @@ -319,30 +331,14 @@ INLINE_SIMPLE_STRUCTS = NO TYPEDEF_HIDES_STRUCT = NO -# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to -# determine which symbols to keep in memory and which to flush to disk. -# When the cache is full, less often used symbols will be written to disk. -# For small to medium size projects (<1000 input files) the default value is -# probably good enough. For larger projects a too small cache size can cause -# doxygen to be busy swapping symbols to and from disk most of the time -# causing a significant performance penalty. -# If the system has enough physical memory increasing the cache will improve the -# performance by keeping more symbols in memory. Note that the value works on -# a logarithmic scale so increasing the size by one will roughly double the -# memory usage. The cache size is given by this formula: -# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0, -# corresponding to a cache size of 2^16 = 65536 symbols. - -SYMBOL_CACHE_SIZE = 0 - -# Similar to the SYMBOL_CACHE_SIZE the size of the symbol lookup cache can be -# set using LOOKUP_CACHE_SIZE. This cache is used to resolve symbols given -# their name and scope. Since this can be an expensive process and often the -# same symbol appear multiple times in the code, doxygen keeps a cache of -# pre-resolved symbols. If the cache is too small doxygen will become slower. -# If the cache is too large, memory is wasted. The cache size is given by this -# formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range is 0..9, the default is 0, -# corresponding to a cache size of 2^16 = 65536 symbols. +# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This +# cache is used to resolve symbols given their name and scope. Since this can +# be an expensive process and often the same symbol appear multiple times in +# the code, doxygen keeps a cache of pre-resolved symbols. If the cache is too +# small doxygen will become slower. If the cache is too large, memory is wasted. +# The cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid +# range is 0..9, the default is 0, corresponding to a cache size of 2^16 = 65536 +# symbols. LOOKUP_CACHE_SIZE = 0 @@ -353,7 +349,7 @@ LOOKUP_CACHE_SIZE = 0 # If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in # documentation are documented, even if no documentation was available. # Private class members and static file members will be hidden unless -# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES +# the EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES EXTRACT_ALL = YES @@ -362,7 +358,8 @@ EXTRACT_ALL = YES EXTRACT_PRIVATE = NO -# If the EXTRACT_PACKAGE tag is set to YES all members with package or internal scope will be included in the documentation. +# If the EXTRACT_PACKAGE tag is set to YES all members with package or internal +# scope will be included in the documentation. EXTRACT_PACKAGE = NO @@ -533,7 +530,8 @@ GENERATE_BUGLIST = YES GENERATE_DEPRECATEDLIST= YES # The ENABLED_SECTIONS tag can be used to enable conditional -# documentation sections, marked by \if sectionname ... \endif. +# documentation sections, marked by \if section-label ... \endif +# and \cond section-label ... \endcond blocks. ENABLED_SECTIONS = @@ -591,7 +589,8 @@ LAYOUT_FILE = # requires the bibtex tool to be installed. See also # http://en.wikipedia.org/wiki/BibTeX for more info. For LaTeX the style # of the bibliography can be controlled using LATEX_BIB_STYLE. To use this -# feature you need bibtex and perl available in the search path. +# feature you need bibtex and perl available in the search path. Do not use +# file names with spaces, bibtex cannot handle them. CITE_BIB_FILES = @@ -656,7 +655,7 @@ WARN_LOGFILE = # with spaces. INPUT = src \ - examples \ + examples \ doc/mainpage.txt # This tag can be used to specify the character encoding of the source files @@ -745,8 +744,10 @@ IMAGE_PATH = # is the value of the INPUT_FILTER tag, and is the name of an # input file. Doxygen will then use the output that the filter program writes # to standard output. -# If FILTER_PATTERNS is specified, this tag will be -# ignored. +# If FILTER_PATTERNS is specified, this tag will be ignored. +# Note that the filter must not add or remove lines; it is applied before the +# code is scanned, but not when the output code is generated. If lines are added +# or removed, the anchors will not be placed correctly. INPUT_FILTER = @@ -775,6 +776,13 @@ FILTER_SOURCE_FILES = NO FILTER_SOURCE_PATTERNS = +# If the USE_MD_FILE_AS_MAINPAGE tag refers to the name of a markdown file that +# is part of the input, its contents will be placed on the main page +# (index.html). This can be useful if you have a project on for instance GitHub +# and want reuse the introduction page also for the doxygen output. + +USE_MDFILE_AS_MAINPAGE = + #--------------------------------------------------------------------------- # configuration options related to source browsing #--------------------------------------------------------------------------- @@ -896,17 +904,27 @@ HTML_FOOTER = # The HTML_STYLESHEET tag can be used to specify a user-defined cascading # style sheet that is used by each HTML page. It can be used to -# fine-tune the look of the HTML output. If the tag is left blank doxygen -# will generate a default style sheet. Note that doxygen will try to copy -# the style sheet file to the HTML output directory, so don't put your own -# style sheet in the HTML output directory as well, or it will be erased! +# fine-tune the look of the HTML output. If left blank doxygen will +# generate a default style sheet. Note that it is recommended to use +# HTML_EXTRA_STYLESHEET instead of this one, as it is more robust and this +# tag will in the future become obsolete. HTML_STYLESHEET = +# The HTML_EXTRA_STYLESHEET tag can be used to specify an additional +# user-defined cascading style sheet that is included after the standard +# style sheets created by doxygen. Using this option one can overrule +# certain style aspects. This is preferred over using HTML_STYLESHEET +# since it does not replace the standard style sheet and is therefor more +# robust against future updates. Doxygen will copy the style sheet file to +# the output directory. + +HTML_EXTRA_STYLESHEET = + # The HTML_EXTRA_FILES tag can be used to specify one or more extra images or # other source files which should be copied to the HTML output directory. Note # that these files will be copied to the base HTML output directory. Use the -# $relpath$ marker in the HTML_HEADER and/or HTML_FOOTER files to load these +# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these # files. In the HTML_STYLESHEET file, use the file name only. Also note that # the files will be copied as-is; there are no commands or markers available. @@ -987,9 +1005,9 @@ DOCSET_FEEDNAME = "Doxygen generated docs" DOCSET_BUNDLE_ID = org.doxygen.Project -# When GENERATE_PUBLISHER_ID tag specifies a string that should uniquely identify -# the documentation publisher. This should be a reverse domain-name style -# string, e.g. com.mycompany.MyDocSet.documentation. +# When GENERATE_PUBLISHER_ID tag specifies a string that should uniquely +# identify the documentation publisher. This should be a reverse domain-name +# style string, e.g. com.mycompany.MyDocSet.documentation. DOCSET_PUBLISHER_ID = org.doxygen.Publisher @@ -1174,6 +1192,13 @@ FORMULA_TRANSPARENT = YES USE_MATHJAX = NO +# When MathJax is enabled you can set the default output format to be used for +# the MathJax output. Supported types are HTML-CSS, NativeMML (i.e. MathML) and +# SVG. The default value is HTML-CSS, which is slower, but has the best +# compatibility. + +MATHJAX_FORMAT = HTML-CSS + # When MathJax is enabled you need to specify the location relative to the # HTML output directory using the MATHJAX_RELPATH option. The destination # directory should contain the MathJax.js script. For instance, if the mathjax @@ -1191,6 +1216,11 @@ MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest MATHJAX_EXTENSIONS = +# The MATHJAX_CODEFILE tag can be used to specify a file with javascript +# pieces of code that will be used on startup of the MathJax code. + +MATHJAX_CODEFILE = + # When the SEARCHENGINE tag is enabled doxygen will generate a search box # for the HTML output. The underlying search engine uses javascript # and DHTML and should work on any modern browser. Note that when using @@ -1202,15 +1232,55 @@ MATHJAX_EXTENSIONS = SEARCHENGINE = YES # When the SERVER_BASED_SEARCH tag is enabled the search engine will be -# implemented using a PHP enabled web server instead of at the web client -# using Javascript. Doxygen will generate the search PHP script and index -# file to put on the web server. The advantage of the server -# based approach is that it scales better to large projects and allows -# full text search. The disadvantages are that it is more difficult to setup -# and does not have live searching capabilities. +# implemented using a web server instead of a web client using Javascript. +# There are two flavours of web server based search depending on the +# EXTERNAL_SEARCH setting. When disabled, doxygen will generate a PHP script for +# searching and an index file used by the script. When EXTERNAL_SEARCH is +# enabled the indexing and searching needs to be provided by external tools. +# See the manual for details. SERVER_BASED_SEARCH = NO +# When EXTERNAL_SEARCH is enabled doxygen will no longer generate the PHP +# script for searching. Instead the search results are written to an XML file +# which needs to be processed by an external indexer. Doxygen will invoke an +# external search engine pointed to by the SEARCHENGINE_URL option to obtain +# the search results. Doxygen ships with an example indexer (doxyindexer) and +# search engine (doxysearch.cgi) which are based on the open source search +# engine library Xapian. See the manual for configuration details. + +EXTERNAL_SEARCH = NO + +# The SEARCHENGINE_URL should point to a search engine hosted by a web server +# which will returned the search results when EXTERNAL_SEARCH is enabled. +# Doxygen ships with an example search engine (doxysearch) which is based on +# the open source search engine library Xapian. See the manual for configuration +# details. + +SEARCHENGINE_URL = + +# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed +# search data is written to a file for indexing by an external tool. With the +# SEARCHDATA_FILE tag the name of this file can be specified. + +SEARCHDATA_FILE = searchdata.xml + +# When SERVER_BASED_SEARCH AND EXTERNAL_SEARCH are both enabled the +# EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is +# useful in combination with EXTRA_SEARCH_MAPPINGS to search through multiple +# projects and redirect the results back to the right project. + +EXTERNAL_SEARCH_ID = + +# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen +# projects other than the one defined by this configuration file, but that are +# all added to the same external search index. Each project needs to have a +# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id +# of to a relative location where the documentation can be found. +# The format is: EXTRA_SEARCH_MAPPINGS = id1=loc1 id2=loc2 ... + +EXTRA_SEARCH_MAPPINGS = + #--------------------------------------------------------------------------- # configuration options related to the LaTeX output #--------------------------------------------------------------------------- @@ -1248,7 +1318,7 @@ COMPACT_LATEX = NO # The PAPER_TYPE tag can be used to set the paper type that is used # by the printer. Possible values are: a4, letter, legal and -# executive. If left blank a4wide will be used. +# executive. If left blank a4 will be used. PAPER_TYPE = a4wide @@ -1271,6 +1341,13 @@ LATEX_HEADER = LATEX_FOOTER = +# The LATEX_EXTRA_FILES tag can be used to specify one or more extra images +# or other source files which should be copied to the LaTeX output directory. +# Note that the files will be copied as-is; there are no commands or markers +# available. + +LATEX_EXTRA_FILES = + # If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated # is prepared for conversion to pdf (using ps2pdf). The pdf file will # contain links (just like the HTML output) instead of page references @@ -1415,6 +1492,21 @@ XML_DTD = XML_PROGRAMLISTING = YES +#--------------------------------------------------------------------------- +# configuration options related to the DOCBOOK output +#--------------------------------------------------------------------------- + +# If the GENERATE_DOCBOOK tag is set to YES Doxygen will generate DOCBOOK files +# that can be used to generate PDF. + +GENERATE_DOCBOOK = NO + +# The DOCBOOK_OUTPUT tag is used to specify where the DOCBOOK pages will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be put in +# front of it. If left blank docbook will be used as the default path. + +DOCBOOK_OUTPUT = docbook + #--------------------------------------------------------------------------- # configuration options for the AutoGen Definitions output #--------------------------------------------------------------------------- @@ -1564,6 +1656,12 @@ ALLEXTERNALS = NO EXTERNAL_GROUPS = YES +# If the EXTERNAL_PAGES tag is set to YES all external pages will be listed +# in the related pages index. If set to NO, only the current project's +# pages will be listed. + +EXTERNAL_PAGES = YES + # The PERL_PATH should be the absolute path and name of the perl script # interpreter (i.e. the result of `which perl'). @@ -1660,7 +1758,7 @@ UML_LOOK = NO # the class node. If there are many fields or methods and many nodes the # graph may become too big to be useful. The UML_LIMIT_NUM_FIELDS # threshold limits the number of items for each type to make the size more -# managable. Set this to 0 for no limit. Note that the threshold may be +# manageable. Set this to 0 for no limit. Note that the threshold may be # exceeded by 50% before the limit is enforced. UML_LIMIT_NUM_FIELDS = 10 diff --git a/src/certificates.h b/src/certificates.h index 8cb570c0..96a8cbb7 100644 --- a/src/certificates.h +++ b/src/certificates.h @@ -26,7 +26,6 @@ #undef X509_NAME #include -#include #include #include #include diff --git a/src/content.cc b/src/content.cc index 06e2806d..85988a1a 100644 --- a/src/content.cc +++ b/src/content.cc @@ -17,16 +17,16 @@ */ -#include -#include -#include -#include -#include -#include "AS_DCP.h" -#include "KM_util.h" #include "content.h" #include "util.h" #include "metadata.h" +#include "AS_DCP.h" +#include "KM_util.h" +#include +#include +#include +#include +#include using namespace std; using namespace boost; diff --git a/src/kdm.h b/src/kdm.h index c4bd8c86..02395a72 100644 --- a/src/kdm.h +++ b/src/kdm.h @@ -24,11 +24,11 @@ #ifndef LIBDCP_KDM_H #define LIBDCP_KDM_H +#include "key.h" +#include "metadata.h" #include #include #include -#include "key.h" -#include "metadata.h" class kdm_key_test; diff --git a/src/lut_cache.h b/src/lut_cache.h index 0985a0c0..d1968579 100644 --- a/src/lut_cache.h +++ b/src/lut_cache.h @@ -24,7 +24,7 @@ #include template -class LUTCache +class LUTCache : public boost::noncopyable { public: boost::shared_ptr get (int bit_depth, float gamma) diff --git a/src/mono_picture_mxf_writer.h b/src/mono_picture_mxf_writer.h index 727fc688..a5e0b1b6 100644 --- a/src/mono_picture_mxf_writer.h +++ b/src/mono_picture_mxf_writer.h @@ -17,12 +17,12 @@ */ +#include "picture_mxf_writer.h" +#include +#include #include #include #include -#include -#include -#include "picture_mxf_writer.h" namespace dcp { diff --git a/src/object.h b/src/object.h index 1b99e363..82598c58 100644 --- a/src/object.h +++ b/src/object.h @@ -24,6 +24,7 @@ #ifndef LIBDCP_OBJECT_H #define LIBDCP_OBJECT_H +#include #include namespace dcp { @@ -31,7 +32,7 @@ namespace dcp { /** @class Object * @brief Some part of a DCP that has a UUID. */ -class Object +class Object : public boost::noncopyable { public: Object (); diff --git a/src/signer.h b/src/signer.h index 9ee5852b..32514fb3 100644 --- a/src/signer.h +++ b/src/signer.h @@ -35,7 +35,7 @@ namespace dcp { /** @class Signer * @brief A class which can sign XML files. */ -class Signer +class Signer : public boost::noncopyable { public: /** @param c Certificate chain to sign with. diff --git a/src/sound_frame.h b/src/sound_frame.h index eedfc477..e7b13885 100644 --- a/src/sound_frame.h +++ b/src/sound_frame.h @@ -20,8 +20,9 @@ #ifndef LIBDCP_SOUND_FRAME_H #define LIBDCP_SOUND_FRAME_H -#include +#include #include +#include namespace ASDCP { namespace PCM { @@ -32,7 +33,7 @@ namespace ASDCP { namespace dcp { -class SoundFrame +class SoundFrame : public boost::noncopyable { public: SoundFrame (std::string mxf_path, int n, ASDCP::AESDecContext *); diff --git a/src/sound_mxf.cc b/src/sound_mxf.cc index b97da94a..5ce72b1d 100644 --- a/src/sound_mxf.cc +++ b/src/sound_mxf.cc @@ -21,18 +21,18 @@ * @brief An asset made up of WAV files */ -#include -#include -#include -#include -#include -#include "KM_fileio.h" -#include "AS_DCP.h" #include "sound_mxf.h" #include "util.h" #include "exceptions.h" #include "sound_frame.h" #include "sound_mxf_writer.h" +#include "KM_fileio.h" +#include "AS_DCP.h" +#include +#include +#include +#include +#include using std::string; using std::stringstream; diff --git a/src/stereo_picture_frame.cc b/src/stereo_picture_frame.cc index b21c7902..f894281e 100644 --- a/src/stereo_picture_frame.cc +++ b/src/stereo_picture_frame.cc @@ -17,9 +17,6 @@ */ -#include -#include "AS_DCP.h" -#include "KM_fileio.h" #include "stereo_picture_frame.h" #include "exceptions.h" #include "argb_frame.h" @@ -27,6 +24,9 @@ #include "util.h" #include "gamma_lut.h" #include "rgb_xyz.h" +#include "AS_DCP.h" +#include "KM_fileio.h" +#include #define DCI_GAMMA 2.6 diff --git a/src/stereo_picture_frame.h b/src/stereo_picture_frame.h index fa7620fb..1fd05453 100644 --- a/src/stereo_picture_frame.h +++ b/src/stereo_picture_frame.h @@ -17,10 +17,12 @@ */ -#include -#include -#include #include "types.h" +#include +#include +#include +#include +#include namespace ASDCP { namespace JP2K { @@ -34,7 +36,7 @@ namespace dcp { class ARGBFrame; /** A single frame of a 3D (stereoscopic) picture asset */ -class StereoPictureFrame +class StereoPictureFrame : public boost::noncopyable { public: StereoPictureFrame (boost::filesystem::path mxf_path, int n); diff --git a/src/stereo_picture_mxf_writer.cc b/src/stereo_picture_mxf_writer.cc index 5c503098..d7344894 100644 --- a/src/stereo_picture_mxf_writer.cc +++ b/src/stereo_picture_mxf_writer.cc @@ -17,11 +17,11 @@ */ -#include "AS_DCP.h" -#include "KM_fileio.h" #include "stereo_picture_mxf_writer.h" #include "exceptions.h" #include "picture_mxf.h" +#include "AS_DCP.h" +#include "KM_fileio.h" #include "picture_mxf_writer_common.cc" diff --git a/src/text.h b/src/text.h index bbb99adb..3a44965d 100644 --- a/src/text.h +++ b/src/text.h @@ -33,14 +33,18 @@ namespace dcp { class Font; +/** @class Text + * @brief Parser for Text nodes from subtitle XML. + */ class Text { public: + /** Construct a default text node */ Text () : v_position (0) , v_align (TOP) {} - + Text (boost::shared_ptr node); float v_position; diff --git a/src/xml.h b/src/xml.h index 6af3c0c6..b89d8ccd 100644 --- a/src/xml.h +++ b/src/xml.h @@ -20,8 +20,8 @@ #ifndef LIBDCP_XML_H #define LIBDCP_XML_H -#include #include "exceptions.h" +#include namespace dcp { diff --git a/src/xyz_frame.cc b/src/xyz_frame.cc index 4c793f22..cba90883 100644 --- a/src/xyz_frame.cc +++ b/src/xyz_frame.cc @@ -17,6 +17,10 @@ */ +/** @file src/xyz_frame.cc + * @brief XZYFrame class. + */ + #include "xyz_frame.h" #include #include @@ -30,6 +34,9 @@ XYZFrame::XYZFrame (opj_image_t* image) assert (_opj_image->numcomps == 3); } +/** Construct a new XYZFrame with undefined contents. + * @param size Size for the frame in pixels. + */ XYZFrame::XYZFrame (Size size) { opj_image_cmptparm_t cmptparm[3]; @@ -58,11 +65,15 @@ XYZFrame::XYZFrame (Size size) _opj_image->y1 = size.height; } +/** XYZFrame destructor */ XYZFrame::~XYZFrame () { opj_image_destroy (_opj_image); } +/** @param c Component index (0, 1 or 2) + * @return Pointer to the data for component c. + */ int * XYZFrame::data (int c) const { @@ -70,6 +81,7 @@ XYZFrame::data (int c) const return _opj_image->comps[c].data; } +/** @return Size of the image in pixels */ dcp::Size XYZFrame::size () const { diff --git a/src/xyz_frame.h b/src/xyz_frame.h index e825b0a9..5319f9d4 100644 --- a/src/xyz_frame.h +++ b/src/xyz_frame.h @@ -17,12 +17,19 @@ */ -#include +/** @file src/xyz_frame.h + * @brief XZYFrame class. + */ + #include "util.h" +#include namespace dcp { -class XYZFrame +/* @class XYZFrame + * @brief An image in XYZ colour. + */ +class XYZFrame : public boost::noncopyable { public: XYZFrame (opj_image_t *); -- 2.30.2