Mercurial > mxe-octave

annotate src/exiv2-r2650.patch @ 2333:f653602a0500

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rebrand to new project name MXE
author Volker Grabsch <vog@notjusthosting.com>
date Wed, 28 Mar 2012 15:46:58 +0200
parents f16d2bafdc8b
children 99516e73b368
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2333
f653602a0500 Rebrand to new project name MXE
Volker Grabsch <vog@notjusthosting.com>
parents: 2210
diff changeset
1 This file is part of MXE.
2210
f16d2bafdc8b package exiv2: add another important bugfix
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
2 See doc/index.html for further information.
f16d2bafdc8b package exiv2: add another important bugfix
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
3
f16d2bafdc8b package exiv2: add another important bugfix
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
4 This patch has been taken from:
f16d2bafdc8b package exiv2: add another important bugfix
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
5 http://dev.exiv2.org/projects/exiv2/repository/revisions/2650
f16d2bafdc8b package exiv2: add another important bugfix
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
6
f16d2bafdc8b package exiv2: add another important bugfix
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
7 Index: trunk/src/jpgimage.cpp
f16d2bafdc8b package exiv2: add another important bugfix
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
8 ===================================================================
f16d2bafdc8b package exiv2: add another important bugfix
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
9 --- trunk/src/jpgimage.cpp (revision 2649)
f16d2bafdc8b package exiv2: add another important bugfix
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
10 +++ trunk/src/jpgimage.cpp (revision 2650)
f16d2bafdc8b package exiv2: add another important bugfix
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
11 @@ -87,6 +87,7 @@ namespace Exiv2 {
f16d2bafdc8b package exiv2: add another important bugfix
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
12
f16d2bafdc8b package exiv2: add another important bugfix
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
13 const char Photoshop::ps3Id_[] = "Photoshop 3.0\0";
f16d2bafdc8b package exiv2: add another important bugfix
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
14 const char* Photoshop::irbId_[] = {"8BIM", "AgHg", "DCSR", "PHUT"};
f16d2bafdc8b package exiv2: add another important bugfix
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
15 + const char Photoshop::bimId_[] = "8BIM"; // deprecated
f16d2bafdc8b package exiv2: add another important bugfix
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
16 const uint16_t Photoshop::iptc_ = 0x0404;
f16d2bafdc8b package exiv2: add another important bugfix
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
17 const uint16_t Photoshop::preview_ = 0x040c;
f16d2bafdc8b package exiv2: add another important bugfix
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
18
f16d2bafdc8b package exiv2: add another important bugfix
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
19 Index: trunk/src/jpgimage.hpp
f16d2bafdc8b package exiv2: add another important bugfix
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
20 ===================================================================
f16d2bafdc8b package exiv2: add another important bugfix
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
21 --- trunk/src/jpgimage.hpp (revision 2649)
f16d2bafdc8b package exiv2: add another important bugfix
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
22 +++ trunk/src/jpgimage.hpp (revision 2650)
f16d2bafdc8b package exiv2: add another important bugfix
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
23 @@ -65,6 +65,7 @@ namespace Exiv2 {
f16d2bafdc8b package exiv2: add another important bugfix
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
24 // Todo: Public for now
f16d2bafdc8b package exiv2: add another important bugfix
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
25 static const char ps3Id_[]; //!< %Photoshop marker
f16d2bafdc8b package exiv2: add another important bugfix
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
26 static const char* irbId_[]; //!< %Photoshop IRB markers
f16d2bafdc8b package exiv2: add another important bugfix
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
27 + static const char bimId_[]; //!< %Photoshop IRB marker (deprecated)
f16d2bafdc8b package exiv2: add another important bugfix
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
28 static const uint16_t iptc_; //!< %Photoshop IPTC marker
f16d2bafdc8b package exiv2: add another important bugfix
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
29 static const uint16_t preview_; //!< %Photoshop preview marker
f16d2bafdc8b package exiv2: add another important bugfix
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
30