~ubuntu-branches/ubuntu/precise/exiv2/precise

« back to all changes in this revision

Viewing changes to src/value.hpp

Committer: Bazaar Package Importer
Author(s): Mark Purcell
Date: 2010-07-09 19:43:59 UTC
mfrom: (1.1.12 upstream) (11.1.7 sid)
Revision ID: james.westby@ubuntu.com-20100709194359-7w1hbf33l7d2rgmq

Tags: 0.20-2

Upload to unstable - cleared with debian-release

files added:
AUTHORS

debian/libexiv2-9.install

doc/templates/tags-xmp-expressionmedia.html.in

doc/templates/tags-xmp-kipi.html.in

doc/templates/tags-xmp-mediapro.html.in

msvc/runner7.txt

samples/werror-test.cpp

src/TODO

files removed:
debian/libexiv2-6.install

src/Todo

files modified:
.pc/00_hyphens_used_as_minus.diff/src/exiv2.1

README

config/Makefile.in

config/config.make

config/config.mk.in

config/configure.ac

configure

contrib/organize/Makefile

debian/changelog

debian/control

debian/rules

doc/ChangeLog

doc/Makefile

doc/templates/Makefile

doc/templates/__index2__

doc/templates/tags-nikon.html.in

doc/templates/tags-sony.html.in

msvc/README-MSVC.txt

msvc/exivsimple/exivsimple.cpp

msvc/include/exv_msvc.h

msvc/runner.txt

po/de.gmo

po/de.po

po/es.gmo

po/es.po

po/exiv2.pot

po/fi.gmo

po/fi.po

po/fr.gmo

po/fr.po

po/pl.gmo

po/pl.po

po/ru.gmo

po/ru.po

po/sk.gmo

po/sk.po

samples/Makefile

samples/easyaccess-test.cpp

samples/exifprint.cpp

samples/iotest.cpp

samples/write2-test.cpp

src/Makefile

src/actions.cpp

src/actions.hpp

src/basicio.cpp

src/basicio.hpp

src/bmpimage.cpp

src/bmpimage.hpp

src/canonmn.cpp

src/canonmn.hpp

src/convert.cpp

src/convert.hpp

src/cr2image.cpp

src/cr2image.hpp

src/cr2image_int.hpp

src/crwimage.cpp

src/crwimage.hpp

src/crwimage_int.hpp

src/datasets.cpp

src/datasets.hpp

src/doxygen.hpp.in

src/easyaccess.cpp

src/easyaccess.hpp

src/error.cpp

src/error.hpp

src/exif.cpp

src/exif.hpp

src/exiv2.1

src/exiv2.cpp

src/exiv2.hpp

src/fujimn.cpp

src/fujimn.hpp

src/futils.cpp

src/futils.hpp

src/gifimage.cpp

src/gifimage.hpp

src/i18n.h

src/image.cpp

src/image.hpp

src/iptc.cpp

src/iptc.hpp

src/jp2image.cpp

src/jp2image.hpp

src/jpgimage.cpp

src/jpgimage.hpp

src/localtime.c

src/makernote.cpp

src/makernote_int.hpp

src/metacopy.cpp

src/metacopy.hpp

src/metadatum.cpp

src/metadatum.hpp

src/minoltamn.cpp

src/minoltamn.hpp

src/mn.hpp

src/mrwimage.cpp

src/mrwimage.hpp

src/nikonmn.cpp

src/nikonmn.hpp

src/olympusmn.cpp

src/olympusmn.hpp

src/orfimage.cpp

src/orfimage.hpp

src/orfimage_int.hpp

src/panasonicmn.cpp

src/panasonicmn.hpp

src/pentaxmn.cpp

src/pentaxmn.hpp

src/pgfimage.cpp

src/pgfimage.hpp

src/pngchunk.cpp

src/pngchunk_int.hpp

src/pngimage.cpp

src/pngimage.hpp

src/preview.cpp

src/preview.hpp

src/properties.cpp

src/properties.hpp

src/psdimage.cpp

src/psdimage.hpp

src/rafimage.cpp

src/rafimage.hpp

src/rcsid.hpp

src/rw2image.cpp

src/rw2image.hpp

src/rw2image_int.hpp

src/sigmamn.cpp

src/sigmamn.hpp

src/sonymn.cpp

src/sonymn.hpp

src/tags.cpp

src/tags.hpp

src/tgaimage.cpp

src/tgaimage.hpp

src/tiffcomposite.cpp

src/tiffcomposite_int.hpp

src/tifffwd_int.hpp

src/tiffimage.cpp

src/tiffimage.hpp

src/tiffimage_int.hpp

src/tiffvisitor.cpp

src/tiffvisitor_int.hpp

src/types.cpp

src/types.hpp

src/utils.cpp

src/utils.hpp

src/value.cpp

src/value.hpp

src/version.cpp

src/version.hpp

src/xmp.cpp

src/xmp.hpp

src/xmpsidecar.cpp

src/xmpsidecar.hpp

xmpsdk/src/ExpatAdapter.cpp

xmpsdk/src/Makefile

xmpsdk/src/ParseRDF.cpp

xmpsdk/src/WXMPIterator.cpp

xmpsdk/src/WXMPMeta.cpp

xmpsdk/src/WXMPUtils.cpp

xmpsdk/src/XML_Node.cpp

xmpsdk/src/XMPCore_Impl.cpp

xmpsdk/src/XMPCore_Impl.hpp

xmpsdk/src/XMPIterator.cpp

xmpsdk/src/XMPMeta-GetSet.cpp

xmpsdk/src/XMPMeta-Parse.cpp

xmpsdk/src/XMPMeta-Serialize.cpp

xmpsdk/src/XMPMeta.cpp

xmpsdk/src/XMPUtils-FileInfo.cpp

xmpsdk/src/XMPUtils.cpp

Show diffs side-by-side

added added

removed removed

src/value.hpp

// ***************************************************************** -*- C++ -*-

* This program is part of the Exiv2 distribution.

/*!

@file value.hpp

@brief Value interface and concrete subclasses

@version $Rev: 1937 $

@version $Rev: 2073 $

@author Andreas Huggel (ahu)

<a href="mailto:ahuggel@gmx.net">ahuggel@gmx.net</a>

@date 09-Jan-04, ahu: created

529

const char* code_; //!< Code of the charset

530

}; // struct CharsetTable

531

//! Charset information lookup functions. Implemented as a static class.

532

class CharsetInfo {

532

class EXIV2API CharsetInfo {

533

//! Prevent construction: not implemented.

534

CharsetInfo() {}

535

//! Prevent copy-construction: not implemented.

566

567

//! @name Manipulators

568

//@{

569

using StringValueBase::read;

570

569

/*!

571

570

@brief Read the value from a comment

572

571

580

579

1 if an invalid character set is encountered

581

580

582

581

int read(const std::string& comment);

582

/*!

583

@brief Read the comment from a byte buffer.

584

585

int read(const byte* buf, long len, ByteOrder byteOrder);

583

586

//@}

584

587

585

588

//! @name Accessors

586

589

//@{

587

590

AutoPtr clone() const { return AutoPtr(clone_()); }

591

long copy(byte* buf, ByteOrder byteOrder) const;

588

592

/*!

589

593

@brief Write the comment in a format which can be read by

590

594

read(const std::string& comment).

591

595

592

596

std::ostream& write(std::ostream& os) const;

593

//! Return the comment (without a charset="..." prefix)

594

std::string comment() const;

595

//! Return the charset id of the comment

597

/*!

598

@brief Return the comment (without a charset="..." prefix)

599

600

The comment is decoded to UTF-8. For Exif UNICODE comments, the

601

function makes an attempt to correctly determine the character

602

encoding of the value. Alternatively, the optional \em encoding

603

parameter can be used to specify it.

604

605

@param encoding Optional argument to specify the character encoding

606

that the comment is encoded in, as an iconv(3) name. Only used

607

for Exif UNICODE comments.

608

609

@return A string containing the comment converted to UTF-8.

610

611

std::string comment(const char* encoding =0) const;

612

/*!

613

@brief Determine the character encoding that was used to encode the

614

UNICODE comment value as an iconv(3) name.

615

616

If the comment \em c starts with a BOM, the BOM is interpreted and

617

removed from the string.

618

619

Todo: Implement rules to guess if the comment is UTF-8 encoded.

620

621

const char* detectCharset(std::string& c) const;

622

//! Return the Exif charset id of the comment

596

623

CharsetId charsetId() const;

597

624

//@}

598

625

600

627

//! Internal virtual copy constructor.

601

628

EXV_DLLLOCAL virtual CommentValue* clone_() const;

602

629

630

public:

631

// DATA

632

ByteOrder byteOrder_; //!< Byte order of the comment string that was read

633

603

634

}; // class CommentValue

604

635

605

636

/*!

1484

1515

{

1485

1516

std::istringstream is(buf);

1486

1517

T tmp;

1487

value_.clear();

1518

ValueList val;

1488

1519

while (!(is.eof())) {

1489

1520

is >> tmp;

1490

1521

if (is.fail()) return 1;

1491

value_.push_back(tmp);

1522

val.push_back(tmp);

1492

1523

}

1524

value_.swap(val);

1493

1525

return 0;

1494

1526

}

1495

1527

Older »